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

package-lock.json

@@ -1740,6 +1740,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -5139,6 +5149,13 @@
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
       "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -14706,6 +14723,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

src/store/modules/globalConfig.js

@@ -70878,6 +70878,10 @@ const global_config = {
     {
       id: 4,
       name: '血流不止'
+    },
+    {
+      id: 5,
+      name: '患者要求'
     }
     ],
     hemostasis_opera: [{

src/xt_pages/Pharmacy/DispensingDetails.vue

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

src/xt_pages/Pharmacy/PatientDispensing.vue

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

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

@@ -38,7 +38,7 @@
               <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
               kg
             </span>
-            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702 &&this.$store.getters.xt_user.template_info.org_id!=10721">
               透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
             </span>
 
@@ -46,7 +46,7 @@
              衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
             </span>
 
-            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598">
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10721">
               体重增长：
               <span v-if="predialysis!=null && last_record!=null">
                 {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
@@ -2638,7 +2638,7 @@ mu
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
       
-        if(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==0   || this.$store.getters.xt_user.template_info.org_id==10721){
+        if(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==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
@@ -3103,7 +3103,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){
+        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.getPatientBefor()
         }
       

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -17,10 +17,11 @@
                 <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
                     <tr>
                     <th width="40px">姓名</th>
-                    <th width="40px">透析器</th>
+                    <th width="50px">透析器</th>
+                    <th width="40px">床位号</th>
                     <!-- <th width="50px">类型</th> -->
                     <th width="50px">开始时间</th>
-                    <th width="100px">医嘱内容</th>
+                    <th width="200px">医嘱内容</th>
                     <th width="50px">执行时间</th>
                     <th width="50px">执行护士</th>
                     <th width="50px">校对护士</th>
@@ -41,6 +42,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
                     </tr>
                     <template v-for="schedule in schedules">
                         <template v-for="(group, group_index) in schedule.new_advice">
@@ -67,9 +69,19 @@
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
                             <span v-if="schedule.mode_id == 24">I-HDF</span>
+
+                          
                             </td>
+                           
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                            {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_dialyszers : "/"}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_irrigation : "/"}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_strainer : ""}}
+                              
+                            </td>
+                            <td>
+                                {{ schedule.device_number.number }}
                             </td>
                             <!-- <td
                             v-if="advice_index == 0"
@@ -264,7 +276,7 @@ export default {
     },
     methods:{
         printAction: function() {
-            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
+            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 5px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 0px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 5px 5px !important;} }'
 
             printJS({
             printable: 'dialysisTable',
@@ -475,7 +487,7 @@ export default {
                     }
                  }
 
-
+                 console.log("sort===========",scheduleMap)
                  this.scheduleMap = scheduleMap
                 }
 
@@ -634,7 +646,7 @@ export default {
                     }
                  }
 
-
+                     console.log("scheduleMap------------------",scheduleMap)
                      this.scheduleMap = scheduleMap
                  }
 

src/xt_pages/dialysis/doctorAdvicePrintTwo.vue

@@ -142,6 +142,8 @@ export default {
                      for(let j=0;j<hisAdvices[i].doctor_advice.length;j++){
                         hisAdvices[i].doctor_advice[j].patient_name = ""
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
+                        hisAdvices[i].doctor_advice[j].sort = 0
+                        hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
                         if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
                              newArr.push(hisAdvices[i].doctor_advice[j])
@@ -151,7 +153,7 @@ export default {
                    }
                 }
                 this.tableData = []
-                this.tableData = newArr
+                this.tableData = newArr.sort((a, b) => a.sort - b.sort)
                 console.log("newArr------",newArr)
                
                }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1550,11 +1550,11 @@ export default {
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
        }
 
-       if(this.org_id == 0 || this.org_id == 10721){
+       if(this.org_id == 10721){
          this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
        }
 
-       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0 && this.org_id!=10721){
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=10721){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -292,12 +292,12 @@
                     {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : " " }}
                 </div>ml
             </div>
-            <div class="inline_block" style="margin-right:30px;">
+            <!-- <div class="inline_block" style="margin-right:30px;">
                 电导度
                 <div class="inline_block under_line" style="width:100px;">
                     {{ prescription.conductivity ? prescription.conductivity : " " }}
                 </div>mS/m
-            </div>
+            </div> -->
         </div>
         <div class="row">
           透前评估
@@ -347,10 +347,10 @@
             <span v-if="predialysis.is_hemorrhage == 2">无</span>
             <span v-if="predialysis.is_hemorrhage != 2 && predialysis.is_hemorrhage != 1">/</span>
           </div>
-          跌倒风险预防措施
+          <!-- 跌倒风险预防措施
           <div class="inline_block under_line" style="width:100px;text-align: center;">
             {{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '' }}
-          </div>
+          </div> -->
         </div>
         <div class="row">
           上机医生
@@ -440,14 +440,14 @@
           <tbody>
               <tr style="line-height:20px;">
                 <td width="60">时间</td>
-                <td width="60">BP</td>
-                <td width="40">脉搏</td>
-                <td width="40">血流速</td>
-                <td width="100">静脉压/动脉压</td>
-                <td width="40">超滤量</td>
-                <td width="40">TMP</td>
-                <td width="40">电导率</td>
-                <td width="40">温度</td>
+                <td width="60">BP<br/>mmHg</td>
+                <td width="40">脉搏<br/>次/分</td>
+                <td width="40">血流速<br/>ml/min</td>
+                <td width="100">静脉压/动脉压<br/>mmHg</td>
+                <td width="40">超滤量<br/>ml</td>
+                <td width="40">TMP<br/>mmHg</td>
+                <td width="40">电导率<br/>(mS/cm)</td>
+                <td width="40">温度<br/>℃</td>
                 <!-- <td width="40">透析液流量</td> -->
                 <td width="40">UF/hr</td>
                 <td width="200">病情变化处理方式及结果</td>
@@ -517,33 +517,41 @@
                           </span>次/分
                         </div>
                       </td>
-                      <td width="70" style="border:none;padding-left:5px">透后症状:</td>
+                      <td width="80" style="border:none;padding-left:5px">实际置换量:</td>
+                      <td width="60" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:50px;display:inline-block">
+                            {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
+                          </span>L
+                        </div>
+                      </td>
+                      <!-- <td width="70" style="border:none;padding-left:5px">透后症状:</td>
                       <td width="100" style="text-align:left;border:none;">
                         <div>
                           <span class="under_line" style="width:100px;display:inline-block">
                             {{ afterdialysis.symptom_after_dialysis ? afterdialysis.symptom_after_dialysis : "" }}
                           </span>
                         </div>
-                      </td>
+                      </td> -->
                     </tr>
                   </tbody>
                 </table>
                 <table class="table-box">
                   <tbody>
-                    <tr style="height:30px;line-height:30px;">
-                      <td width="80" style="border:none;padding-left:5px">实际置换量:</td>
+                    <tr >
+                      <!-- <td width="80" style="border:none;padding-left:5px">实际置换量:</td>
                       <td width="60" style="text-align:left;border:none;">
                         <div>
                           <span class="under_line" style="width:50px;display:inline-block">
                             {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
                           </span>L
                         </div>
-                      </td>
+                      </td> -->
 
 
                       <!-- <td width="50" style="text-align:left;border:none;"></td> -->
                       <!-- <td width="110" style="text-align:left;border:none;"></td> -->
-                      <td width="120" style="border:none;padding-left:5px">透析期间进食:</td>
+                      <!-- <td width="120" style="border:none;padding-left:5px">透析期间进食:</td>
                       <td width="120" style="text-align:left;border:none;">
                         <div>
                           <span class="under_line" style="width:120px;display:inline-block">
@@ -551,8 +559,8 @@
                             <span v-if='afterdialysis.is_eat == 2'>否</span>
                           </span>
                         </div>
-                      </td>
-                      <td width='20'></td>
+                      </td> -->
+                      <!-- <td width='20'></td>
                       <td width="70" style="border:none;padding-left:5px">透析进食:</td>
                       <td width="70" style="text-align:left;border:none;">
                         <div>
@@ -561,7 +569,7 @@
                           </span>g
                         </div>
                       </td>
-                      <td></td>
+                      <td></td> -->
                       <!-- <td width="10" style="text-align:left;border:none;"></td>
                       <td width="110" style="text-align:left;border:none;"></td> -->
                     </tr>
@@ -570,14 +578,22 @@
                 <table class="table-box">
                   <tbody>
                     <tr>
-                      <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
-                      <td width="220" style="text-align:left;border:none;">
+                      <td width="100" style="border:none;padding-left:5px">透析进食:</td>
+                      <td width="70" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:50px;display:inline-block">
+                            {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }}
+                          </span>g
+                        </div>
+                      </td>
+                      <td width="100" style="border:none;padding-left:5px">透析器凝血:</td>
+                      <td width="200" style="text-align:left;border:none;">
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                         </span>
                       </td>
                       <td width="90" style="border:none;padding-left:5px">静脉管道:</td>
-                      <td width="220" style="text-align:left;border:none;">
+                      <td width="200" style="text-align:left;border:none;">
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{  getintravenous(afterdialysis.intravenous_tube) }}
                         </span>
@@ -588,7 +604,7 @@
                         <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp; -->
                       </td>
                       <td width="90" style="border:none;padding-left:5px">动脉管道:</td>
-                      <td width="220" style="text-align:left;border:none;">
+                      <td width="200" style="text-align:left;border:none;">
                         <span class="under_line" style="width:100px;display:inline-block">
                           {{ getarterial(afterdialysis.arterial_tube) }}
                         </span>

src/xt_pages/outpatientCharges/summary.vue

@@ -169,7 +169,7 @@
         highlight-current-row
         height="calc(100vh - 300px)"
       >
-        <el-table-column align="center" type="selection" width="55"></el-table-column>
+        <el-table-column align="center" type="selection" width="50"></el-table-column>
         <el-table-column
           prop="date"
           label="序号"
@@ -192,7 +192,7 @@
         <el-table-column align="center" width="60" prop="name" label="患者年龄">
           <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="患者类型">
+        <el-table-column align="center" width="90" prop="name" label="患者类型">
           <template slot-scope="scope">
             {{ getpatient(scope.row.patient.patient_type) }}
           </template>
@@ -233,7 +233,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" width="90" prop="name" label="险种类型">
+        <el-table-column align="center" width="60" prop="name" label="险种类型">
           <template slot-scope="scope">
             <div v-if="scope.row.insutype == '390'">
               城乡居民
@@ -269,20 +269,20 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="70" prop="name" label="收费员">
+        <el-table-column align="center" width="65" prop="name" label="收费员">
           <template slot-scope="scope">{{
               getName(scope.row.creator)
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="70" prop="name" label="状态">
+        <el-table-column align="center" width="65" prop="name" label="状态">
           <template slot-scope="scope">
             <div v-if="scope.row.order_status == 1">待结算</div>
             <div v-if="scope.row.order_status == 2">已结算</div>
             <div v-if="scope.row.order_status == 3">已退费</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作">
+        <el-table-column align="center" width="110" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
             >详情
@@ -375,6 +375,13 @@
               @click="invoicePrint(scope.row)"
             >打印发票
             </el-button>
+            <el-button
+              class="butt_2"
+              size="mini"
+              type="primary"
+              @click="open(scope.row)"
+            >打印结算清单
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -431,15 +438,16 @@
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
       <statement-list-print ref="printlist" :paramsObj='orderObj'></statement-list-print>
     </el-dialog>
-
+    <!-- 打印结算清单 -->
     <el-dialog
       class="centerDialog"
       width="900px"
       title="打印"
       :visible.sync="listVisible"
     >
-      <listPrint></listPrint>
+      <listPrint :paramsObj='paramsObj'></listPrint>
     </el-dialog>
+    
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -712,7 +720,7 @@ export default {
       allListVisible: false,
       adminUserOptions: [],
       invoiceVisible: false,
-      paramsObj: {},
+      paramsObj: {id:''},
       invoiceParams: {},
       settlementVisible: false,
       settlementObj: {},
@@ -720,7 +728,10 @@ export default {
       org_id:'',
       patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
                         {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
-      ]
+      ],
+      // paramsObj3:{
+      //   id:''
+      // }
     }
   },
 
@@ -4083,12 +4094,14 @@ export default {
         }
       })
     },
-    open(index) {
-      if (index == 1) {
+    open(row) {
+      console.log('row',row);
+      this.paramsObj.id = row.id
+      // if (index == 1) {
         this.listVisible = true
-      } else if (index == 2) {
-        this.allListVisible = true
-      }
+      // } else if (index == 2) {
+      //   this.allListVisible = true
+      // }
     }, unique(array) {
       // res用来存储结果
       var res = []

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