新分支

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -970,6 +970,8 @@ export default {
           }
 
           this.advices = response.data.data.advices;
+
+          
           this.monitors = response.data.data.monitors;
           console.log("透析监测", this.monitors);
           this.summary = response.data.data.summary;
@@ -1148,9 +1150,23 @@ export default {
           console.log(this.advice_groups);
           
           var advices = response.data.data.advices;
+         
+          var newDocArr= []
+          for(let i=0;i<advices.length;i++){
+            console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
+            console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
+           if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
+              newDocArr.push(advices[i])
+           }
+          }
+          console.log("newDocArr----------------------",newDocArr)
+        
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
-          var tableAdvice = advices.concat(doctorAdevieInfo);
-          console.log('tableAdvice',tableAdvice);
+        
+         
+       
+          var tableAdvice = newDocArr.concat(doctorAdevieInfo);
+        
           console.log('response.data.data', response.data.data)
           if (tableAdvice.length === 0) {
             console.log('1111111',tableAdvice.length);

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))