seimin пре 1 година
родитељ
комит
3c0e46a900
2 измењених фајлова са 18 додато и 10 уклоњено
  1. 9 5
      pages/search/search.vue
  2. 9 5
      pages/searchMuti/searchMuti.vue

+ 9 - 5
pages/search/search.vue

@@ -207,8 +207,12 @@
207 207
             let workAllocationQuickConfig = res.list[0] || {};
208 208
             // 科室绑定人员
209 209
             if(workAllocationQuickConfig.ruleType == 3){
210
-              this.sysDeptType = -1;
211
-              this.quickCombinationDeptType = workAllocationQuickConfig.deptTypeList.map(v => v.id).toString();
210
+              if(workAllocationQuickConfig.deptTypeList){
211
+                this.quickCombinationDeptType = workAllocationQuickConfig.deptTypeList.map(v => v.id).toString();
212
+              }else{
213
+                // 没有获取到配置,则获取之前的
214
+                this.getSysDeptType();
215
+              }
212 216
             }else{
213 217
               this.getSysDeptType();
214 218
             }
@@ -248,10 +252,10 @@
248 252
         }
249 253
         //不是送回病房
250 254
         if (this.type != "sendBack" && this.type != "sendBackPatientList" && this.type != "settingCode" && this.type != "bloodSelect" && this.type != "showDepartmentQrcode") {
251
-          if (this.sysDeptType === 0) {
252
-            return;
253
-          } else if(this.quickCombinationDeptType){
255
+          if(this.quickCombinationDeptType){
254 256
             postData.department.deptTypeIds = this.quickCombinationDeptType;
257
+          } else if (this.sysDeptType === 0) {
258
+            return;
255 259
           } else {
256 260
             postData.department.type = {
257 261
               id: this.sysDeptType

+ 9 - 5
pages/searchMuti/searchMuti.vue

@@ -88,8 +88,12 @@
88 88
             let workAllocationQuickConfig = res.list[0] || {};
89 89
             // 科室绑定人员
90 90
             if(workAllocationQuickConfig.ruleType == 3){
91
-              this.sysDeptType = -1;
92
-              this.quickCombinationDeptType = workAllocationQuickConfig.deptTypeList.map(v => v.id).toString();
91
+              if(workAllocationQuickConfig.deptTypeList){
92
+                this.quickCombinationDeptType = workAllocationQuickConfig.deptTypeList.map(v => v.id).toString();
93
+              }else{
94
+                // 没有获取到配置,则获取之前的
95
+                this.getSysDeptType();
96
+              }
93 97
               this.getBuildings();
94 98
             }else{
95 99
               this.getSysDeptType();
@@ -120,10 +124,10 @@
120 124
             }
121 125
           }
122 126
           
123
-          if (this.sysDeptType === 0) {
124
-            return;
125
-          } else if(this.quickCombinationDeptType){
127
+          if(this.quickCombinationDeptType){
126 128
             postData.department.deptTypeIds = this.quickCombinationDeptType;
129
+          } else if (this.sysDeptType === 0) {
130
+            return;
127 131
           } else {
128 132
             postData.department.type = {
129 133
               id: this.sysDeptType