seimin 2 years ago
parent
commit
51704b0f1f
2 changed files with 12 additions and 4 deletions
  1. 9 3
      components/fjj-condition/fjj-condition.vue
  2. 3 1
      pages/inspectList/inspectList.vue

+ 9 - 3
components/fjj-condition/fjj-condition.vue

@@ -183,6 +183,9 @@
183
       keyWordGvie: {
183
       keyWordGvie: {
184
         type: String,
184
         type: String,
185
       },
185
       },
186
+			keyWordOld: {
187
+        type: String,
188
+      },
186
       bedNumSortGvie: {
189
       bedNumSortGvie: {
187
         type: Boolean,
190
         type: Boolean,
188
       },
191
       },
@@ -209,7 +212,7 @@
209
       ldSelect,
212
       ldSelect,
210
     },
213
     },
211
     created() {
214
     created() {
212
-      this.keyWord = this.keyWordGvie;
215
+      this.keyWord = this.keyWordGvie || '';
213
       this.bedNumSort = this.bedNumSortGvie;
216
       this.bedNumSort = this.bedNumSortGvie;
214
       this.resetResult();
217
       this.resetResult();
215
       uni.getSystemInfo({
218
       uni.getSystemInfo({
@@ -298,7 +301,7 @@
298
             item.type === "single" ?
301
             item.type === "single" ?
299
             (obj[item.key] = [new Date().Format("yyyy/MM/dd")]) :
302
             (obj[item.key] = [new Date().Format("yyyy/MM/dd")]) :
300
             item.type === "keyWord" ?
303
             item.type === "keyWord" ?
301
-            (obj[item.key] = this.keyWord || '') :
304
+            (obj[item.key] = this.keyWord ? [this.keyWord] : []) :
302
             (obj[item.key] = "");
305
             (obj[item.key] = "");
303
         });
306
         });
304
         return obj;
307
         return obj;
@@ -356,15 +359,18 @@
356
         });
359
         });
357
       },
360
       },
358
       resetClick() {
361
       resetClick() {
362
+				console.log(this.result, this.keyWordOld);
359
         this.minNumber = "";
363
         this.minNumber = "";
360
         this.maxNumber = "";
364
         this.maxNumber = "";
361
-        this.keyWord = "";
365
+        this.keyWord = this.keyWordOld || '';
362
         this.bedNumSort = false;
366
         this.bedNumSort = false;
363
         this.single = [new Date().Format("yyyy/MM/dd")];
367
         this.single = [new Date().Format("yyyy/MM/dd")];
364
         for (let key in this.result) {
368
         for (let key in this.result) {
365
           if ((typeof this.result[key] == "object") && key != "inspectState") {
369
           if ((typeof this.result[key] == "object") && key != "inspectState") {
366
             if (key == "yyTime") {
370
             if (key == "yyTime") {
367
               this.result[key] = [new Date().Format("yyyy/MM/dd")];
371
               this.result[key] = [new Date().Format("yyyy/MM/dd")];
372
+            } else if (key == "keyWord") {
373
+              this.result[key] = this.keyWordOld ? [this.keyWordOld] : [];
368
             } else {
374
             } else {
369
               this.result[key] = [];
375
               this.result[key] = [];
370
             }
376
             }

+ 3 - 1
pages/inspectList/inspectList.vue

@@ -100,7 +100,7 @@
100
     <bigScreen></bigScreen>
100
     <bigScreen></bigScreen>
101
     <!-- 筛选 -->
101
     <!-- 筛选 -->
102
     <fjj-condition @touchmove.stop :list="list" :visibleDrawer="visibleDrawer" @result="resultConditon"
102
     <fjj-condition @touchmove.stop :list="list" :visibleDrawer="visibleDrawer" @result="resultConditon"
103
-      :keyWordGvie="searchlist.keyWord" :bedNumSortGvie="searchlist.bedNumSort" :inspectStateList="inspectStateList" />
103
+      :keyWordGvie="searchlist.keyWord" :keyWordOld="keyWordOld" :bedNumSortGvie="searchlist.bedNumSort" :inspectStateList="inspectStateList" />
104
     <!-- 弹窗 -->
104
     <!-- 弹窗 -->
105
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
105
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
106
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
106
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
@@ -122,6 +122,7 @@
122
   export default {
122
   export default {
123
     data() {
123
     data() {
124
       return {
124
       return {
125
+				keyWordOld: '',
125
 				currentInspect: null,
126
 				currentInspect: null,
126
 				// 弹窗model1
127
 				// 弹窗model1
127
 				models1: {
128
 				models1: {
@@ -551,6 +552,7 @@
551
         this.currenDept.id = id;
552
         this.currenDept.id = id;
552
         this.currenDept.dept = dept;
553
         this.currenDept.dept = dept;
553
         this.currenDept.patientCode = patientCode;
554
         this.currenDept.patientCode = patientCode;
555
+				this.keyWordOld = patientCode;
554
       } else if (patientCurrentDept) {
556
       } else if (patientCurrentDept) {
555
         this.currenDept.id = patientCurrentDept.id;
557
         this.currenDept.id = patientCurrentDept.id;
556
         this.currenDept.dept = patientCurrentDept.dept;
558
         this.currenDept.dept = patientCurrentDept.dept;