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

src/store/modules/globalConfig.js

@@ -569,6 +569,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      25: {
+        id: 25,
+        name: 'HD高通',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/data/prescription.vue

@@ -4,7 +4,7 @@
       <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container ">
-      
+
       <div class="dataTitle">透析模板</div>
 
       <div
@@ -788,7 +788,22 @@ export default {
           sodium: 1,
           calcium: 1,
           bicarbonate: 1
-       }
+       },
+        {
+          id: 25,
+          name: 'HD高通',
+          dialysis_duration: 1,
+          replacement_way: 1,
+          hemodialysis_machine: 2,
+          blood_filter: 1,
+          perfusion_apparatus: 2,
+          blood_flow_volume: 1,
+          dialysate_flow: 1,
+          kalium: 1,
+          sodium: 1,
+          calcium: 1,
+          bicarbonate: 1
+        }
       ],
       addPlan: {
         id: 0,
@@ -888,7 +903,7 @@ export default {
           this.InnerDialogProps.type = 'dialyzers'
           this.InnerDialogProps.selected = this.dialysis_dialyszers
           this.InnerDialogProps.isShowTextArea = false
-        
+
           break
         case '7':
           for(let i=0;i<this.irrigations.length;i++){
@@ -899,7 +914,7 @@ export default {
           this.InnerDialogProps.type = 'irrigations'
           this.InnerDialogProps.selected = this.dialysis_irrigation
           this.InnerDialogProps.isShowTextArea = false
-        
+
           break
       }
     },
@@ -1008,7 +1023,7 @@ export default {
             prescription.dialysis_duration = parseFloat(prescription.dialysis_duration_hour) + parseFloat((prescription.dialysis_duration_minute / 60).toFixed(2))
            if(prescription.dialysate_formulation == 0){
               prescription.dialysate_formulation = ""
-           } 
+           }
            if(prescription.body_fluid ==0 ){
              prescription.body_fluid = ""
            }
@@ -1058,7 +1073,7 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
-          
+
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
@@ -1178,7 +1193,7 @@ export default {
 
     this.blood_filters = this.$store.getters.blood_filters;
     this.dialysate_formulation = this.$store.getters.dialysate_formulation;
-   
+
     this.body_fluid_option = this.$store.getters.body_fluid;
     this.special_medicine_option = this.$store.getters.special_medicine;
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
@@ -1191,8 +1206,8 @@ export default {
     )
     this.getAllSystemPrescription();
     this.getSystemPrescription(this.addPlan.mode);
-    
-   
+
+
   },
   watch: {
     "addPlan.dialysis_duration": function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -112,8 +112,8 @@
           <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 != 36 && 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.org_id != 9555" 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 == 36 || 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.org_id == 9555" 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 != 36 && 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.org_id != 9555" 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 == 36 || 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.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

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.org_id == 9555) " >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.org_id == 9555 " >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.org_id == 9555) " >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.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -87,7 +87,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 == 36 || 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.org_id == 9555 )">
+                            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 == 36 || 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.org_id == 9555 )">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <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 != 36 && 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.org_id != 9555 ">
+                            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 != 36 && 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.org_id != 9555 ">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

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

@@ -169,6 +169,7 @@
                   template_id == 39 ||
                   template_id == 40 ||
                   template_id == 41 ||
+                  template_id == 43 ||
                   org_id == 9555)
             "
           >
@@ -214,6 +215,7 @@
                 template_id != 39 &&
                 template_id != 40 &&
                 template_id != 41 &&
+                template_id != 43 &&
                 org_id!=9555
             "
           >
@@ -231,7 +233,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || 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) "
+            v-if="isShow('超滤率') && (template_id == 6 || 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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -242,7 +244,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && 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"
+            v-if="isShow('超滤率') && template_id != 6 && 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 slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -641,12 +643,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || 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) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || 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) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && 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">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && 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">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -654,7 +656,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || 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 == 27 || 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 == 41 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || 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 == 27 || 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 == 41 || template_id == 43 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -662,7 +664,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && 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!=27 && 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!=41 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && 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!=27 && 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!=41 && template_id!=43 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" 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('超滤量') &&(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 || this.$store.getters.xt_user.template_info.org_id == 9555)" 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  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || 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)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && 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" width="50px"> 超滤率 <br />(L/h) </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 || this.$store.getters.xt_user.template_info.org_id == 9555)" 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  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || 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)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && 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" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" 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) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -583,6 +583,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 43">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -873,6 +883,11 @@
             v-if="org_template_info.template_id == 42"
           >
           </DialysisPrintOrderFortyTwo>
+          <DialysisPrintOrderFortyThree
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 43"
+          >
+          </DialysisPrintOrderFortyThree>
         </div>
       </el-container>
     </div>
@@ -934,9 +949,11 @@ import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNin
 import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
 import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
 import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
+import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortyThree,
     DialysisPrintOrderFortyTwo,
     DialysisPrintOrderFortyOne,
     DialysisPrintOrderForty,
@@ -1141,7 +1158,7 @@ export default {
       const style =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
@@ -1441,6 +1458,13 @@ export default {
           style: style10,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 43) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -124,13 +124,13 @@
           </td>
         </tr>
         <tr>
-          <td style="text-align:left;" colspan="1">
+          <!-- <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               净脱水:
               {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}kg
             </span>
-          </td>
-          <td style="text-align:left;" colspan="1">
+          </td> -->
+          <td style="text-align:left;" colspan="2">
             <span style="display:inline-block;margin-left:15px;">
               透析时长:
               {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}h

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,9 +13,12 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id != 10106" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
-            <!-- <printThree :paramsObj="invoiceParams"></printThree> -->
+          <div v-if="org_id != 10106" >
+            <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+          </div>
+          <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
+            
         </div>
     </div>
   </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -5,17 +5,17 @@
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;left:400px;top:85px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;left:250px;top:100px;">{{ list.department_name }}</div>
             <!-- <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div> -->
             <div></div>
             <div>
-                <span style="position: absolute;left:120px;top:60px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;left:80px;top:80px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
                 <!-- <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
                 <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>-->
             </div> 
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:80px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
             <!-- <div style="position: absolute;top:60px;left:210px;">√</div> -->
             <!-- <div>{{ list.pay_way }}</div> -->
             <!-- <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
@@ -28,23 +28,23 @@
             <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
         </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
-            <div style="position: absolute;top:120px;left:120px">西药 {{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:120px;left:80px">西药 {{ list.westernMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
-            <div style="position: absolute;top:140px;left:120px">检查费 {{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:140px;left:80px">检查费 {{ list.checkCostTotal }}</div>
             <!-- <div style="position: absolute;top:180px;left:80px"></div> -->
-            <div style="position: absolute;top:160px;left:120px">治疗费 {{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:80px">治疗费 {{ list.treatCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
-            <div style="position: absolute;top:180px;left:120px">床位费 {{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:180px;left:80px">床位费 {{ list.bedCostTotal }}</div>
             <!-- <div style="position: absolute;top:140px;left:80px"></div> -->
         <!-- </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
-            <div style="position: absolute;top:200px;left:120px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:200px;left:80px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:220px;left:120px">化验费 {{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:80px">化验费 {{ list.laboratoryCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:240px;left:120px">手术费 {{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:240px;left:80px">手术费 {{ list.operationCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
-            <div style="position: absolute;top:260px;left:120px">其他费 {{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:260px;left:80px">其他费 {{ list.otherCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
         <!-- </div> -->
         <!-- <div style="display:flex;justify-content: space-between;"> -->
@@ -52,7 +52,7 @@
             <div style="position: absolute;top:200px;left:110px"></div>
             <div style="position: absolute;top:200px;left:200px"></div>
             <div style="position: absolute;top:200px;left:280px"></div> -->
-            <div style="position: absolute;top:280px;left:120px">材料费 {{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:280px;left:80px">材料费 {{ list.materialCostTotal }}</div>
             <!-- <div style="position: absolute;top:200px;left:460px"></div> -->
             <!-- <div style="position: absolute;top:200px;left:560px"></div>
             <div style="position: absolute;top:200px;left:640px"></div> -->
@@ -104,11 +104,11 @@
             </span>
             <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
         </div> -->
-        <div style="position: absolute;top:300px;left:120px">合计大写 {{ zhongwen }}</div>
-        <div style="position: absolute;top:300px;left:400px">合计小写 {{ list.psn_cash_money }}</div>
+        <div style="position: absolute;top:300px;left:80px">合计大写 {{ zhongwen }}</div>
+        <div style="position: absolute;top:300px;left:300px">合计小写 {{ list.psn_cash_money }}</div>
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
-            <div style="position: absolute;top:320px;left:120px">{{ list.name }}</div>
+            <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>
         </div>
     </div>
 </template>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2188,8 +2188,10 @@
                         confirmButtonText: '确 定',
                         type: 'warning'
                       }).then(() => {
+                        that.changeRadioAndPatient(1)
                         that.newLoading = false
                       }).catch(() => {
+                        that.changeRadioAndPatient(1)
                         that.newLoading = false
                       })
                     } else {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -89,9 +89,9 @@
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td>{{info.begndate}}</td>
+        <td>{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
         <td>出院日期</td>
-        <td width="100">{{info.enddate}}</td>
+        <td width="100">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
         <td>住院天数</td>
         <td>{{getDay(info.begndate,info.enddate)}}</td>
 
@@ -123,7 +123,7 @@
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">

src/xt_pages/outpatientCharges/summary.vue

@@ -645,16 +645,8 @@
 
             let list = []
             for (let i = 0; i < response.data.data.order.length; i++) {
-              let order = response.data.data.order[i]
-
-
-              if (order.patient != null && order.patient.name.length > 0) {
-                name = order.patient.name
 
-              }
 
-              let time = order.setl_time
-              let name = order.his_patient.name
               var hifmi_pay = 0.00
               for (let b = 0; b < order.order_info.length; b++) {
                 let item_name = ""
@@ -662,6 +654,8 @@
                 let price = ""
                 let unit = ""
                 let spec = ""
+                let time = ""
+                let name = ""
                 let selfpay_prop = ""
                 if(order.order_info[b].advice.id == 0 && order.order_info[b].project.id > 0){
                   item_name = order.order_info[b].project.project.project_name

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -487,6 +487,14 @@
 
   export default {
     props: {
+      drugs:Array,
+      allDrugs:Array,
+      advices_template:Array,
+      doctors: Array,
+      department:Array,
+      sick: Array,
+      diagnoses: Array,
+      additions: Array,
       patientInfo: Object,
       hisPatientInfo: Object,
       prescriptions: Array,
@@ -1700,7 +1708,7 @@
       },
 
       querySearch2(queryString, cb) {
-        var restaurants = this.other_sick
+        var restaurants = this.sick
         restaurants.map(item => {
           item.value = item.name
         })
@@ -1725,30 +1733,30 @@
         return getDictionaryDataConfig(module, filed_name)
 
       },
-      getInitData() {
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
-
-          }
-        })
-
-      },
+      // getInitData() {
+      //   getInitData().then(response => {
+      //     if (response.data.state == 0) {
+      //       this.$message.error(response.data.msg)
+      //       return false
+      //     } else {
+      //       this.drugs = response.data.data.drugs
+      //       this.allDrugs = response.data.data.drugs
+      //       this.advices_template = response.data.data.advices_template
+      //       this.doctors = response.data.data.doctors
+      //       for (let i = 0; i < this.doctors.length; i++) {
+      //         if (this.doctors[i].user_type == 1) {
+      //           this.doctors.splice(i, 1)
+      //         }
+      //       }
+      //       this.department = response.data.data.department
+      //       this.sick = response.data.data.sick
+      //       this.diagnoses = response.data.data.diagnose
+      //       this.additions = response.data.data.additions
+      //
+      //     }
+      //   })
+      //
+      // },
       monthTabclickEvent(val) {
 
         for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1849,7 +1857,10 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
+      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
+        this.sick = sick
+        this.diagnoses = diagnoses
+        this.department = department
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
@@ -1926,108 +1937,86 @@
         }
 
         if (this.departmentValue == '' || this.departmentValue == 0) {
-          if (this.department.length > 0) {
-            this.departmentValue = this.department[0].id
+          if (department.length > 0) {
+            this.departmentValue = department[0].id
 
           }
         }
 
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.onceTime = false
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
+        if (info.id > 0) {
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.departments
+        } else {
+          if (admin_info.id > 0 && admin_info.user_type == 2) {
+            this.doctorValue = admin_info.admin_user_id
+            this.departmentValue = department[0].id
 
-            if (info.id > 0) {
-              this.doctorValue = info.doctor_id
-              this.departmentValue = info.departments
-            } else {
-              if (admin_info.id > 0 && admin_info.user_type == 2) {
-                this.doctorValue = admin_info.admin_user_id
-                this.departmentValue = this.department[0].id
+          } else {
+            this.doctorValue = doctors[0].admin_user_id
+            this.departmentValue = department[0].id
+          }
+        }
 
-              } else {
+        // if (info.register_type == 0) {
+        //   for (let i = 0; i < this.register.length; i++) {
+        //     this.register_type = this.register[0].value
+        //   }
+        // } else {
+        //   this.register_type = info.register_type
+        // }
 
-                this.doctorValue = this.doctors[0].admin_user_id
-                this.departmentValue = this.department[0].id
 
-              }
 
-            }
+        this.diagnose = []
 
-            if (info.register_type == 0) {
-              for (let i = 0; i < this.register.length; i++) {
-                this.register_type = this.register[0].value
-              }
-            } else {
-              this.register_type = info.register_type
-            }
+        if (info.id == 0) {
+          if (last_info.diagnosis.length == 0) {
             this.diagnose = []
+          } else {
+            console.log(last_info.diagnosis)
+            for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
+              this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
+            }
+          }
 
-            if (info.id == 0) {
-              if (last_info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
-
-                }
-              }
-
-              if (last_info.sick_history == 0) {
-                this.state2 = ''
-              } else {
-                this.state2 = last_info.sick_history
-              }
-
-            } else {
-              this.state2 = info.sick_history
-              if (this.state2 == 0) {
-                this.state2 = ''
-              }
-              if (info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
-
-                }
+          if (last_info.sick_history == 0) {
+            this.state2 = ''
+          } else {
+            this.state2 = last_info.sick_history
+          }
 
-              }
+        } else {
+          this.state2 = info.sick_history
+          if (this.state2 == 0) {
+            this.state2 = ''
+          }
+          if (info.diagnosis.length == 0) {
+            this.diagnose = []
+          } else {
+            for (let i = 0; i < info.diagnosis.split(",").length; i++) {
+              this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
 
             }
 
-            this.state1 = info.sick_type
-            if (this.state1 == 0 || this.state1 == '') {
-              this.state1 = ''
-              for (let i = 0; i < this.sick.length; i++) {
-                this.state1 = this.sick[0].id
-              }
-            }
+          }
 
-            if (this.departmentValue == '' || this.departmentValue == 0) {
-              if (this.department.length > 0) {
-                this.departmentValue = this.department[0].id
+        }
 
-              }
-            }
+        this.state1 = info.sick_type
+        if (this.state1 == 0 || this.state1 == '') {
+          this.state1 = ''
+          for (let i = 0; i < this.sick.length; i++) {
+            this.state1 = this.sick[0].id
+          }
+        }
+
+        if (this.departmentValue == '' || this.departmentValue == 0) {
+          if (department.length > 0) {
+            this.departmentValue = department[0].id
 
           }
-        })
+        }
+
 
       },
       setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
@@ -3162,7 +3151,7 @@
       }
     }, mounted() {
       this.request_record_date = this.record_date
-      this.getInitData()
+      // this.getInitData()
       //获取所有项目
       this.getlist()
       //获取所以项目组套

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -5,6 +5,24 @@
         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
+
+
+                <el-date-picker
+                        v-model="record_date"
+                        prefix-icon="el-icon-date"
+                        @change="changeTimeTwo"
+                        :editable="false"
+                        style="width: 100%;"
+                        type="date"
+                        :picker-options="pickerOptions"
+                        placeholder="选择开始时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+
+
+
                 <div class="mainCell" style="justify-content: space-between;">
                     <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
                     <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
@@ -126,7 +144,13 @@
                 <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
                 <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
                 <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
-                                   :other_sick="other_sick" :record_date="record_date"
+                                   :sick="sick" :record_date="record_date"
+                                   :drugs="drugs"
+                                   :allDrugs="allDrugs"
+                                   :advices_template="advices_template"
+                                   :additions="additions"
+                                   :doctors="doctors"
+                                   :department="department"
                                    v-on:change="changeOther"
                                    v-on:month="changeMonth"
                                    v-on:day="changeDay"
@@ -295,7 +319,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import deskPrescription from './components/deskPrescription'
   import deskRecord from './components/deskRecord'
-  import { createCaseHistory, getMonthHisPateintInfo, getPatientInfo, getSchedulePatientList } from '@/api/his/his'
+  import { createCaseHistory, getMonthHisPateintInfo, getPatientInfo, getSchedulePatientList, getInitData } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import medicalRecord from './components/medicalRecord'
   import saveRecordTemplate from './components/saveRecordTemplate'
@@ -324,6 +348,16 @@
     },
     data() {
       return {
+        drugs:[],
+        allDrugs:[],
+        advices_template:[],
+        sick:[],
+        diagnoses: [],
+        additions: [],
+        doctors: [],
+        department: [],
+
+
         tableHeight: '',
         saveloading: false,
         fullHeight: document.documentElement.clientHeight,
@@ -354,15 +388,12 @@
         hisPatientInfo: {},
         case_history: {},
         patient_id: 0,
-        diagnoses: [],
         other_sick: [],
         info: {},
         last_info: {},
         templatedetail: {},
         detalid: 0,
         prescription_id: 0,
-        doctors: [],
-        department: [],
         patientid: 0,
         prescriptionList: [],
         centerDialogVisible: false,
@@ -382,7 +413,6 @@
         paramsObj3: {},
         recordVisible: false,
         recordObj: {},
-        additions: [],
         dialysisShow: true,
 
         all_data: [],
@@ -398,6 +428,9 @@
       }
     },
     methods: {
+      changeTimeTwo() {
+        this.getList()
+      },
       openPrint() {
         // this.centerDialogVisible = true
         this.getPrescriptionList(this.patientInfo.id)
@@ -1150,6 +1183,25 @@
       //   this.month_prescriptions.push(p2)
       //
       // },
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugs = response.data.data.drugs
+            this.allDrugs = response.data.data.drugs
+            this.advices_template = response.data.data.advices_template
+
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+            this.diagnoses = response.data.data.diagnose
+            this.additions = response.data.data.additions
+
+          }
+        })
+
+      },
       getList() {
         let params = {
           'record_date': this.record_date,
@@ -1609,7 +1661,7 @@
               }
             }
             console.log('~~~~~00000222222')
-            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
           }
         })
 
@@ -2116,7 +2168,7 @@
                       //   }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                   this.$refs.child.watchSign = 0
                 }
               })
@@ -2578,7 +2630,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                   this.$refs.child.watchSign = 0
                 }
               })
@@ -3042,7 +3094,7 @@
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3582,7 +3634,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 }
               })
 
@@ -4018,7 +4070,7 @@
 
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 }
               })
             } else {
@@ -4463,6 +4515,7 @@
       }
     },
     created() {
+      this.getInitData()
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
@@ -4475,8 +4528,8 @@
         (nowDay < 10 ? '0' + nowDay : nowDay)
       this.getList()
 
-      this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
-      this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
+      // this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
+      // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight