Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

.idea/shelf/在进行更新之前于_2023_11_22_9_30_取消提交了更改_[更改]/doctorAdvice.vue

@@ -1766,7 +1766,7 @@
                 >&nbsp;{{ tranAge(currentPatient.birthday) }}岁</span
               >
             </li>
-            <li v-if="currentPatient.user_org_id!=10090">
+            <!-- <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">科：</span>
 
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
@@ -1784,7 +1784,7 @@
             <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">床：</span>
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
-            </li>
+            </li> -->
             <li>
               <span class="name" style="width:70px;">透析号：</span>
               <span class="InputBox"

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsone.vue

@@ -622,7 +622,8 @@ export default {
     },
     chooseWay(way) {
       this.wayType = way
-    }, getCurrentOrgPatients() {
+    }, 
+    getCurrentOrgPatients() {
       getCurrentOrgPatients().then(response => {
         if (response.data.state == 1) {
           var patients = response.data.data.patients

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -155,7 +155,7 @@
             <el-button type="primary" @click="endispense" v-if="state == 2"
               >退药</el-button
             >
-            <el-button type="primary" @click="toPrint">打印</el-button>
+            <el-button type="primary" @click="toPrint" v-if="printShow">打印</el-button>
             <!--                    <el-button @click="tiaoshi">调试</el-button>-->
             <el-button type="primary" v-if="state == 1" @click="toSetting"
               >设置</el-button
@@ -424,7 +424,8 @@ export default {
       total_count:0,
       newArrList:[],
       textAreaList:[],
-      scan_code:""
+      scan_code:"",
+      printShow:false,
     };
   },
  
@@ -542,11 +543,13 @@ export default {
       if (this.state == 1) {
         this.tableData = []
         this.patients = {}
+        this.printShow  = false
         this.getpatientdetails(0);
       }
       if (this.state == 2) {
         this.patients = {}
         this.tableData = []
+        this.printShow  = false
         this.getpatientdetails(1);
       }
     },
@@ -859,6 +862,7 @@ export default {
       getpharmacycontent(params).then((res) => {
         if (res.data.state == 1) {
           //  loading.close()
+         
            var list = res.data.data.list;
            console.log("hhhhawoowowow",res.data.data)
            this.baseList =[]
@@ -889,6 +893,7 @@ export default {
             this.tableData = []
             this.tableData = list
           }
+          this.printShow = true
           // console.log("tableDatawoowow",this.tableData)
           // loading.close()
         } else {
@@ -1283,7 +1288,7 @@ export default {
     getDrugCode(id,DataSources,DrugCode,index,DrugId){
       
      // 针对百霖
-       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0){
+       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0|| this.$store.getters.xt_user.org.id==10726){
           var params = {
             drug_id:DrugId,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
@@ -1412,7 +1417,7 @@ export default {
 
         
          
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){
 
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
              
@@ -1463,12 +1468,17 @@ export default {
                    is_err_check = true
                  }
 
-                 if(drugindentificaitoncode>0){
-                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
-                    this.$message.error("药品标识码格式不正确,请重新扫码")
-                    is_err_check = true
-                  }
+
+                 if(this.$store.getters.xt_user.org.id != 10726){
+                    if(drugindentificaitoncode>0){
+                      if(arr[i].substring(0,7)!= drugindentificaitoncode){
+                        this.$message.error("药品标识码格式不正确,请重新扫码")
+                        is_err_check = true
+                      }
+                    }
                  }
+
+               
                 
 
                }

src/xt_pages/dialysis/PatientBox.vue

@@ -23,8 +23,9 @@
           <div>
             <div class="right">
               <h3 class="name">
-                {{ schedule.patient.name
-                }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
+                {{ schedule.patient.name}}
+                <span v-if="$store.getters.xt_user.org.id==10744 || $store.getters.xt_user.org.id==0">{{ schedule.patient.dialysis_no }}</span> 
+                <span class="yc" v-show="isAbnormal(schedule)">异常</span>
               </h3>
               <span class="num">
                 {{ genderText(schedule) }} | {{ getAge(schedule)>200 ? schedule.patient.age : getAge(schedule) }} 岁

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1400,7 +1400,7 @@
                     <td width="60" style="line-height: 20px">
                       电导度<br />mS/cm
                     </td>
-                    <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
+                    <td width="60" style="line-height:20px" v-if="org_id == 10015 || org_id == 0">置换液流量<br />ml/min</td>
                     <td width="" style="line-height: 20px">病情变化及处理</td>
                   </tr>
 
@@ -1491,7 +1491,7 @@
                         monitor.conductivity ? monitor.conductivity : ""
                       }}
                     </td>
-                    <td v-if="org_id == 10015">
+                    <td v-if="org_id == 10015 || org_id == 0">
                      &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
                     </td>
                     <td>
@@ -2486,11 +2486,13 @@ export default {
         "腹痛",
       ],
       isShowZero: false,
+      org_id:0,
     };
   },
   created() {
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org.id;
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -932,7 +932,7 @@
             align="center"
             label="置换液流量(ml/h)"
             width="100"
-            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60"
+            v-if="isShow('置换液流量') && template_id != 27 && template_id != 60&& org_id != 10015"
           >
             <template slot-scope="scope">
               {{
@@ -947,7 +947,7 @@
             align="center"
             label="置换液流量(ml/min)"
             width="100"
-            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60)"
+            v-if="isShow('置换液流量') && (template_id == 27 || template_id == 60 || org_id ==10015)"
           >
             <template slot-scope="scope">
               {{

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -879,7 +879,7 @@
               <td width="60" style="line-height:20px">血流量<br />ml/min</td>
               <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
 
-              <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
+              <td width="60" style="line-height:20px" v-if="org_id == 10015 || org_id == 0">置换液流量<br />ml/min</td>
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
           <td width="80">透析液温度<br/>℃</td>
           <td width="60">置换率<br/>ml/min</td> -->
@@ -936,7 +936,7 @@
               <td>
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
               </td>
-              <td v-if="org_id == 10015">
+              <td v-if="org_id == 10015 || org_id == 0">
                 &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
               </td>
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
@@ -1897,7 +1897,8 @@ export default {
       doctorForm: {
         doctor: '',
         url: ''
-      }
+      },
+      org_id:0,
     }
   },
   methods: {
@@ -2695,6 +2696,7 @@ export default {
 
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
+    this.org_id = this.$store.getters.xt_user.org.id;
     // this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode
     this.replacementWays = this.$store.getters.replacement_ways

src/xt_permission.js

@@ -12,20 +12,20 @@ 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))
   // alert('path:' + to.path)