Browse Source

新分支

28169 7 months ago
parent
commit
84d38dfba6

+ 18 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue View File

970
           }
970
           }
971
 
971
 
972
           this.advices = response.data.data.advices;
972
           this.advices = response.data.data.advices;
973
+
974
+          
973
           this.monitors = response.data.data.monitors;
975
           this.monitors = response.data.data.monitors;
974
           console.log("透析监测", this.monitors);
976
           console.log("透析监测", this.monitors);
975
           this.summary = response.data.data.summary;
977
           this.summary = response.data.data.summary;
1148
           console.log(this.advice_groups);
1150
           console.log(this.advice_groups);
1149
           
1151
           
1150
           var advices = response.data.data.advices;
1152
           var advices = response.data.data.advices;
1153
+         
1154
+          var newDocArr= []
1155
+          for(let i=0;i<advices.length;i++){
1156
+            console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
1157
+            console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
1158
+           if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
1159
+              newDocArr.push(advices[i])
1160
+           }
1161
+          }
1162
+          console.log("newDocArr----------------------",newDocArr)
1163
+        
1151
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
1164
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
1152
-          var tableAdvice = advices.concat(doctorAdevieInfo);
1153
-          console.log('tableAdvice',tableAdvice);
1165
+        
1166
+         
1167
+       
1168
+          var tableAdvice = newDocArr.concat(doctorAdevieInfo);
1169
+        
1154
           console.log('response.data.data', response.data.data)
1170
           console.log('response.data.data', response.data.data)
1155
           if (tableAdvice.length === 0) {
1171
           if (tableAdvice.length === 0) {
1156
             console.log('1111111',tableAdvice.length);
1172
             console.log('1111111',tableAdvice.length);

+ 13 - 13
src/xt_permission.js View File

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))