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

src/xt_pages/Pharmacy/DispensingDetails.vue

@@ -32,7 +32,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="startTimeChange"
+           
           ></el-date-picker
           >-
           <el-date-picker
@@ -46,7 +46,7 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="endTimeChange"
+          
           ></el-date-picker>
 
           <el-button

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -398,9 +398,8 @@ export default {
       currentIndex:0,
       is_drug_open:"2",
       textarea:"",
-
-
       drug_code_open:0,
+      patientList:[]
 
     };
   },
@@ -537,7 +536,7 @@ export default {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
           this.drugList = res.data.data.drug
-          this.drug_code_open = response.data.data.config.is_open
+          this.drug_code_open = res.data.data.config.is_open
         }
       });
       // console.log("2222222")
@@ -550,10 +549,11 @@ export default {
         shift: this.shift,
         partition: this.partition,
       };
-      console.log("班次---------------------",params)
+     
       waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
-          this.waitmount_data = res.data.data.list;
+          this.waitmount_data=[]
+          var list = res.data.data.list;
           this.baseList =[]
           this.baseList = res.data.data.baseList
           if (this.shift != 0 || this.partition != 0) {
@@ -563,18 +563,105 @@ export default {
               this.waitmount = this.waitmount_data.length;
             }
           }
+          this.patientList = []
+          this.patientList = res.data.data.patientList
+          var listTwo = res.data.data.listTwo
+         
+          var newArr =[]
+          if(listTwo!=null && listTwo.length>0){
+             for(let i=0;i<listTwo.length;i++){
+              listTwo[i].PatientID = 0
+              listTwo[i].Name=""
+              listTwo[i].DialysisNo=""
+              listTwo[i].PatientID = listTwo[i].patient_id
+              listTwo[i].Name = listTwo[i].patient.name
+              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
+              newArr.push(listTwo[i])
+             }
+          }
+        
+          if(list!=null && list.length>0){
+            for(let i=0;i<list.length;i++){
+              this.waitmount_data.push(list[i])
+            }
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.waitmount_data.push(newArr[i]) 
+               }
+            }
+          }
+          if(this.waitmount_data==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.waitmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
+          if(list==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.waitmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
+         
         }
       });
       issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
-          this.alreadmount_data = res.data.data.list;
+          this.alreadmount_data =[]
+          var list = res.data.data.list;
+          var listTwo =res.data.data.listTwo
+          
           if (this.shift != 0 || this.partition != 0) {
-            if (this.alreadmount_data == null) {
+            if (list == null) {
               this.alreadmount = 0;
             } else {
-              this.alreadmount = this.alreadmount_data.length;
+              this.alreadmount = list.length;
             }
           }
+
+          var newArr =[]
+          if(listTwo!=null && listTwo.length>0){
+             for(let i=0;i<listTwo.length;i++){
+              listTwo[i].PatientID = 0
+              listTwo[i].Name=""
+              listTwo[i].DialysisNo=""
+              listTwo[i].PatientID = listTwo[i].patient_id
+              listTwo[i].Name = listTwo[i].patient.name
+              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
+              newArr.push(listTwo[i])
+             }
+          }
+        
+          if(list!=null && list.length>0){
+            for(let i=0;i<list.length;i++){
+              this.alreadmount_data.push(list[i])
+            }
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.alreadmount_data.push(newArr[i]) 
+               }
+            }
+          }
+          if(this.waitmount_data==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.alreadmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
+          if(list==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.alreadmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
         }
       });
     },
@@ -589,13 +676,81 @@ export default {
       };
       await waitingdrug(params).then((res) => {
         if (res.data.state == 1) {
-          this.waitmount_data = res.data.data.list;
+          this.waitmount_data=[]
+          var list = res.data.data.list;
+          this.patientList = []
+          this.patientList = res.data.data.patientList
+          var listTwo = res.data.data.listTwo
+          var newArr =[]
+          if(listTwo!=null && listTwo.length>0){
+             for(let i=0;i<listTwo.length;i++){
+              listTwo[i].PatientID = 0
+              listTwo[i].Name=""
+              listTwo[i].DialysisNo=""
+              listTwo[i].PatientID = listTwo[i].patient_id
+              listTwo[i].Name = listTwo[i].patient.name
+              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
+              newArr.push(listTwo[i])
+             }
+          }
+          if(list!=null && list.length>0){
+            for(let i=0;i<list.length;i++){
+              this.waitmount_data.push(list[i])
+            }
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.waitmount_data.push(newArr[i]) 
+               }
+            }
+          }
+          if(list==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.waitmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
+
           console.log("1111111");
         }
       });
       await issueddrugs(params).then((res) => {
         if (res.data.state == 1) {
-          this.alreadmount_data = res.data.data.list;
+          this.alreadmount_data = []
+          var list = res.data.data.list;
+          var listTwo = res.data.data.listTwo
+          var newArr =[]
+          if(listTwo!=null && listTwo.length>0){
+             for(let i=0;i<listTwo.length;i++){
+              listTwo[i].PatientID = 0
+              listTwo[i].Name=""
+              listTwo[i].DialysisNo=""
+              listTwo[i].PatientID = listTwo[i].patient_id
+              listTwo[i].Name = listTwo[i].patient.name
+              listTwo[i].DialysisNo = listTwo[i].patient.dialysis_no
+              newArr.push(listTwo[i])
+             }
+          }
+          if(list!=null && list.length>0){
+            for(let i=0;i<list.length;i++){
+              this.alreadmount_data.push(list[i])
+            }
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.alreadmount_data.push(newArr[i]) 
+               }
+            }
+          }
+          if(list==null){
+            if(newArr!=null && newArr.length>0){
+               for(let i=0;i<newArr.length;i++){
+                this.alreadmount_data.push(newArr[i]) 
+               }
+            }
+           
+          }
+
           console.log("1111111s");
         }
       });
@@ -603,6 +758,24 @@ export default {
 
       // })
     },
+    getPatientName(patient_id){
+      var name = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(patient_id == this.patientList[i].id){
+           name = this.patientList[i].name
+        }
+      }
+      return name
+    },
+    getPatientDialysisNo(patient_id){
+      var dialysis_no = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(patient_id == this.patientList[i].id){
+          dialysis_no = this.patientList[i].dialysis_no
+        }
+      }
+      return dialysis_no
+    },
     //获取患者信息详情
     getpatientdetails(val) {
       console.log("val2332323223",this.currentRow)

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

@@ -33,25 +33,25 @@
                <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
             </span>
 
-            <span style="position: absolute;left:51%;top: 3%">
-              4小时超滤量上限（5%）：
-              <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
-              kg
-            </span>
-            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
-              透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
-            </span>
-
-            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702">
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id ==10721">
              衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
             </span>
 
-            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598">
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10721">
               体重增长：
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
               </span>
 
+              <span style="position: absolute;left:51%;top: 3%">
+              4小时超滤量上限（5%）：
+              <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
+              kg
+            </span>
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=10702">
+              透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
+            </span>
+
 
             </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>

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