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

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

@@ -276,7 +276,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " >
+            v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -287,7 +287,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26" >
+            v-if=" isShow('置换量') &&  (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -527,12 +527,12 @@
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26">
+          <el-col :span="8" v-if=" isShow('置换量') &&  (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)">
+          <el-col :span="8" v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919">
             <el-form-item label="置换量(ml)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
@@ -789,6 +789,7 @@ export default {
   },
   created() {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     var date = this.$route.query.date
     var patient_id = this.$route.query.patient_id
     this.patient_id = patient_id

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,8 +22,8 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) || org_id != 9919" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26) || org_id == 9919" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
@@ -83,6 +83,7 @@ export default {
   },
   created() {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
   },
   methods: {
     parseTime(time, layout) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -364,6 +364,39 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 27 ||
+            org_template_info.template_id == 0
+        "
+      >
+      <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -574,6 +607,11 @@
             v-if="org_template_info.template_id == 26"
           >
           </DialysisPrintOrderTwentySix>
+          <DialysisPrintOrderTwentySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 27"
+          >
+          </DialysisPrintOrderTwentySeven>
         </div>
       </el-container>
     </div>
@@ -619,9 +657,11 @@ import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyTh
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
 import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
 import DialysisPrintOrderTwentySix from "./template/DialysisPrintOrderTwentySix";
+import DialysisPrintOrderTwentySeven from "./template/DialysisPrintOrderTwentySeven";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentySeven,
     DialysisPrintOrderTwentySix,
     DialysisPrintOrderTwentyFive,
     DialysisPrintOrderTwentyFour,
@@ -997,6 +1037,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 27) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
@@ -1041,6 +1088,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 27){
+        printJS({
+          printable: "new-dialysis-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisTwoPage() {
@@ -1085,6 +1139,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 27){
+        printJS({
+          printable: "new-dialysis-2",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     getNumber() {