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

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -491,7 +491,8 @@ import {
   getcurrentname,
   getpartitionlist,
   routeofadministration,
-  changeDrugCode
+  changeDrugCode,
+  getDrugTocalCount
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -547,27 +548,104 @@ export default {
       drug_code:0,
       currentRow:{},
       currentIndex:0,
+      drug_id:0,
+      newArrList:[],
+      baseList:[],
     };
   },
 
   methods: {
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
-      this.id = id 
-      var is_source =0
-       if (DataSources == "his处方"){
-        is_source = 1
-       }
-       if (DataSources == "临时医嘱"){
-         is_source = 2
-       }
-       this.is_source = is_source
-       this.textarea = DrugCode
-       this.currentIndex = index
-       this.dialogVisibleOne = true
-       this.$nextTick(()=>{
-        this.$refs.Datefrom.focus()
-       })
+      
+      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){
+        var params = {
+            drug_id:this.drug_id,
+            start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
+        }
+       
+        getDrugTocalCount(params).then(response=>{
+          if(response.data.state == 1){
+            
+            var adviceList = response.data.data.adviceList
+
+            var str = ""
+            if(adviceList!=null && adviceList.length>0){
+              for(let i=0;i<adviceList.length;i++){
+                if(adviceList[i].drug_code!=""){
+                  str+=adviceList[i].drug_code 
+                }
+              
+              }
+            }
+            var new_arr = str.split(",");
+
+            console.log("adviceList==========",new_arr)
+
+            if(new_arr!=null && new_arr.length>0){
+              
+              let dataInfo = {}
+              new_arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                }
+              })
+              let arr = Object.values(dataInfo)
+
+              if(arr!=null && arr.length>0){
+                
+                for(let i=0;i<arr.length;i++){
+                  for(let j=0;j<new_arr.length;j++){
+                      if(arr[i].drug_code == new_arr[j]){
+                        arr[i].child.push(new_arr[j])
+                      }
+                  }
+                }
+              }
+              
+              this.newArrList = []
+              this.newArrList = arr
+               
+              this.id = id 
+              var is_source =0
+              if (DataSources == "his处方"){
+                  is_source = 1
+              }
+              if (DataSources == "临时医嘱"){
+                  is_source = 2
+              }
+              this.is_source = is_source
+              this.textarea = DrugCode
+              this.currentIndex = index
+              this.dialogVisibleOne = true
+              this.$nextTick(()=>{
+                this.$refs.Datefrom.focus()
+              })
+              
+            }
+          }
+        })
+
+      }else{
+        this.id = id 
+        var is_source =0
+        if (DataSources == "his处方"){
+          is_source = 1
+        }
+        if (DataSources == "临时医嘱"){
+          is_source = 2
+        }
+        this.is_source = is_source
+        this.textarea = DrugCode
+        this.currentIndex = index
+        this.dialogVisibleOne = true
+        this.$nextTick(()=>{
+          this.$refs.Datefrom.focus()
+        })
+      }
     },
     saveTextArea(){
       
@@ -593,9 +671,120 @@ export default {
     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+
         var textarea = ""
-        textarea += this.textarea + ","
-        this.textarea = textarea
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+
+        console.log("textarea==============",textarea)
+
+        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){
+          
+          var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
+          console.log("drugindentification===================",drugindentificaitoncode)
+
+          var scan_code = this.getDrugScanCode(this.drug_id)
+          
+          console.log("scan_code============",scan_code)
+
+          var total_one = 0
+          var total_two = 0
+
+          console.log("newArr-------------",this.newArrList)
+
+          var arr= []
+          arr = textarea.split(",")
+          var arrList = []
+          if(arr!=null && arr.length>0){
+            let dataInfo = {}
+               arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                 }
+               })
+               let new_arr = Object.values(dataInfo)
+
+               if(new_arr!=null && new_arr.length>0){
+                
+                 for(let i=0;i<new_arr.length;i++){
+                   for(let j=0;j<arr.length;j++){
+                      if(new_arr[i].drug_code == arr[j]){
+                         new_arr[i].child.push(arr[j])
+                      }
+                   }
+                 }
+               }
+            arrList = new_arr
+            
+          }
+
+          var is_err_check = false
+          var i_index = ""
+          var drug_code = ""
+       
+          if(arr!=null && arr.length>0){
+            for(let i=0;i<arr.length;i++){
+
+               if(arr[i]!=""){
+                 drug_code = arr[i]
+                 i_index = i
+                 if(arr[i].length!=20){
+                   this.$message.error("药品追溯码长度没有满足20位!")
+                   is_err_check = true
+                 }
+                 if(drugindentificaitoncode>0){
+                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
+                    this.$message.error("药品标识码格式不正确,请重新扫码")
+                    is_err_check = true
+                  }
+                 }
+                
+
+               }
+
+            }
+          }
+          if(is_err_check == true){
+              arr.splice(i_index,1)
+          }
+         
+          for(let i=0;i<this.newArrList.length;i++){
+             if(drug_code == this.newArrList[i].drug_code){
+                 total_one = this.newArrList[i].child.length
+             }
+          }
+
+          for(let i=0;i<arrList.length;i++){
+             if(drug_code == arrList[i].drug_code){
+                 total_two = arrList[i].child.length
+             }
+          }
+
+
+          console.log("数量1--------------",total_one)
+          console.log("数量2---------------",total_two)
+        
+          console.log("scan_code=====",scan_code)
+          
+          if(scan_code>0){
+            if((total_one + total_two)>scan_code){
+              this.$message.error("扫码次数已经超过限制!")
+              arr.splice(i_index,1)
+            }
+          }
+         
+         var is_arr = this.hasDuplicates(arr)
+
+         console.log("is_arr-=--------------",is_arr)
+
+        this.textarea = arr.join(",")
+
+        }else{
+          this.textarea = textarea
+        }
+       
       }
     },
     tt() {},
@@ -1146,6 +1335,8 @@ export default {
       getTodayAdviceList(params).then((response) => {
         if (response.data.state == 1) {
           this.doctorList = response.data.data.doctorlist;
+          this.baseList =[]
+          this.baseList = response.data.data.drug
           // this.admin_user_id = this.doctorList[0].admin_user_id
           // this.admin_user_id = this.tmp
         }
@@ -1158,6 +1349,8 @@ export default {
       };
     },
     handleCurrentChange(val) {
+      console.log("Valo23333333333333",val)
+      this.drug_id = val.id
       this.currentRow = val;
       this.total = "";
       if (this.state == 1) {
@@ -1184,7 +1377,7 @@ export default {
       getpatientswithdrugs(params).then((res) => {
         if (res.data.state == 1) {
           var list = res.data.data.list; //列表数据
-
+          console.log("list------------------------------",list)
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 ){
             this.tableData = []
             if(list!=null && list.length >0){
@@ -1267,6 +1460,29 @@ export default {
         }
       });
     },
+    hasDuplicates(arr) {
+      const uniqueNumbers = [...new Set(arr)];
+      return uniqueNumbers.length !== arr.length;
+    },
+    getDrugIdentificationCode(id){
+       
+      var drug_identification_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+          if(id == this.baseList[i].id){
+            drug_identification_code = this.baseList[i].drug_identification_code
+          }
+      }
+      return drug_identification_code
+    },
+    getDrugScanCode(drug_id){
+      var scan_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+       if(drug_id == this.baseList[i].id){
+          scan_code = this.baseList[i].scan_code
+       }
+      }
+      return scan_code
+    }
   },
   created() {
     this.init();

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1244,7 +1244,7 @@ export default {
     getDrugCode(id,DataSources,DrugCode,index,DrugId){
       
      // 针对百霖
-       if(this.$store.getters.xt_user.org.id == 10138 ){
+       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){
           var params = {
             drug_id:DrugId,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
@@ -1364,7 +1364,7 @@ export default {
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
          
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
 
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
           console.log("drugindentification===================",drugindentificaitoncode)
@@ -1469,11 +1469,6 @@ export default {
 
          var is_arr = this.hasDuplicates(arr)
 
-        //  if(is_arr == true){
-        //    this.$message.error("药品追溯码已经存在,不能重复扫码!")
-        //    arr.splice(i_index,1)
-        //  }
-
          console.log("is_arr-=--------------",is_arr)
 
           this.textarea = arr.join(",")

src/xt_pages/dialysis/PatientBox.vue

@@ -161,14 +161,14 @@
         </p>
 
 
-        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 && $store.getters.xt_user.org.id!=0&& $store.getters.xt_user.org.id!=10742">
+        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 && $store.getters.xt_user.org.id!=0&& $store.getters.xt_user.org.id!=10742 && $store.getters.xt_user.org.id!=10751">
           透析器/灌流器:{{schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ""}}
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}</span>
           <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
         </p>
 
-        <p v-if="$store.getters.xt_user.org.id ==0 ||  $store.getters.xt_user.org.id ==10742">
+        <p v-if="$store.getters.xt_user.org.id ==0 ||  $store.getters.xt_user.org.id ==10742 || $store.getters.xt_user.org.id ==10751">
           透析器/灌流器/滤过器:
         
           <span v-if="schedule.prescription != null">
@@ -177,6 +177,7 @@
             </span>
             <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
             <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
+            <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_strainer: ""}}</span>
           </span>
 
           <span v-if="schedule.prescription== null && schedule.dialysis_solution!=null">

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -157,8 +157,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723 &&  this.$store.getters.xt_user.template_info.org_id != 10731 &&  this.$store.getters.xt_user.template_info.org_id != 10727"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723 &&  this.$store.getters.xt_user.template_info.org_id != 10731 &&  this.$store.getters.xt_user.template_info.org_id != 10727 &&  this.$store.getters.xt_user.template_info.org_id != 10751"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727||  this.$store.getters.xt_user.template_info.org_id == 10752) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727&&  this.$store.getters.xt_user.template_info.org_id!= 10751"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -49,7 +49,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
+              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727|| this.$store.getters.xt_user.template_info.org_id == 10751) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

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

@@ -136,7 +136,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751)">
                         <el-form-item label="目标超滤量(ml)："
                         prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -150,7 +150,7 @@
 
 
                     <el-col :span="8"
-                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723 && this.$store.getters.xt_user.template_info.org_id != 10731 && this.$store.getters.xt_user.template_info.org_id != 10727">
+                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723 && this.$store.getters.xt_user.template_info.org_id != 10731 && this.$store.getters.xt_user.template_info.org_id != 10727&& this.$store.getters.xt_user.template_info.org_id != 10751">
                         <el-form-item
                         label="目标超滤量(L)：" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -3339,7 +3339,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751){
           this.getPatientBefor()
         }
 
@@ -5190,12 +5190,21 @@ mu
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745 ){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751 ){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000
                 
               }
+
+              if(this.$store.getters.xt_user.template_info.org_id == 10751){
+
+                if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
+              
+                   this.dialysisPrescription.prescription_water = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000
+             
+                }
+              }
             }else{
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
                  this.dialysisPrescription.target_ultrafiltration = (patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 ) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 ) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 ) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 ) ||
               org_id == 10387
             "
           >
@@ -700,7 +700,7 @@
                 org_id == 10395||
                 org_id == 10617 ||
                 org_id ==10677 ||
-                org_id == 10721 || org_id ==10727
+                org_id == 10721 || org_id ==10727 || org_id == 10751
 
                )&& org_id!=10598 && org_id!=10414
             "
@@ -731,7 +731,7 @@
               org_id !=10445 &&
               org_id!=10395 &&
               org_id !=10410 &&
-              org_id!=10617 && org_id!=10677  && org_id!=10721  && org_id!=10727)|| org_id==10598 || org_id ==10414
+              org_id!=10617 && org_id!=10677  && org_id!=10721  && org_id!=10727 && org_id!=10751)|| org_id==10598 || org_id ==10414
             "
           >
             <template slot-scope="scope">
@@ -798,7 +798,8 @@
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10395 ||
-                org_id == 10206
+                org_id == 10206 ||
+                org_id == 10751
                 )
             "
           >
@@ -833,7 +834,8 @@
               org_id !=10432 &&
               org_id !=10445 && 
               org_id!=10395  &&
-              org_id!=10206
+              org_id!=10206 &&
+              org_id!=10751
             "
           >
             <template slot-scope="scope">
@@ -1685,7 +1687,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751) &&
                 org_id!=10387
             "
           >
@@ -1733,7 +1735,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751)
               || org_id == 10387
             "
           >
@@ -1806,7 +1808,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1887,7 +1889,8 @@
               org_id!=10206 &&
               org_id!=10740 &&
               org_id!=10742 &&
-              org_id!=10745
+              org_id!=10745 &&
+              org_id!=10751
               )
               || org_id == 10387 || org_id == 10694
             "
@@ -1953,7 +1956,7 @@
               org_id!=10395 &&
               org_id!=10617 &&
               org_id!=10677 &&
-              org_id!=10721 && org_id!=10727 && org_id!=10206)
+              org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10751)
               || org_id ==10558 || org_id==10598
             "
           >
@@ -1981,7 +1984,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206) && org_id !=10558 && org_id!=10598 && org_id!=10414
+                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751) && org_id !=10558 && org_id!=10598 && org_id!=10414 
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -2022,7 +2025,8 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10395 &&
-              org_id!=10414
+              org_id!=10414 &&
+              org_id!=10751
             "
           >
             <el-form-item label="置换量(L)：" :prop="isName('置换量')"
@@ -2052,7 +2056,7 @@
                 org_id!=10340 ||
                 org_id ==10432 ||
                 org_id ==10445 ||
-                org_id == 10395) &&
+                org_id == 10395 || org_id == 10751) &&
                 org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,22 +20,22 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -13,6 +13,15 @@
 
       </div>
       <div style="margin-bottom: 10px;">
+        <el-input
+          size="small"
+          style="width: 196px;"
+          placeholder="请输入姓名"
+          v-model="keywords"
+          @input="searchAction"
+          @keyup.enter.native="searchAction"
+        />
+
         <el-date-picker
           size="small"
           v-model="start_time"
@@ -42,13 +51,14 @@
           value-format="yyyy-MM-dd"
           align="right"
         ></el-date-picker>
+
         <el-button size="small" type="primary"
                    @click="query">查询
         </el-button>
-        <el-button size="small" type="primary"
+        <el-button v-if="$store.getters.xt_user.org_id != 10318" size="small" type="primary"
                    @click="login">短信登录税局
         </el-button>
-        <el-button size="small" type="primary"
+        <el-button v-if="$store.getters.xt_user.org_id != 10318"  size="small" type="primary"
                    @click="auth">认证
         </el-button>
       </div>
@@ -158,7 +168,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作">
+        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                         @click="blue(scope.row)">
@@ -187,6 +197,28 @@
             </el-button>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="操作" v-else>
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
+                       @click="BWblue(scope.row)">
+              开票
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'" size="mini" type="primary"
+                       @click="BWhongchong(scope.row)">
+              红冲
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
+                       @click="yulan(scope.row)">
+              下载
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
+                       @click="BWchaxun(scope.row)">
+              查询并同步发票号码
+            </el-button>
+          </template>
+        </el-table-column>
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -259,7 +291,9 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="settlementVisible = false">取 消</el-button>
-        <el-button type="primary" @click="blueRequest">开票</el-button>
+        <el-button type="primary" @click="blueRequest" v-if="this.$store.getters.xt_user.org_id != 10318 &&  this.$store.getters.xt_user.org_id != 0">开票</el-button>
+        <el-button type="primary" @click="bwblueRequest" v-if="this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0">开票</el-button>
+
       </span>
     </el-dialog>
 
@@ -396,6 +430,11 @@ export default {
   },
 
   methods: {
+    searchAction(){
+
+      this.getHisOrderList()
+
+    },
     chaxun(row){
       let params = {
         "id": row.result.id,
@@ -695,6 +734,36 @@ export default {
     },download(){
 
 
+    },bwblueRequest(){
+      let params = {
+        "order_ids": this.cur_ids,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/blue',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.settlementVisible = false
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
     },blueRequest(){
       let params = {
         "order_ids": this.cur_ids,
@@ -725,6 +794,51 @@ export default {
         }
       }).catch(function(error) {
       })
+    },BWblue(row){
+      var  ids = row.id
+      this.cur_ids =ids
+      this.patient_id = row.patient_id
+      console.log(row)
+      let paramsObj = {
+        order_ids: ids,
+        patient_id: row.patient_id,
+      }
+      this.settlementVisible = true
+      this.paramsObj = paramsObj
+
+
+    },BWhongchong(row){
+      var  id = row.result.id
+
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/red',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
+
+
     },
     blue(row){
       var  ids = row.id
@@ -752,7 +866,12 @@ export default {
       // })
 
 
-    }, yulan(row){
+    }, BWchaxun(row){
+
+
+
+
+    },yulan(row){
       window.open( row.result.pdf_url, "_blank");
       // this.settlementVisibletwo = true
       // this.pdfSrc = row.result.pdf_url

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1195,7 +1195,7 @@ export default {
         { value: 14, label: '门诊特殊病' },
         { value: '992102', label: '单病种(992102)' },
         { value: '140104', label: '城乡门诊特殊病(140104)' },
-        { value: '1104', label: '省外异地门诊慢特病'},
+        { value: '1104', label: '异地门特'},
         { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
@@ -5873,6 +5873,9 @@ export default {
       }else{
         if(this.org_id != 10721  && this.org_id != 0 && this.org_id != 10726) {
           switch (med_type) {
+            case 1104:
+              return '异地门特(1104)' + '处方' + index
+              break
             case 11:
               return '普通门诊' + '处方' + index
 
@@ -5932,6 +5935,9 @@ export default {
             case 992102:
               return '单病种(992102)' + '处方' + index
               break
+            case 1104:
+              return '异地门特(1104)' + '处方' + index
+              break
 
             case 140104:
               return '门诊特殊病(140104)' + '处方' + index

src/xt_pages/user/inspection_new.vue

@@ -456,22 +456,10 @@ export default {
           var inspection = response.data.data.inspection
           var referenceList = response.data.data.referenceList
           this.total = response.data.data.inspection.length
-          // inspection.forEach(item => {
-          //   referenceList.forEach(ite => {
-          //     item.Child.forEach(it =>{
-          //       if(ite.item_id == it.item_id){
-          //         ite.inspect_value = it.inspect_value
-          //       }
-
-          //       // if()
-          //     })
-          //   })
-          // });
           this.items = inspection
           this.list = referenceList
           this.$nextTick(() => {
             this.$refs.inspect_table.doLayout();
-            // table加ref="multipleTable"
           });
         }
         console.log('response.data.data22',response.data.data);

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