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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -758,6 +758,20 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 61
+        "
+      >
+        <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">
@@ -1140,11 +1154,11 @@
             v-if="org_template_info.template_id == 50"
           >
           </DialysisPrintOrderFifty>
-          <DialysisPrintOrderFiftyOne
+          <DialysisPrintOrderSixtyOne
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 51"
           >
-          </DialysisPrintOrderFiftyOne>
+          </DialysisPrintOrderSixtyOne>
           <DialysisPrintOrderFiftyTwo
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 52"
@@ -1186,6 +1200,10 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 60">
           </DialysisPrintOrderSixty>
+          <DialysisPrintOrderSixtyOne
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 61">
+          </DialysisPrintOrderSixtyOne>
         </div>
       </el-container>
     </div>
@@ -1264,9 +1282,11 @@ import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeve
 import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEight";
 import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine";
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
+import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderSixtyOne,
     DialysisPrintOrderSixty,
     DialysisPrintOrderFiftyNine,
     DialysisPrintOrderFiftyEight,
@@ -1565,7 +1585,8 @@ export default {
         this.org_template_info.template_id == 50 ||
         this.org_template_info.template_id == 51 ||
         this.org_template_info.template_id == 58 ||
-        this.org_template_info.template_id == 60
+        this.org_template_info.template_id == 60 ||
+        this.org_template_info.template_id == 61
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -921,7 +921,7 @@
                       kg
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      计划超滤量：
+                      计划超滤量： 
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
@@ -932,7 +932,8 @@
                             : "/"
                         }}
                       </div>
-                      L
+                      <span v-if="org_id == 10395">ml</span> 
+                      <span v-else>L</span>
                     </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：