Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1660,8 +1660,8 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                          <td width="50" v-if=" org_id ==0 || org_id ==10164">超滤率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683  && org_id!=0">超滤量<br />(ml)</td>
+                          <td width="50" v-if=" org_id ==0 || org_id ==10489">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
@@ -1886,7 +1886,7 @@
                                        : ""
                                    }}
                          </td>
-                          <td v-if="org_id!=10683&& org_id!=0">
+                          <td v-if="org_id!=10683">
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
                               monitor_record.ultrafiltration_volume

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_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2098,7 +2098,7 @@ export default {
               if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206 ){
                       preTime = this.record_date + ' ' + '6:00'
@@ -2293,7 +2293,7 @@ export default {
                 var preTime = nowTime
                 if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0) {
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  ) {
                       preTime = this.record_date+ ' ' + '6:00'
@@ -2672,7 +2672,7 @@ export default {
                     if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 ){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2860,7 +2860,7 @@ export default {
                       // var preTime = ''
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206){
                             preTime = this.record_date + ' ' + '6:00'
@@ -4558,7 +4558,7 @@ export default {
                     if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206){
 
@@ -4749,7 +4749,7 @@ export default {
                       var preTime = nowTime
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206){
                             preTime = this.record_date+ ' ' + '6:00'
@@ -5185,7 +5185,7 @@ export default {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206){
                             preTime = this.record_date + ' ' + '6:00'
@@ -5373,7 +5373,7 @@ export default {
                       // var preTime = ''
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206){
                             preTime = this.record_date + ' ' + '6:00'

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))