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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -744,6 +744,20 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 60
+        "
+      >
+        <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">
@@ -904,11 +918,11 @@
           >
           </DialysisPrintOrderFive>
                                   
-          <DialysisPrintOrderSix
+          <DialysisPrintOrderSixty
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 6"
           >
-          </DialysisPrintOrderSix>
+          </DialysisPrintOrderSixty>
 
           <DialysisPrintOrderSeven
             v-bind:childResponse="childResponse"
@@ -1168,6 +1182,10 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 59">
           </DialysisPrintOrderFiftyNine>
+          <DialysisPrintOrderSixty
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 60">
+          </DialysisPrintOrderSixty>
         </div>
       </el-container>
     </div>
@@ -1245,9 +1263,11 @@ import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix";
 import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeven";
 import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEight";
 import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine";
+import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderSixty,
     DialysisPrintOrderFiftyNine,
     DialysisPrintOrderFiftyEight,
     DialysisPrintOrderFiftySeven,
@@ -1544,7 +1564,8 @@ export default {
         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 == 58
+        this.org_template_info.template_id == 58 ||
+        this.org_template_info.template_id == 60
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -9,13 +9,15 @@
       </el-form-item>
 
       <el-form-item
+        
         label="总计："
         prop="name"
         :validate-event="is_Name"
         style="width: 33%"
       >
         <el-input
-          style="color: black"
+          class="number_style"
+          style="color: black;font-weight:bolder;"
           type="number"
           v-model="form.total"
           :disabled="true"
@@ -28,6 +30,7 @@
         style="width: 33%"
       >
         <el-input
+         class="number_style"
           style="color: black"
           type="number"
           v-model="form.medical_insurance_price"
@@ -36,12 +39,14 @@
       </el-form-item>
 
       <el-form-item
+       
         label="自费："
         prop="age"
         :validate-event="is_Name"
         style="width: 33%"
       >
         <el-input
+        class="number_style"
           style="color: black"
           type="number"
           v-model="form.private_price"
@@ -50,12 +55,14 @@
       </el-form-item>
 
       <el-form-item
+       
         label="个账支出："
         prop="age"
         :validate-event="is_Name"
         style="width: 33%"
       >
         <el-input
+        class="number_style"
           style="color: black"
           type="number"
           v-model="form.acct_pay"
@@ -70,6 +77,7 @@
         style="width: 33%"
       >
         <el-input
+         class="number_style"
           style="color: black"
           type="number"
           v-model="form.psn_pay"
@@ -102,6 +110,7 @@
 
       <el-form-item label="付款金额：" prop="id_card">
         <el-input
+         class="number_style"
           style="color: black"
           type="number"
           v-model="form.pay_price"
@@ -127,6 +136,7 @@
       <el-form-item class="specialFormItem" label="优惠金额：">
         <div style="display: flex">
           <el-input
+           class="number_style"
             style="color: black"
             v-model="form.preferential_price"
             :disabled="form.discount_price != 0"
@@ -137,6 +147,7 @@
       <el-form-item label="实收金额：">
         <div style="display: flex">
           <el-input
+           class="number_style"
             style="color: black"
             v-model="form.reality_price"
             @change="realityPrice"
@@ -146,6 +157,7 @@
       <el-form-item label="找回金额：">
         <div style="display: flex">
           <el-input
+           class="number_style"
             style="color: black"
             v-model.number="form.found_price"
           ></el-input>
@@ -472,4 +484,11 @@
 outline:none;
 border: 1px solid #66b1ff;
 }
+
+/deep/ .number_style{
+  .el-input__inner{
+    font-weight: bolder;
+  }
+  
+}
 </style>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -9,23 +9,23 @@
       </el-form-item>
 
       <el-form-item label="总计：" prop="name" :validate-event="is_Name">
-        <el-input type="number" v-model="form.total" :disabled="true"></el-input>
+        <el-input class="number_style" type="number" v-model="form.total" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保：" prop="name" :validate-event="is_Name">
-        <el-input type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
+        <el-input class="number_style" type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="自费：" prop="age" :validate-event="is_Name">
+      <el-form-item class="number_style" label="自费：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
-      <el-form-item label="个账支出：" prop="age" :validate-event="is_Name">
+      <el-form-item class="number_style" label="个账支出：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="个人现金支出：" prop="age" :validate-event="is_Name">
+      <el-form-item class="number_style" label="个人现金支出：" prop="age" :validate-event="is_Name">
         <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
       </el-form-item>
 
@@ -54,7 +54,7 @@
 
 
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
-        <el-input type="number" v-model="form.pay_price" :disabled="true"></el-input>
+        <el-input class="number_style" type="number" v-model="form.pay_price" :disabled="true"></el-input>
       </el-form-item>
 
 
@@ -64,22 +64,22 @@
 
       <el-form-item class="specialFormItem" label="折扣金额：">
         <div style="display:flex;">
-          <el-input v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
+          <el-input class="number_style" v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item class="specialFormItem" label="优惠金额：">
         <div style="display:flex;">
-          <el-input v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
+          <el-input class="number_style" v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="实收金额：">
         <div style="display:flex;">
-          <el-input v-model="form.reality_price" @change="realityPrice"></el-input>
+          <el-input class="number_style" v-model="form.reality_price" @change="realityPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="找回金额：">
         <div style="display:flex;">
-          <el-input v-model.number="form.found_price"></el-input>
+          <el-input class="number_style" v-model.number="form.found_price"></el-input>
         </div>
       </el-form-item>
 
@@ -388,4 +388,11 @@
 outline:none;
 border: 1px solid #66b1ff;
 }
+
+/deep/ .number_style{
+  .el-input__inner{
+    font-weight: bolder;
+  }
+  
+}
 </style>