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

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -114,7 +114,7 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- <div>
+          <div>
             班次：
             <el-select
               v-model="shift"
@@ -157,11 +157,11 @@
               >
               </el-option>
             </el-select>
-          </div> -->
+          </div>
           <div>
-            <!-- <el-button type="primary" @click="toExport" v-if="state == 2"
+            <el-button type="primary" @click="toExport" v-if="state == 2"
               >导出</el-button
-            > -->
+            >
             <!-- <el-button type="primary" @click="tt">调试</el-button>-->
             <el-button type="primary" @click="dispense" v-if="state == 1"
               >发药</el-button
@@ -173,8 +173,6 @@
 
         <el-divider></el-divider>
         <div class="right_table">
-          <!-- :summary-method="getSummaries"
-            show-summary -->
           <el-table
             ref="table_01"
             :height="tableHeight"
@@ -272,15 +270,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
-          <!-- :summary-method="getSummaries"
-            show-summarys -->
+        <div class="right_table">
           <el-table
             ref="table_01"
-            v-if="state == 2"
             :height="tableHeight"
             :data="tableData"
-            
+           
             border
             highlight-current-row
             style="width: 100%"
@@ -290,7 +285,7 @@
               color: '#606266',
             }"
             @selection-change="handleSelectionChange"
-            
+            v-if="state == 2"
           >
             <!-- <el-table-column type="selection" width="55"> </el-table-column>-->
             <el-table-column
@@ -502,21 +497,14 @@ export default {
   },
 
   methods: {
-    tt() {
-      console.log("this.state", this.state);
-      console.log("this.tableData", this.tableData);
-      console.log("this.deliveryway", this.deliveryway);
-    },
+    tt() {},
     async fun3() {
-      console.log("fun3");
       this.fun1().then((val) => {
         this.fun2();
       });
     },
     async fun4(tps) {
-      console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.issued_drug);
         for (let i = 0; i < this.issued_drug.length; i++) {
           if (tps == this.issued_drug[i].id) {
             this.$refs.table02.setCurrentRow(this.issued_drug[i]);
@@ -528,7 +516,6 @@ export default {
     async fun5(tps) {
       console.log("fun3", tps);
       this.fun1().then((val) => {
-        console.log("this.issued_drug", this.waiting_drug);
         for (let i = 0; i < this.waiting_drug.length; i++) {
           if (tps == this.waiting_drug[i].id) {
             this.$refs.table01.setCurrentRow(this.waiting_drug[i]);
@@ -537,8 +524,7 @@ export default {
         }
       });
     },
-    getSummaries(param) {
-      console.log(param, "pram");
+    getSummaries_t1(param) {
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
@@ -555,6 +541,22 @@ export default {
       return sums;
     },
 
+    getSummaries_t2(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+        if (index === 6) {
+          sums[index] = this.total;
+          return;
+        }
+      });
+      return sums;
+    },
+
     changeTimes() {
       // alert("aa")
       // this.getdruglist();
@@ -1031,11 +1033,15 @@ export default {
     this.getrouteofadministration();
     this.getgetpartitionlist();
   },
-  updated() {
-    this.$nextTick(() => {
-      this.$refs["table_01"].doLayout();
-    });
-  },
+  // updated() {
+  //   this.$nextTick(() => {
+  //     if (this.$refs["table_01"]) {
+  //       this.$refs["table_01"].doLayout();
+  //     } else if (this.$refs["table_02"]) {
+  //       this.$refs["table_02"].doLayout();
+  //     }
+  //   });
+  // },
 };
 </script>
 
@@ -1076,6 +1082,10 @@ export default {
     white-space: nowrap;
     color: #909399;
     font-size: 14px;
+
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-button {
     height: 34px;
@@ -1094,10 +1104,10 @@ export default {
   overflow-y: auto;
   overflow-x: hidden;
 }
-.right_table {
-  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
+/deep/ .right_table {
+  .el-table__body-wrapper {
     overflow-y: auto;
-    overflow-x: scroll;
+    overflow-x: scroll !important;
   }
   // /deep/ .el-table__footer-wrapper {
   //   margin-top: -2px !important;

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -112,7 +112,7 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- <div>
+          <div>
             班次：
             <el-select
               v-model="shift"
@@ -141,12 +141,12 @@
               >
               </el-option>
             </el-select>
-          </div> -->
+          </div>
 
           <div>
-            <!-- <el-button type="primary" @click="toExport" v-if="state == 2"
+            <el-button type="primary" @click="toExport" v-if="state == 2"
               >导出</el-button
-            > -->
+            >
 
             <el-button type="primary" @click="dispense" v-if="state == 1"
               >发药</el-button
@@ -729,6 +729,9 @@ export default {
     white-space: nowrap;
     color: #909399;
     font-size: 14px;
+    /deep/ .el-input__inner {
+      font-size: 13px !important;
+    }
   }
   .el-table {
     margin-top: -13px;

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -462,7 +462,10 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
-                        透析方式：
+                        <span v-if="org_id == 10138 || org_id == 9675"
+                          >治疗模式：</span
+                        >
+                        <span v-else>透析方式：</span>
                         <div
                           class="under_line"
                           style="
@@ -1177,7 +1180,7 @@
                         <!-- <thead> -->
                         <tr>
                           <td
-                            colspan="11"
+                            colspan="14"
                             style="
                               letter-spacing: 5px;
                               text-align: center;
@@ -1202,8 +1205,22 @@
                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
-                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id != 10121 && org_id != 9675 && org_id != 0
+                            "
+                          >
+                            电导度<br />(ms/cm)
+                          </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 10121 || org_id == 9675 || org_id == 0
+                            "
+                          >
+                            SpO₂<br />(%)
+                          </td>
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1215,6 +1232,20 @@
                           >
                             置换量<br />(ml)
                           </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          >
+                            KT/V
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675"
+                          >
+                            血容量<br />(L)
+                          </td>
                           <td width="200">病情变化及处理</td>
                         </tr>
                         <tr
@@ -1286,20 +1317,49 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id != 10121 && org_id != 9675&& org_id != 0">
+                          <td
+                            v-if="
+                              org_id != 10121 && org_id != 9675 && org_id != 0
+                            "
+                          >
                             {{
                               monitor_record.conductivity
                                 ? monitor_record.conductivity
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
-                          {{
-                            monitor_record.blood_oxygen_saturation
-                              ? monitor_record.blood_oxygen_saturation
-                              : ""
-                          }}
-                        </td>
+                          <td
+                            v-if="
+                              org_id == 10121 || org_id == 9675 || org_id == 0
+                            "
+                          >
+                            {{
+                              monitor_record.blood_oxygen_saturation
+                                ? monitor_record.blood_oxygen_saturation
+                                : ""
+                            }}
+                          </td>
+                          <td
+                            v-if="
+                              org_id != 9538 &&
+                              org_id != 10121 &&
+                              org_id != 9675 &&
+                              org_id != 0
+                            "
+                          >
+                            {{
+                              monitor_record.conductivity ? monitor_record.conductivity : ""
+                            }}
+                          </td>
+
+                          <td v-if="org_id == 9538">
+                            {{
+                              monitor_record.sodium_concentration
+                                ? monitor_record.sodium_concentration
+                                : ""
+                            }}
+                          </td>
+
                           <td>
                             <span v-if="monitor_record.operate_time">{{
                               monitor_record.ultrafiltration_volume
@@ -1311,9 +1371,7 @@
                             v-if="
                               record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              (record.prescription.mode_id == 12 &&
-                                monitor_record.operate_time >
-                                  record.dialysis_order.end_time)
+                              record.prescription.mode_id == 12
                             "
                             style="width: 50px"
                           >
@@ -1323,6 +1381,20 @@
                                 : ""
                             }}
                           </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          >
+                            {{ monitor_record.ktv }}
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675"
+                          >
+                            {{ monitor_record.accumulated_blood_volume }}
+                          </td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1382,7 +1454,12 @@
                           <td></td>
                           <td></td>
                           <td></td>
-
+                          <td
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          ></td>
+                          <td v-if="org_id == 9538 || org_id == 9675"></td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -2596,7 +2673,6 @@ export default {
     };
   },
   created() {
-    
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -2616,15 +2692,15 @@ export default {
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;
     //   this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     // for(let i = 0 ; i < this.records.length ; i++){
     //   console.log(i,'jhk')
     //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
     //   i.assessment_before_dislysis.blood_access_part_opera_id
     // );
     // }
-    console.log(this.bloodAccessParOpera,'this.bloodAccessParOpera')
-    
+    console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
+
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];
@@ -2651,7 +2727,6 @@ export default {
     //     this.$message.error("参数不齐");
     //     return false;
     //   }
-    
   },
   mounted() {
     this.loading = true;
@@ -2664,7 +2739,6 @@ export default {
       .then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
-
           this.records = this.records.concat(resp.data.schedules);
 
           for (const recordIndex in this.records) {
@@ -2786,7 +2860,7 @@ export default {
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
           //   o.assessment_before_dislysis.blood_access_part_opera_id)
           // })
-          
+
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
@@ -2885,7 +2959,7 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records,'hhh')
+      console.log(tihs.records, "hhh");
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }

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

@@ -1390,7 +1390,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && template_id!=9538)">
+          <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && org_id!=9538)">
             <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -716,6 +716,35 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 57
+        "
+      >
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      <template
+        v-if="
+          org_template_info.template_id == 58
+        "
+      >
+        <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"-->
@@ -1127,6 +1156,14 @@
             v-if="org_template_info.template_id == 56"
           >
           </DialysisPrintOrderFiftySix>
+          <DialysisPrintOrderFiftySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 57">
+          </DialysisPrintOrderFiftySeven>
+          <DialysisPrintOrderFiftyEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 58">
+          </DialysisPrintOrderFiftyEight>
           
         </div>
       </el-container>
@@ -1200,11 +1237,15 @@ import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
 import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour";
-import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive"
-import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix"
+import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive";
+import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix";
+import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeven";
+import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEight";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyEight,
+    DialysisPrintOrderFiftySeven,
     DialysisPrintOrderFiftySix,
     DialysisPrintOrderFiftyfive,
     DialysisPrintOrderFiftyFour,
@@ -1427,7 +1468,11 @@ export default {
       // const style3 =
       //   '@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: 16px;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: 5px 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: 16px;padding: 5px 5px;line-height: 18px;}.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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.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%;}.print-yema5{position: absolute;top:1370px;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;}';
       //
+      const style4 =
+        '@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:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.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 style5 =
         '@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 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  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;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  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 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.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;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
       const style6 =
@@ -1447,7 +1492,7 @@ export default {
       // 雷州惠爱样式
       const style12 ='@page {margin-top:10px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:30px;} .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:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .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;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .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;}@page {margin-left:30px;margin-right:40px;}  .dialysis-print-order tbody .print-table tr{page-break-inside:avoid;} .dialysis-print-order tbody .print-table tr td{border: 1px solid #000;} ';
       // 金乡宏大样式
-      const style13 ='@page {margin-top:5px;}@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:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .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;line-height:35px} .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;}@page {margin-left:30px;margin-right:40px;}';
+      const style13 ='@page {margin-top:5px;}@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:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr{page-break-inside:avoid} .print-table tbody tr td{border-collapse:collapse;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;} .dialysis-print-order .print-table-2{ width: 100%;text-align: left;border-collapse: collapse;line-height: 38px;font-size: 14px;} .dialysis-print-order .print-table-2 tbody tr{height:43px; padding-bottom:-12px;} .print-table-2 tbody tr td{padding-bottom:-12px;} .td_div1{display:flex;white-space: normal;} .print-table-3{text-align: center;width: 390px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-3 .tr_3{border-bottom: 1px solid;} .print-table-3 .td_3 {border-right: 1px solid;} .print-table-3 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-3 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-4{text-align: center;width: 300px;border-collapse: inherit;height: 129px !important;border: none;} .print-table-4 .tr_3{border-bottom: 1px solid;}  .print-table-4 .td_3 {border-right: 1px solid;} .print-table-4 .td_3_1 {width:66px;border-right: 1px solid;} .print-table-4 .td_3_2 {width:72px;border-right: 1px solid;} .print-table-5{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-5 tr td_5{width:75px;} .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;line-height:35px} .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;}@page {margin-left:30px;margin-right:40px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1493,7 +1538,8 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51
+        this.org_template_info.template_id == 51 ||
+        this.org_template_info.template_id == 58
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1505,7 +1551,7 @@ export default {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style,
+          style: style4,
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 8) {
@@ -1799,7 +1845,7 @@ export default {
         });
         
       }else if (
-        this.org_template_info.template_id == 54
+        this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
       ) {
         printJS({
           printable: "dialysis-print-box",

src/xt_pages/dialysis/schedualPatient.vue

@@ -609,10 +609,17 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           var resp = rs.data
           if (resp.state == 1) {
             var zones = resp.data.zones
+            var arr = []
+            for(let i=0;i<zones.length;i++){
+              if(zones[i].status == 1){
+                 arr.push(zones[i])
+              }
+            }
+            console.log("zone2w233323232wid",zones)
             var schedules = resp.data.schedules
             var zone_options = [{ id: 0, text: '全部分区' }]
-            for (let z_i = 0; z_i < zones.length; z_i++) {
-              const zone = zones[z_i]
+            for (let z_i = 0; z_i < arr.length; z_i++) {
+              const zone = arr[z_i]
               zone_options.push({ id: zone.id, text: zone.name })
             }
             this.zone_options = zone_options

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -821,7 +821,7 @@
             <td v-if="advice_index === 1">体重增加量:</td>
             <td v-if="advice_index === 1">
               {{
-                (assessmentafter.weight_after == 0
+                (assessmentafter.weight_after == 0 || predialysis.weight_before == 0
                   ? 0
                   : (
                       predialysis.weight_before - assessmentafter.weight_after
@@ -851,7 +851,7 @@
             <td v-if="advice_index === 6">本次透析体重下降量:</td>
             <td v-if="advice_index === 6">
               {{
-                afterdialysis.weight_after == 0
+                afterdialysis.weight_after == 0 || predialysis.weight_before == 0
                   ? 0
                   : (
                       predialysis.weight_before - afterdialysis.weight_after

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -386,15 +386,16 @@
                           "
                         >
                           透析机：
-                         <span v-if="dialysisOrder!=null">{{
-                            dialysisOrder &&
-                            dialysisOrder.DeviceNumber &&
-                            dialysisOrder.DeviceNumber.number.length > 0
-                              ? dialysisOrder.DeviceNumber.number
-                              : patientInfo.DialysisSchedule.device_number
-                                  .number
-                          }}
-                          </span> 
+                          <span v-if="dialysisOrder != null"
+                            >{{
+                              dialysisOrder &&
+                              dialysisOrder.DeviceNumber &&
+                              dialysisOrder.DeviceNumber.number.length > 0
+                                ? dialysisOrder.DeviceNumber.number
+                                : patientInfo.DialysisSchedule.device_number
+                                    .number
+                            }}
+                          </span>
                         </div>
                         <div
                           style="
@@ -907,14 +908,13 @@
                   <td v-if="advice_index === 1" width="145">体重增加量:</td>
                   <td v-if="advice_index === 1" width="60">
                     {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                        0 && assessmentafter.weight_after != 0
-                        ? (
+                      assessmentafter.weight_after == 0 ||
+                      predialysis.weight_before == 0
+                        ? 0
+                        : (
                             predialysis.weight_before -
                             assessmentafter.weight_after
                           ).toFixed(2)
-                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index === 2" width="145">干体重(DW):</td>
@@ -964,14 +964,13 @@
                   </td>
                   <td v-if="advice_index === 6" width="60">
                     {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                        0 && afterdialysis.weight_after != 0
-                        ? (
+                      afterdialysis.weight_after == 0 ||
+                      predialysis.weight_before == 0
+                        ? 0
+                        : (
                             predialysis.weight_before -
                             afterdialysis.weight_after
                           ).toFixed(2)
-                        : 0
                     }}kg
                   </td>
                   <td v-if="advice_index > 6" width="145"></td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -425,13 +425,13 @@
                     <div class="inline_block" style="flex:1;">
                       置换方式：
                       <div class="under_line" style="width: 60px;text-align: center">
-                        <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id==12"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
+                        <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id==12 || prescription.mode_id == 28"> {{ getDisplaceLiquiPart(prescription.displace_liqui_part) }} </span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       置换总量：
                       <div class="under_line" style="width: 50px;text-align: center">
-                         <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id ==12"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
+                         <span v-if="prescription.mode_id == 2 || prescription.mode_id ==5 || prescription.mode_id ==12 || prescription.mode_id == 28"> {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}</span>
                       </div>
                       L
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -160,7 +160,7 @@
 
         <div
           class="row"
-          :style="this.totollength > 13 ? 'margin-bottom:400px;' : ''"
+          :style="this.totollength > 13 ? 'margin-bottom:250px;' : ''"
         >
           <table class="proj_table">
             <tbody>
@@ -1407,6 +1407,7 @@
                             font-size: 16px;
                             padding: 6px 8px;
                             line-height: 30px;
+                            
                           "
                         >
                           医嘱内容
@@ -1680,7 +1681,6 @@
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
-            <tbody>
               <template v-if="doctor_advices_2.length > 0">
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td
@@ -1692,6 +1692,7 @@
                       font-size: 16px;
                       padding: 6px 8px;
                       line-height: 30px;
+                      border: 1px solid;
                     "
                   >
                     医嘱内容
@@ -1701,7 +1702,7 @@
                 <td colspan="4" style="font-size: 16px">开医嘱</td>
                 <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
               </tr> -->
-                <tr style="line-height: 35px; padding: 8px 5px">
+                <tr style="line-height: 35px; padding: 8px 5px"  class="split_table_tr" >
                   <td style="font-size: 16px" width="10%">时间</td>
                   <td style="font-size: 16px" colspan="2" width="45%">
                     医嘱内容
@@ -1712,7 +1713,7 @@
                   <td style="font-size: 16px" width="10%">时间</td>
                 </tr>
                 <!-- <template v-for="group in doctor_advices" > -->
-                <tr
+                <tr class="split_table_tr" 
                   v-for="(advice, advice_index) in doctor_advices_2"
                   :key="advice_index"
                 >
@@ -2498,7 +2499,7 @@
                   </div>
                 </td>
               </tr>
-            </tbody>
+            
           </table>
           <!-- <div  class="print-yema">1</div> -->
         </div>
@@ -3352,23 +3353,23 @@ export default {
           }
         }
 
-        // this.totollength = this.doctor_advices.length + this.monitors.length;
-        // if (this.totollength > 18) {
-        //   var temp_advice_length = 17 - this.monitors.length;
-        //   var doctor_advices_1 = [];
-        //   var doctor_advices_2 = [];
-        //   for (let index = 0; index < this.doctor_advices.length; index++) {
-        //     const element = this.doctor_advices[index];
-        //     if (temp_advice_length > index) {
-        //       doctor_advices_1.push(element);
-        //     } else {
-        //       doctor_advices_2.push(element);
-        //     }
-        //   }
-        //   this.doctor_advices = doctor_advices_1;
-        //   this.doctor_advices_2 = doctor_advices_2;
-        // }
-        // console.log(this.doctor_advices,'doctor_advices');
+        this.totollength = this.doctor_advices.length + this.monitors.length;
+        if (this.totollength > 18) {
+          var temp_advice_length = 17 - this.monitors.length;
+          var doctor_advices_1 = [];
+          var doctor_advices_2 = [];
+          for (let index = 0; index < this.doctor_advices.length; index++) {
+            const element = this.doctor_advices[index];
+            if (temp_advice_length > index) {
+              doctor_advices_1.push(element);
+            } else {
+              doctor_advices_2.push(element);
+            }
+          }
+          this.doctor_advices = doctor_advices_1;
+          this.doctor_advices_2 = doctor_advices_2;
+        }
+        console.log(this.doctor_advices,'doctor_advices');
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3545,6 +3546,7 @@ export default {
   text-align: center;
   font-size: 20px;
   letter-spacing: 5px;
+
 }
 
 .dialysis-print-order .order-title {
@@ -3651,6 +3653,12 @@ export default {
   line-height: 16px;
 }
 
+.print_page_main_content .row .proj_table .split_table_tr td{
+    border: 1px solid;
+}
+
+
+
 .print-table-no {
   width: 100%;
   text-align: center;

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -9,27 +9,27 @@
           <tbody>
             <tr>
               <td width="50">姓 名:</td>
-              <td width="120">
+              <td width="150">
                 <div class="under-line">
                   &nbsp;{{ patientInfo.name ? patientInfo.name : "/" }}
                 </div>
               </td>
-              <td width="100"></td>
+              <td width="30"></td>
 
               <td width="50">性 别:</td>
-              <td width="180">
+              <td width="150">
                 <div class="under-line">
                   {{ patientInfo.gender ? patientInfo.gender : "/" }}
                 </div>
               </td>
-              <td width="10"></td>
+              <td width="30"></td>
               <td width="50">年 龄:</td>
-              <td width="180">
+              <td width="150">
                 <div class="under-line">
                   &nbsp;{{ checkIdCardNo(patientInfo.id_card_no) }}
                 </div>
               </td>
-              <td width="80">岁</td>
+              <td width="60">岁</td>
 
               <td width="80">透析机号:</td>
               <td width="130">
@@ -44,14 +44,14 @@
         <table class="table-box" style="margin-top:10px">
           <tbody>
             <tr>
-              <td width="50">治疗日期:</td>
-              <td width="130">
+              <td width="80">治疗日期:</td>
+              <td width="150">
                 <div class="under-line">
                   {{ queryParams.xtdate ? queryParams.xtdate : "/" }}
                 </div>
               </td>
               <td width="10"></td>
-              <td width="50">
+              <td width="60">
                 住院号:
               </td>
               <td width="150">
@@ -60,7 +60,7 @@
                 </div>
               </td>
               <td width="10"></td>
-              <td width="50">
+              <td width="80">
                 身份证号:
               </td>
               <td width="150">
@@ -76,7 +76,7 @@
         <table class="table-box" style="margin-top: 10px;">
           <tbody>
             <tr>
-              <td width="40">诊 断:</td>
+              <td width="60">诊 断:</td>
               <td style="text-align:left">
                 <div class="under-line">
                   &nbsp;{{ patientInfo.diagnose ? patientInfo.diagnose : "/" }}
@@ -91,7 +91,7 @@
               <td>
                 <table class="table-box">
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       病情评估:
                       <span class="under-line">&nbsp;{{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}</span>
                     </td>
@@ -110,7 +110,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       净化治疗方式:
                       <span class="under-line">&nbsp;{{ prescription.mode ? prescription.mode : "/" }}</span>
                     </td>
@@ -138,7 +138,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       干体重:
                       <span class="under-line">
                         &nbsp;{{ predialysis.dry_weight ? predialysis.dry_weight : "0" }}</span>kg
@@ -161,7 +161,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       血流量:
                       <span class="under-line">
                         &nbsp;{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "0" }}</span>ml/min
@@ -178,11 +178,11 @@
                       置换液总量:
                       <span class="under-line">
                         &nbsp;{{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "0" }}
-                      </span>
+                      </span>L
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       抗凝剂:
                       <span class="under-line">
                         &nbsp;{{ prescription.anticoagulant ? prescription.anticoagulant : "/" }}
@@ -195,7 +195,7 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
@@ -208,7 +208,7 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu/h</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
@@ -220,14 +220,14 @@
                       <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
                       <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-                      <span v-if="prescription.anticoagulant == '普通肝素'">iu</span>
+                      <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
                       <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
                     </td>
                   </tr>
                   <tr>
-                    <td style="text-align:left;margin-left:15px">
+                    <td style="text-align:left;margin-left:15px;padding-top:10px;">
                       透析液(mmol/L):
                       <span class="under-line" v-if="prescription.dialysate_formulation == 0">
                         &nbsp; 常规(钾：0&nbsp;,钙：0 &nbsp;,钠：0)
@@ -284,15 +284,19 @@
               <p style="height:20px;line-height:20px">呼吸</p>
               <p style="height:20px;line-height:20px">次/分</p>
             </th>
+            <th style="min-width:60px">
+              <p style="height:20px;line-height:20px">体温</p>
+              <p style="height:20px;line-height:20px">℃</p>
+            </th>
             <th style="min-width:60px">
               <p style="height:20px;line-height:20px">血流量</p>
               <p style="height:20px;line-height:20px">ml/min</p>
             </th>
-            <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">超滤量</p>
               <p style="height:20px;line-height:20px">L</p>
             </th>
-            <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">置换量</p>
               <p style="height:20px;line-height:20px">L</p>
             </th>
@@ -310,7 +314,7 @@
           </tr>
 
           <tr v-for="(monitor, monindex) in monitors" :key="monindex">
-            <td style="min-width:60px;height:30px">
+            <td style="min-width:60px;height:40px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
             </td>
             <td>
@@ -331,15 +335,20 @@
             </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}
+                {{ monitor.temperature ? monitor.temperature : "0" }}
               </span>
             </td>
             <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}
+              </span>
+            </td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
               </span>
             </td>
-            <td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}
               </span>
@@ -372,7 +381,7 @@
               <td style="width:60px;height:40px">
                 <p style="height:20px;line-height:20px">医生签名</p>
               </td>
-              <td style="width:60px;height:40px">
+              <td style="width:70px;height:40px">
                 <p style="height:20px;line-height:20px">医嘱执行时间</p>
               </td>
               <td style="width:60px;height:40px">
@@ -381,7 +390,7 @@
               <td style="width:60px;height:60px">
                 <p style="height:20px;line-height:20px">核对</p>
               </td>
-              <td style="width:60px;height:40px">
+              <td style="width:70px;height:40px">
                 <p style="height:20px;line-height:20px">上次透后体重</p>
               </td>
               <td style="width:60px;height:40px">
@@ -389,8 +398,8 @@
               </td>
             </tr>
 
-            <tr v-for="(advice, advice_index) in tableAdvice">
-              <td>{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
+              <td style="min-width:60px;height:40px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
               <td>
                 <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
@@ -431,8 +440,8 @@
         <table class="print-table" border="1">
           <td>
             <table class="table-box" style="table-layout:fixed">
-              <tr>
-                <td style="text-align:left;margin-left:15px;width:25%">
+              <tr class="ta_top">
+                <td style="text-align:left;margin-left:15px;width:25%;padding-top:10px;">
                   上机时间:
                   <span class="under-line">{{ getTime(Order.start_time, "{y}-{m}-{d} {h}:{i}") ? getTime(Order.start_time, "{y}-{m}-{d} {h}:{i}") : "0" }}</span>
                 </td>
@@ -456,7 +465,7 @@
                 </td>
               </tr>
 
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px;width:25%">
                   下机护士:
                   <span class="under-line" v-if="finshForm.url === ''">&nbsp;{{ finshForm.finish_nurse ? finshForm.finish_nurse : "/" }}</span>
@@ -481,7 +490,7 @@
                     {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "0" }}&nbsp;L</span>
                 </td>
               </tr>
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px">
                   拔针后穿刺点渗血:
                   <span class="under-line" v-if="afterdialysis.puncture_point_oozing_blood === 0">&nbsp;/</span>
@@ -504,7 +513,7 @@
                 </td>
                 <td width="10"></td>
               </tr>
-              <tr>
+              <tr class="ta_top">
                 <td style="text-align:left;margin-left:15px;" colspan="2">
                   并发症:
                   <span class="under-line">&nbsp;{{ afterdialysis.complication }}</span>
@@ -675,7 +684,8 @@ export default {
         finish_nurse: "",
         url: ""
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      org_id: 0,
     };
   },
   methods: {
@@ -1492,7 +1502,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
-
+    this.org_id = this.$store.getters.xt_user.org.id;
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -1555,8 +1565,10 @@ export default {
   width: 100%;
   line-height: 23px;
   font-size: 14px;
+
 }
 
+
 .dialysis-print-order .print-table {
   width: 100%;
   text-align: center;
@@ -1636,6 +1648,9 @@ export default {
   padding: 1px 1px;
   /*line-height: 25px;*/
 }
+.table-box .ta_top td{
+  padding-top: 10px !important;
+}
 
 .es-img {
   height: 25px;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -59,7 +59,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span v-if="org_id == 10121||org_id == 10138">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -429,7 +429,8 @@
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div class="inline_block" style="flex: 1">
-                      透析方式：
+                      <span v-if="org_id==10138||org_id==9675">治疗模式：</span>
+                      <span v-else>透析方式：</span>
                       <div
                         class="under_line"
                         style="
@@ -1171,8 +1172,8 @@
                           :colspan="
                             prescription.mode_id == 2 ||
                             prescription.mode_id == 5
-                              ? 12
-                              : 11
+                              ? 14
+                              : 13
                           "
                           style="
                             letter-spacing: 5px;
@@ -1238,7 +1239,8 @@
                         >
                           置换量<br />(ml)
                         </td>
-                        <td width="200" v-if="org_id == 9919">ktv</td>
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">KT/V</td>
+                        <td width="50" v-if="org_id == 9538|| org_id == 9675">血容量<br />(L)</td>
                         <td width="200">病情变化及处理</td>
 
                         <!-- <td width="100">时间</td>
@@ -1254,42 +1256,13 @@
                     <td  width="100">护士签名</td> -->
                       </tr>
 
-                      <tr
-                        v-for="(monitor, monindex) in monitors"
-                        :key="monindex"
-                      >
+                      <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-                        <td>
-                          {{
-                            monitor.systolic_blood_pressure
-                              ? monitor.systolic_blood_pressure + "/"
-                              : ""
-                          }}
-                          {{
-                            monitor.diastolic_blood_pressure
-                              ? monitor.diastolic_blood_pressure
-                              : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.pulse_frequency
-                              ? monitor.pulse_frequency
-                              : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.breathing_rate ? monitor.breathing_rate : ""
-                          }}
-                        </td>
-                        <td>
-                          {{
-                            monitor.blood_flow_volume
-                              ? monitor.blood_flow_volume
-                              : ""
-                          }}
-                        </td>
+                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
+                          {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
+                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                        <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                        <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td>
                           {{
                             monitor.venous_pressure
@@ -1370,7 +1343,7 @@
                               : ""
                           }}
                         </td>
-                        
+
                         <td
                         >
                           {{
@@ -1403,9 +1376,12 @@
                             }}
                           </span>
                         </td>
-                        <td width="200" v-if="org_id == 9919">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">
                           {{ monitor.ktv }}
                         </td>
+                        <td width="50" v-if="org_id == 9538|| org_id == 9675">
+                          {{ monitor.accumulated_blood_volume }}
+                        </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1464,7 +1440,8 @@
                           "
                           width="50"
                         ></td>
-                        <td v-if="org_id == 9919"></td>
+                        <td v-if="org_id == 9919||org_id == 9538|| org_id == 9675"></td>
+                        <td v-if="org_id == 9538|| org_id == 9675"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1695,14 +1672,26 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121||org_id == 10138">{{
+                patientInfo.DialysisSchedule.device_zone.name
+                  ? patientInfo.DialysisSchedule.device_zone.name
+                  : ""
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121">{{
+                dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               透析号：
@@ -1711,22 +1700,22 @@
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px">
-              住院号/门诊号：
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-if="receiverTreatmentAccess.admission_number"
-              >
-                {{ receiverTreatmentAccess.admission_number }}
-              </div>
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-else
-              >
-                {{ "/" }}
-              </div>
+            住院号/门诊号：
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-if="receiverTreatmentAccess.admission_number"
+            >
+              {{ receiverTreatmentAccess.admission_number }}
             </div>
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-else
+            >
+              {{ "/" }}
+            </div>
+          </div>
           </div>
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
@@ -2055,7 +2044,7 @@
                       min
                     </div>
                   </div>
-                  <div
+                  <!-- <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                     v-if="org_id==9538 || org_id==9675"
@@ -2086,7 +2075,7 @@
                         {{ afterdialysis.accumulated_blood_volume ? afterdialysis.accumulated_blood_volume : "/" }}
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2450,7 +2439,8 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      核对人员：
+                      <span v-if="org_id==10387||org_id==9675" >核对护士：</span> 
+                      <span v-else >核对人员：</span> 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"

src/xt_pages/outpatientCharges/listPrint.vue

@@ -570,7 +570,7 @@
         if(this.org_id != 10106){
           if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
             const style =
-                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'allList-print',
               type: 'html',
@@ -581,7 +581,7 @@
 
           }else {
             const style =
-                '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'list-print',
               type: 'html',
@@ -591,7 +591,7 @@
           }
         }else{
           const style =
-          '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+            '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
           printJS({
             printable: "statement-print",
             type: "html",

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -2,25 +2,25 @@
   <div id="statement-print" class="statement-print">
     <table class="statementTable" border="0">
       <thead>
-        <tr>
-          <td colspan="10">石狮圣誉血液透析中心结算单</td>
-        </tr>
+      <tr>
+        <td colspan="10">石狮圣誉血液透析中心结算单</td>
+      </tr>
       </thead>
 
       <tbody>
-        <tr>
-          <td colspan="10">日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
-        </tr>
-        <tr class="view_tr">
-          <td colspan="2">姓名：{{info.patient.name}}</td>
-          <td colspan="2">性别：{{info.patient.gender == 1 ? '男': '女'}}</td>
-          <td colspan="2">医保类型：{{info.insutype == '390'?'城乡居民基本医疗保险':'职工基本医疗保险'}}</td>
-          <td colspan="2">社会保障号码：{{info.certno}}</td>
-          <td colspan="2">账号余额：{{info.blac}}</td>
-        </tr>
-        <tr class="view_tr">
-          <td colspan="10">明细信息</td>
-        </tr>
+      <tr>
+        <td colspan="10">日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+      </tr>
+      <tr class="view_tr">
+        <td colspan="2">姓名：{{info.patient.name}}</td>
+        <td colspan="2">性别：{{info.patient.gender == 1 ? '男': '女'}}</td>
+        <td colspan="2">医保类型：{{info.insutype == '390'?'城乡居民基本医疗保险':'职工基本医疗保险'}}</td>
+        <td colspan="2">社会保障号码：{{info.certno}}</td>
+        <td colspan="2">账号余额：{{info.blac}}</td>
+      </tr>
+      <tr class="view_tr">
+        <td colspan="10">明细信息</td>
+      </tr>
 
         <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
         <tr>
@@ -162,53 +162,53 @@ export default {
 
 
 <style lang="scss" scoped>
-.statement-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  .statement-print {
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
     0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
     0 0 40px rgba(0, 0, 0, 0.06) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  margin-bottom: 20px;
-  padding: 20px 10px;
-}
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding: 20px 10px;
+  }
 
-.statementTitle {
-  font-size: 28px;
-  text-align: center;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .statementTitle {
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 
-.statementTable {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  line-height: 40px;
-  font-size: 14px;
-}
-.statementTable thead{
-  font-size: 28px;
-  text-align: center;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+  .statementTable {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+  .statementTable thead{
+    font-size: 28px;
+    text-align: center;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
 
-.statementTable tbody{
+  .statementTable tbody{
     text-align: left;
-}
-tbody .view_tr{
+  }
+  tbody .view_tr{
     border: 1px solid;
     text-align: center;
-}
-.list_table{
+  }
+  .list_table{
     width: 100%;
     margin-bottom: 100px;
-}
-tbody .dashed_tr{
+  }
+  tbody .dashed_tr{
     border: 1px dashed;
     text-align: center;
-}
-tbody tr td div{
+  }
+  tbody tr td div{
     height: 25px;
-}
+  }
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -13,16 +13,16 @@
         <td colspan="4">{{info.fixmedins_code}}</td>
         <td width="100">医保结算级别</td>
         <td width="100" v-if="info.hosp_lv == '1'">三级特等</td>
-        <td width="100" v-if="info.hosp_lv == '2'">三级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '3'">三级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '4'">三级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '5'">二级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '6'">二级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '7'">二级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '8'">一级甲等</td>
-        <td width="100" v-if="info.hosp_lv == '9'">一级乙等</td>
-        <td width="100" v-if="info.hosp_lv == '10'">一级丙等</td>
-        <td width="100" v-if="info.hosp_lv == '11'">无等级</td>
+        <td width="100" v-else-if="info.hosp_lv == '2'">三级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '3'">三级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '4'">三级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '5'">二级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '6'">二级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '7'">二级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '8'">一级甲等</td>
+        <td width="100" v-else-if="info.hosp_lv == '9'">一级乙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '10'">一级丙等</td>
+        <td width="100" v-else-if="info.hosp_lv == '11'">无等级</td>
         <td width="100" v-else></td>
 
       </tr>
@@ -43,30 +43,38 @@
         <td width="110"></td>
         <td width="80">人员类别</td>
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
-        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
-        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
-        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
-        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
-        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
-        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
-        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
-        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
-        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
-        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
-        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
-        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
-        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
-        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
-        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
-        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
-        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
 
 
+        <td colspan="3" v-else-if="info.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-else-if="info.psn_type == '13'">离休</td>
+        <td colspan="3" v-else-if="info.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
+
+        <td colspan="3" v-else-if="info.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-else-if="info.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-else-if="info.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
+
+
+        <td colspan="3" v-else-if="info.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
+
+        <td colspan="3" v-else-if="info.psn_type == '16'">居民(老年)</td>
+        <td colspan="4" v-else></td>
+
 
       </tr>
       <tr>
@@ -106,7 +114,7 @@
         <td>入院第一诊断</td>
         <td colspan="3">{{info.dise_name}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4">{{info.dise_name}}</td>
+        <td colspan="6">{{info.dise_name}}</td>
       </tr>
       <tr>
         <td>业务类别</td>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -162,8 +162,7 @@
             <span v-if="scope.row.is_total !=1">
               <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
               <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
-              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
+              <span v-if ="org_id!=9919 && org_id!=10210">
                  {{scope.row.total_price}}
                </span>
             </span>
@@ -431,6 +430,7 @@ export default {
                console.log("555555555555",order[i])
                if(order[i].price > 0){
                 console.log("近来33232323322323")
+                  order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
                  }
@@ -438,6 +438,7 @@ export default {
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
+                    
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -18,6 +18,7 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-loading="loading"
           v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button

src/xt_pages/stock/stockInOrderAdd.vue

@@ -7,7 +7,7 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-loading="loading">保 存</el-button>
         <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
         <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>
@@ -765,8 +765,8 @@
                 this.warehousing_info_id  = info.id
                 for(let i=0;i<list.length;i++){
                   for(let j=0;j<dealerList.length;j++){
-                     if(list[i].dealer == dealerList[i].id){
-                        list[i].dealer = dealerList[i].dealer_name
+                     if(list[i].dealer == dealerList[j].id){
+                        list[i].dealer = dealerList[j].dealer_name
                      }
                   }
                   for(let s=0;s<manufacturerList.length;s++){

src/xt_pages/stock/stockInOrderEdit.vue

@@ -19,6 +19,7 @@
           type="primary"
           @click="submit()"
           v-if="is_check == 2"
+          v-loading="loading"
           class="filter-item"
           >保 存</el-button
         >
@@ -759,8 +760,8 @@ export default {
               var dealerList = response.data.data.dealerList
               for(let i=0;i<list.length;i++){
                 for(let j=0;j<dealerList.length;j++){
-                 if(list[i].dealer == dealerList[i].id){
-                    list[i].dealer = dealerList[i].dealer_name
+                 if(list[i].dealer == dealerList[j].id){
+                    list[i].dealer = dealerList[j].dealer_name
                   }
                 }
                 for(let s=0;s<manufacturerList.length;s++){

src/xt_pages/user/components/PatientDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container ">
+  <div class="app-container">
     <el-dialog
       title="查看传染病检查结果"
       :visible.sync="dialogFormVisible"
@@ -21,7 +21,7 @@
                 <el-input
                   placeholder="请填入"
                   v-model="item.value"
-                  style="width:95%"
+                  style="width: 95%"
                   type="number"
                   disabled
                 >
@@ -37,7 +37,7 @@
                 <el-select
                   v-model="item.value"
                   placeholder="请选择"
-                  style="width:95%"
+                  style="width: 95%"
                   disabled
                 >
                   <el-option
@@ -67,12 +67,12 @@
       class="clearfix"
       id="patient-info"
     >
-      <div style="float:right;z-index:8;position: absolute;right: 16px;">
+      <div style="float: right; z-index: 8; position: absolute; right: 16px">
         <el-button
           size="small"
           type="primary"
           @click="printCard()"
-          style="margin:0 6px 6px 0;z-index:1;"
+          style="margin: 0 6px 6px 0; z-index: 1"
           >打印签到卡</el-button
         >
         <el-button
@@ -80,14 +80,14 @@
           :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false"
           type="primary"
           @click="$router.push('/patients/patient/' + patientID + '/edit')"
-          style="margin:0 0 6px 0;z-index:1;"
+          style="margin: 0 0 6px 0; z-index: 1"
           >修改</el-button
         >
         <el-button
           size="small"
           type="primary"
           @click="printThisInfo()"
-          style="margin:0 6px 6px 0;z-index:1;"
+          style="margin: 0 6px 6px 0; z-index: 1"
           >打印</el-button
         >
       </div>
@@ -100,7 +100,7 @@
                 <el-input v-model="form.name" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item label="性别 : " class="is-required" prop="gender">
                 <el-radio-group v-model="form.gender">
                   <el-radio
@@ -124,7 +124,7 @@
                 <el-input v-model="form.idCardNo" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item label="年龄 : " class="is-required" prop="age">
                 <el-input v-model="form.age" disabled></el-input>
               </el-form-item>
@@ -136,7 +136,7 @@
                   disabled
                   v-model="form.dialysisNo"
                   placeholder="填写或自动生成"
-                  style="width:110px;float:left;margin-right: 1%;"
+                  style="width: 110px; float: left; margin-right: 1%"
                 ></el-input>
                 <el-button disabled type="primary">自动生成</el-button>
               </el-form-item>
@@ -205,7 +205,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="患者来源 : "
                 class="is-required"
@@ -223,7 +223,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="治疗状态(转归) : "
                 class="is-required"
@@ -244,7 +244,7 @@
 
             <el-col :span="24">
               <el-form-item label="传染病 : " required prop="is_infectious">
-                <el-radio-group v-model="form.is_infectious" disabled >
+                <el-radio-group v-model="form.is_infectious" disabled>
                   <el-radio :label="1">阴性</el-radio>
                   <el-radio :label="2">阳性</el-radio>
                 </el-radio-group>
@@ -266,7 +266,6 @@
               </el-form-item>
 
               <el-form-item label="疑难内瘘:">
-
                 <el-radio-group v-model="form.troble_shoot" disabled>
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="2">否</el-radio>m
@@ -274,9 +273,7 @@
               </el-form-item>
 
               <el-form-item label="人员编码: ">
-                <el-input
-                    v-model="form.zb_patient_id"
-                ></el-input>
+                <el-input v-model="form.zb_patient_id"></el-input>
               </el-form-item>
             </el-col>
 
@@ -307,7 +304,7 @@
                   :suffix-icon="'el-icon-menu'"
                   format="yyyy-MM-dd"
                   disabled
-                  style="width: 200px;"
+                  style="width: 200px"
                   value-format="yyyy-MM-dd"
                 ></el-date-picker>
                 <el-button type="primary" @click="showInspectDialog()"
@@ -347,17 +344,17 @@
             </el-col>
 
             <el-col :span="24">
-                <el-form-item label="诊疗计划 : " prop="diagnose">
-                  <el-input
-                    type="textarea"
-                    :rows="3"
-                    v-model="form.treatment_plan"
-                    resize="none"
-                    placeholder
-                    readonly
-                  ></el-input>
-                </el-form-item>
-             </el-col>
+              <el-form-item label="诊疗计划 : " prop="diagnose">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.treatment_plan"
+                  resize="none"
+                  placeholder
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="8">
               <el-form-item label="民族 : " prop="nation">
@@ -561,91 +558,97 @@
       </el-row>
 
       <div class="dataTitle">治疗信息</div>
+      <div style="display: flex">
+        <div style="flex: 1 1 9%;">
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="主诉 : " prop="patient_complains">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.patient_complains"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="既往史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.past_history"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="体格检查">
+                <el-input
+                  v-model="form.temperature"
+                  style="width: 200px"
+                  disabled
+                >
+                  <template slot="prepend">体温:</template>
+                  <template slot="append">℃</template>
+                </el-input>
+                <el-input v-model="form.pulse" style="width: 220px" disabled>
+                  <template slot="prepend">脉搏: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+                <el-input
+                  v-model="form.respiratory"
+                  style="width: 220px"
+                  disabled
+                >
+                  <template slot="prepend">呼吸: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col>
+              <el-form-item>
+                <el-input v-model="form.sbp" style="width: 240px" disabled>
+                  <template slot="prepend">收缩压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+                <el-input v-model="form.dbp" style="width: 240px" disabled>
+                  <template slot="prepend">舒张压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div style="flex: 1;" class="now_his">
+          <el-row :gutter="24" style="height:100%;">
+            <el-col :span="24" style="height:100%;">
+              <el-form-item label="现病史 : " prop="present_history" style="height:100%;">
+                <el-input
+                  style="height:100%;"
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.present_history"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
       <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="主诉 : " prop="patient_complains">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.patient_complains"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="现病史 : " prop="present_history">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.present_history"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="既往史 : " prop="past_history">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.past_history"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item label="体格检查">
-            <el-input v-model="form.temperature" style="width: 200px;" disabled>
-              <template slot="prepend"
-                >体温:</template
-              >
-              <template slot="append"
-                >℃</template
-              >
-            </el-input>
-            <el-input v-model="form.pulse" style="width: 220px;" disabled>
-              <template slot="prepend"
-                >脉搏:
-              </template>
-              <template slot="append"
-                >次/分</template
-              >
-            </el-input>
-            <el-input v-model="form.respiratory" style="width: 220px;" disabled>
-              <template slot="prepend"
-                >呼吸:
-              </template>
-              <template slot="append"
-                >次/分</template
-              >
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item>
-            <el-input v-model="form.sbp" style="width: 240px;" disabled>
-              <template slot="prepend"
-                >收缩压:</template
-              >
-              <template slot="append"
-                >mmHg</template
-              >
-            </el-input>
-            <el-input v-model="form.dbp" style="width: 240px;" disabled>
-              <template slot="prepend"
-                >舒张压:</template
-              >
-              <template slot="append"
-                >mmHg</template
-              >
-            </el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="" prop="remark">
             <!-- <textarea v-model="form.remark" class="textarea" disabled></textarea> -->
@@ -800,7 +803,8 @@
         </el-form-item>
       </el-col>
     </el-form>
-    <div style="display:none;">
+
+    <div style="display: none">
       <div id="print-info-box">
         <div class="print_main_content">
           <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
@@ -916,7 +920,7 @@
                     ></div>
                   </td>
                 </tr>
-                
+
                 <tr>
                   <td>
                     <div class="td_proj_title">既<br />往<br />史</div>
@@ -938,7 +942,7 @@
                     </div>
                   </td>
                 </tr>
-              
+
                 <tr>
                   <td colspan="8"><div class="td_proj_title">体格检查</div></td>
                 </tr>
@@ -967,7 +971,7 @@
                     ></div>
                   </td>
                 </tr>
-             
+
                 <tr>
                   <td>
                     <div class="td_proj_title">诊<br />断</div>
@@ -996,8 +1000,10 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id ==3907 || org_id == 9671">{{ getTime(patientPrint.created_time) }}</span>
-                <span v-else>{{printDate}}</span>
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675">{{
+                  getTime(patientPrint.created_time)
+                }}</span>
+                <span v-else>{{ printDate }}</span>
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>
@@ -1010,7 +1016,7 @@
         <div
           class="order_title"
           align="center"
-          style="margin-bottom:20px;font-size:35px"
+          style="margin-bottom: 20px; font-size: 35px"
           v-if="org_id != 10223"
         >
           签到卡
@@ -1018,14 +1024,16 @@
         <div
           class="order_title"
           align="center"
-          style="margin-bottom:20px;font-size:25px"
+          style="margin-bottom: 20px; font-size: 25px"
           v-if="org_id == 10223"
-        >三优血液透析中心</div>
-        <div align="center" style="margin-bottom:4px;font-size:25px">
+        >
+          三优血液透析中心
+        </div>
+        <div align="center" style="margin-bottom: 4px; font-size: 25px">
           姓名:<span>&nbsp;&nbsp;{{ patientPrint.name }}</span
           ><br />
         </div>
-        <div align="center" style="margin-bottom:20px;font-size:25px">
+        <div align="center" style="margin-bottom: 20px; font-size: 25px">
           透析号:<span>&nbsp;&nbsp;{{ patientPrint.dialysis_no }}</span>
         </div>
         <div>
@@ -1045,13 +1053,13 @@ import {
   jsGetAge,
   isPositiveInteger,
   dialysisAge,
-  uParseTime
+  uParseTime,
 } from "@/utils/tools";
 import {
   generateDialysisNo,
   createPatient,
   editPatient,
-  fetchPatient
+  fetchPatient,
 } from "@/api/patient";
 import { fetchAllDoctorAndNurse, fetchAllAdminUsers } from "@/api/doctor";
 import { getZones } from "@/api/device/device";
@@ -1120,11 +1128,11 @@ const defaultForm = {
   dialysis_age: "",
   expense_kind: "",
   contact_name: "",
-  sch_remark:"",
-  org_id:0,
-  troble_shoot:"",
-  zb_patient_id:"",
-  treatment_plan:"",
+  sch_remark: "",
+  org_id: 0,
+  troble_shoot: "",
+  zb_patient_id: "",
+  treatment_plan: "",
 };
 
 export default {
@@ -1140,7 +1148,7 @@ export default {
         { id: 4, name: "公费医疗" },
         { id: 5, name: "商业保险" },
         { id: 6, name: "军队医疗" },
-        { id: 7, name: "其他" }
+        { id: 7, name: "其他" },
       ],
 
       generic_info_fold: true,
@@ -1157,20 +1165,26 @@ export default {
       dialogVisible: false,
       typeOptions: null,
       styleOptions: null,
-      sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }],
+      sourceOptions: [
+        { value: 1, label: "门诊" },
+        { value: 2, label: "住院" },
+      ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
-        { value: 2, label: "转出" }
+        { value: 2, label: "转出" },
       ],
       partitionOptions: [],
-      sexOptions: [{ value: 1, label: "男" }, { value: 2, label: "女" }],
+      sexOptions: [
+        { value: 1, label: "男" },
+        { value: 2, label: "女" },
+      ],
       isHospitalFirstDialysisOptions: [
         { value: 1, label: "是" },
-        { value: 2, label: "否" }
+        { value: 2, label: "否" },
       ],
       predialysisConditionOptions: [
         { value: 1, label: "腹膜透析" },
-        { value: 2, label: "肾移植" }
+        { value: 2, label: "肾移植" },
       ],
       maritalOptions: null,
       wayOptions: null,
@@ -1188,48 +1202,48 @@ export default {
       patientID: 0,
       patientPrint: {},
       print_time: "",
-      printDate:"",
+      printDate: "",
       rules: {
         contagions: [{ type: "array", required: false, trigger: "change" }],
         avatar: [{ required: true, message: "请上传头像", trigger: "blur" }],
         patientType: [
-          { required: true, message: "请选择患者类型", trigger: "blur" }
+          { required: true, message: "请选择患者类型", trigger: "blur" },
         ],
         dialysisNo: [
-          { required: true, message: "请填写透析号", trigger: "blur" }
+          { required: true, message: "请填写透析号", trigger: "blur" },
         ],
         admissionNumber: [
-          { required: true, message: "请填写住院(门诊)号", trigger: "blur" }
+          { required: true, message: "请填写住院(门诊)号", trigger: "blur" },
         ],
         source: [
-          { required: true, message: "请选择患者来源", trigger: "blur" }
+          { required: true, message: "请选择患者来源", trigger: "blur" },
         ],
         lapseto: [
-          { required: true, message: "请选择治疗状态", trigger: "blur" }
+          { required: true, message: "请选择治疗状态", trigger: "blur" },
         ],
         name: [{ required: true, message: "请填写姓名", trigger: "blur" }],
         gender: [{ required: true, message: "请选择性别", trigger: "blur" }],
         idCardNo: [
-          { required: true, message: "请填写身份证号", trigger: "blur" }
+          { required: true, message: "请填写身份证号", trigger: "blur" },
         ],
-        birth: [{ required: true, message: "请填写生日", trigger: "blur" }]
+        birth: [{ required: true, message: "请填写生日", trigger: "blur" }],
       },
-      shootList:[
-       {id:1,name:"是"},
-       {id:2,name:"否"}
-      ]
+      shootList: [
+        { id: 1, name: "是" },
+        { id: 2, name: "否" },
+      ],
     };
   },
   computed: {
-    generic_fold_icon: function() {
+    generic_fold_icon: function () {
       return this.generic_info_fold ? "el-icon-arrow-down" : "el-icon-arrow-up";
     },
-    treat_fold_icon: function() {
+    treat_fold_icon: function () {
       return this.treat_info_fold ? "el-icon-arrow-down" : "el-icon-arrow-up";
-    }
+    },
   },
   created() {
-    this.org_id = this.$store.getters.xt_user.org.id
+    this.org_id = this.$store.getters.xt_user.org.id;
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
@@ -1254,7 +1268,7 @@ export default {
       console.log("patient detail not had id");
       this.$notify.error({
         title: "错误",
-        message: "无效的id"
+        message: "无效的id",
       });
       this.$router.push("/patients/patients");
     }
@@ -1264,7 +1278,8 @@ export default {
     // this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}');
 
     var data = new Date();
-    var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+    var month =
+      data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
   },
@@ -1277,19 +1292,19 @@ export default {
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
 
       const style =
-        "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px;border:none; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
 
       setTimeout(() => {
         printJS({
           printable: "print-info-box",
           type: "html",
           style: style,
-          scanStyles: false
+          scanStyles: false,
         });
       }, 1);
     },
     getZones() {
-      getZones().then(response => {
+      getZones().then((response) => {
         if (response.data.state === 1) {
           this.partitionOptions = response.data.data.zones;
         }
@@ -1297,12 +1312,12 @@ export default {
     },
     fetchPatient(id) {
       fetchPatient(id)
-        .then(response => {
+        .then((response) => {
           console.log(response.data.data);
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
-            console.log("触发了吗无222222",patietInfo)
+            console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
             this.form.alias = patietInfo.alias;
@@ -1311,17 +1326,16 @@ export default {
             this.form.dialysisNo = patietInfo.dialysis_no;
             this.form.gender = patietInfo.gender;
             this.form.is_infectious = patietInfo.is_infectious;
-            this.form.troble_shoot = patietInfo.troble_shoot
-            this.form.zb_patient_id = patietInfo.zb_patient_id
+            this.form.troble_shoot = patietInfo.troble_shoot;
+            this.form.zb_patient_id = patietInfo.zb_patient_id;
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
-            this.form.treatment_plan = patietInfo.treatment_plan
-            if(patietInfo.is_infectious == 1){
-               this.form.remind_cycle = 0
-
+            this.form.treatment_plan = patietInfo.treatment_plan;
+            if (patietInfo.is_infectious == 1) {
+              this.form.remind_cycle = 0;
             }
-            console.log("222222",this.form.remind_cycle)
+            console.log("222222", this.form.remind_cycle);
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 
             this.infections = response.data.data.infections;
@@ -1335,9 +1349,8 @@ export default {
                 const select_options = ["阴性", "阳性", "弱阳性"];
                 for (let i = 0; i < this.infections.length; i++) {
                   this.infections[i]["select_options"] = select_options;
-                  this.infections[i]["value"] = this.infections[
-                    i
-                  ].inspect_value;
+                  this.infections[i]["value"] =
+                    this.infections[i].inspect_value;
                 }
               }
             }
@@ -1405,9 +1418,8 @@ export default {
             this.form.first_dialysis_hospital =
               patietInfo.first_dialysis_hospital;
             if (patietInfo.predialysis_condition.length > 0) {
-              this.form.predialysis_condition = patietInfo.predialysis_condition.split(
-                ","
-              );
+              this.form.predialysis_condition =
+                patietInfo.predialysis_condition.split(",");
             }
             this.form.pre_hospital_dialysis_frequency =
               patietInfo.pre_hospital_dialysis_frequency;
@@ -1518,9 +1530,8 @@ export default {
             var partitionLen = this.partitionOptions.length;
             for (let index = 0; index < partitionLen; index++) {
               if (this.partitionOptions[index].id === patietInfo.partition_id) {
-                this.patientPrint.partition_id = this.partitionOptions[
-                  index
-                ].name;
+                this.patientPrint.partition_id =
+                  this.partitionOptions[index].name;
                 break;
               }
             }
@@ -1540,9 +1551,8 @@ export default {
                 this.maritalOptions[index].id ==
                 response.data.data.patient.marital_status
               ) {
-                this.patientPrint.marital_status = this.maritalOptions[
-                  index
-                ].name;
+                this.patientPrint.marital_status =
+                  this.maritalOptions[index].name;
               }
             }
 
@@ -1552,14 +1562,10 @@ export default {
             );
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, "-");
 
-            this.patientPrint.patient_complains = patietInfo.patient_complains.replace(
-              /\n/g,
-              "<br/>"
-            );
-            this.patientPrint.present_history = patietInfo.present_history.replace(
-              /\n/g,
-              "<br/>"
-            );
+            this.patientPrint.patient_complains =
+              patietInfo.patient_complains.replace(/\n/g, "<br/>");
+            this.patientPrint.present_history =
+              patietInfo.present_history.replace(/\n/g, "<br/>");
             this.patientPrint.past_history = patietInfo.past_history.replace(
               /\n/g,
               "<br/>"
@@ -1586,9 +1592,8 @@ export default {
                 if (
                   this.wayOptions[index].id === patietInfo.reimbursement_way_id
                 ) {
-                  this.patientPrint.reimbursement_way_id = this.wayOptions[
-                    index
-                  ].name;
+                  this.patientPrint.reimbursement_way_id =
+                    this.wayOptions[index].name;
                   break;
                 }
               }
@@ -1639,9 +1644,8 @@ export default {
                 if (
                   this.educationOptions[index].id === patietInfo.education_level
                 ) {
-                  this.patientPrint.education_level = this.educationOptions[
-                    index
-                  ].name;
+                  this.patientPrint.education_level =
+                    this.educationOptions[index].name;
                   break;
                 }
               }
@@ -1654,9 +1658,8 @@ export default {
                 if (
                   this.professionOptions[index].id === patietInfo.profession
                 ) {
-                  this.patientPrint.profession = this.professionOptions[
-                    index
-                  ].name;
+                  this.patientPrint.profession =
+                    this.professionOptions[index].name;
                   break;
                 }
               }
@@ -1690,9 +1693,8 @@ export default {
                   this.inductionOptions[index].id ===
                   patietInfo.induction_period
                 ) {
-                  this.patientPrint.induction_period = this.inductionOptions[
-                    index
-                  ].name;
+                  this.patientPrint.induction_period =
+                    this.inductionOptions[index].name;
                   break;
                 }
               }
@@ -1706,9 +1708,8 @@ export default {
                   this.adminUserOptions[index].id ===
                   patietInfo.attending_doctor_id
                 ) {
-                  this.patientPrint.attending_doctor_id = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.attending_doctor_id =
+                    this.adminUserOptions[index].name;
                   break;
                 }
               }
@@ -1721,9 +1722,8 @@ export default {
                 if (
                   this.adminUserOptions[index].id === patietInfo.head_nurse_id
                 ) {
-                  this.patientPrint.head_nurse_id = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.head_nurse_id =
+                    this.adminUserOptions[index].name;
                   break;
                 }
               }
@@ -1773,9 +1773,8 @@ export default {
                 if (
                   this.adminUserOptions[index].id === patietInfo.registrars_id
                 ) {
-                  this.patientPrint.registrars = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.registrars =
+                    this.adminUserOptions[index].name;
                   this.form.registrars = this.adminUserOptions[index].name;
                   break;
                 }
@@ -1798,7 +1797,7 @@ export default {
             console.log("patient get err state");
             this.$notify.error({
               title: "错误",
-              message: "网络异常"
+              message: "网络异常",
             });
             this.$router.push("/patients/patients");
           }
@@ -1808,17 +1807,17 @@ export default {
           // this.postForm.title += `   Article Id:${this.postForm.id}`
           // this.postForm.content_short += `   Article Id:${this.postForm.id}`
         })
-        .catch(err => {
+        .catch((err) => {
           console.log("patient get err", err);
           this.$notify.error({
             title: "错误",
-            message: "网络异常"
+            message: "网络异常",
           });
           this.$router.push("/patients/patients");
         });
     },
     fetchAllDoctorAndNurse() {
-      fetchAllDoctorAndNurse().then(response => {
+      fetchAllDoctorAndNurse().then((response) => {
         if (response.data.state === 1) {
           this.doctorOptions = response.data.data.doctors;
           this.nurseOptions = response.data.data.nursers;
@@ -1826,7 +1825,7 @@ export default {
       });
     },
     fetchAllAdminUsers() {
-      fetchAllAdminUsers().then(response => {
+      fetchAllAdminUsers().then((response) => {
         if (response.data.state === 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -1845,7 +1844,7 @@ export default {
           printable: "print-card-info",
           type: "html",
           style: style,
-          scanStyles: false
+          scanStyles: false,
         });
       }, 1);
 
@@ -1924,7 +1923,7 @@ export default {
           phone +
           "," +
           "healthcare_no:" +
-          healthCareNo
+          healthCareNo,
       });
     },
     checkIdCardNo() {
@@ -1948,7 +1947,7 @@ export default {
         birth.substr(6, 2);
 
       this.form.age = jsGetAge(this.form.birth, "-");
-    }
+    },
 
     // qrcode(params){
     //    new QRCode('qrcode',{
@@ -1957,7 +1956,7 @@ export default {
     //        text:params,
     //    })
     // }
-  }
+  },
 };
 </script>
 
@@ -1992,6 +1991,23 @@ export default {
   }
 }
 
+/deep/ .now_his{
+  .el-row{
+    .el-col-24{
+      .el-form-item{
+        .el-form-item__content{
+          height: 100%;
+          .el-textarea{
+            .el-textarea__inner{
+              height: 93%;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 // #print-info-box .info_print {
 //     width: 920px;
 //     margin: 0 auto !important;

src/xt_pages/user/components/PatientForm.vue

@@ -672,87 +672,94 @@
         </el-row>
 
         <div class="dataTitle">治疗信息</div>
-        <el-row :span="24">
-          <el-col :span="12">
-            <el-form-item label="主诉 : " prop="patient_complains">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.patient_complains"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="现病史 : " prop="present_history">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.present_history"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="既往史 : " prop="past_history">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.past_history"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :span="24">
-          <el-col>
-            <el-form-item label="体格检查">
-              <el-input v-model="form.temperature" style="width: 200px;">
-                <template slot="prepend"
-                  >体温:</template
-                >
-                <template slot="append"
-                  >℃</template
-                >
-              </el-input>
-              <el-input v-model="form.pulse" style="width: 220px;">
-                <template slot="prepend"
-                  >脉搏:</template
-                >
-                <template slot="append"
-                  >次/分</template
-                >
-              </el-input>
-              <el-input v-model="form.respiratory" style="width: 220px;">
-                <template slot="prepend"
-                  >呼吸:</template
-                >
-                <template slot="append"
-                  >次/分</template
-                >
-              </el-input>
-              <!-- </el-form-item>
-              <el-form-item>-->
-              <el-input v-model="form.sbp" style="width: 240px;">
-                <template slot="prepend"
-                  >收缩压:</template
-                >
-                <template slot="append"
-                  >mmHg</template
-                >
-              </el-input>
-              <el-input v-model="form.dbp" style="width: 240px;">
-                <template slot="prepend"
-                  >舒张压:</template
+        <div style="display: flex">
+        <div style="flex: 1 1 9%;">
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="主诉 : " prop="patient_complains">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.patient_complains"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="既往史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.past_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="体格检查">
+                <el-input
+                  v-model="form.temperature"
+                  style="width: 200px"
                 >
-                <template slot="append"
-                  >mmHg</template
+                  <template slot="prepend">体温:</template>
+                  <template slot="append">℃</template>
+                </el-input>
+                <el-input v-model="form.pulse" style="width: 220px" >
+                  <template slot="prepend">脉搏: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+                <el-input
+                  v-model="form.respiratory"
+                  style="width: 220px"
+                  
                 >
-              </el-input>
-            </el-form-item>
+                  <template slot="prepend">呼吸: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col>
+              <el-form-item>
+                <el-input v-model="form.sbp" style="width: 240px" >
+                  <template slot="prepend">收缩压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+                <el-input v-model="form.dbp" style="width: 240px" >
+                  <template slot="prepend">舒张压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div style="flex: 1;" class="now_his">
+          <el-row :gutter="24" style="height:100%;">
+            <el-col :span="24" style="height:100%;">
+              <el-form-item label="现病史 : " prop="present_history" style="height:100%;">
+                <el-input
+                  style="height:100%;"
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.present_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+        <el-row :span="24">
+          <el-col>
           </el-col>
           <el-col></el-col>
           <el-col :span="24">
@@ -1907,4 +1914,21 @@ export default {
   bottom: 0;
   right: 50px;
 }
+
+/deep/ .now_his{
+  .el-row{
+    .el-col-24{
+      .el-form-item{
+        .el-form-item__content{
+          height: 100%;
+          .el-textarea{
+            .el-textarea__inner{
+              height: 93%;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>