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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -9,7 +9,10 @@
         </div>
         <table class="print-table" border="1" style="margin-top: 10px">
           <tr>
-            <td style="text-align: left; width: 170px;line-height:30px;" colspan="1">
+            <td
+              style="text-align: left; width: 170px; line-height: 30px"
+              colspan="1"
+            >
               <span style="display: inline-block; margin-left: 15px">
                 {{ getDatge(queryParams.xtdate) }}
               </span>
@@ -505,62 +508,20 @@
           </tr>
           <tr>
             <td colspan="8" style="text-align: left">
-              <span style="display: inline-block; margin-left: 15px">
-                血管通路:内瘘波动及震颤: (&nbsp;
-                <!-- <label-box
-                  v-for="(item, index) in arr"
+              <span style="display: inline-block; margin-left: 15px" v-if="predialysis.blood_access_part_opera_name!=''">
+                血管通路:
+                <!-- {{predialysis.blood_access_part_opera_name ?'' :predialysis.blood_access_part_opera_name}}&nbsp;&nbsp; -->
+               <span
+                  v-for="(item, index) in arrtwo"
                   :key="index"
-                  :isChecked="
-                    predialysis.blood_access_part_opera_id == item.id
-                      ? true
-                      : false
-                  "
-                  :showValue="item.name"
-                ></label-box> -->
-                <label-box
-                  :isChecked="
-                    predialysis.blood_access_part_opera_name.indexOf(
-                      '内瘘波动及震颤-存在'
-                    ) > -1
-                      ? true
-                      : predialysis.internal_fistula.indexOf(
-                          '内瘘波动及震颤-存在'
-                        ) > -1
-                      ? true
-                      : false
-                  "
-                  showValue="存在"
-                ></label-box>
-                <label-box
-                  :isChecked="
-                    predialysis.blood_access_part_opera_name.indexOf(
-                      '内瘘波动及震颤-减弱'
-                    ) > -1
-                      ? true
-                      : predialysis.internal_fistula.indexOf(
-                          '内瘘波动及震颤-减弱'
-                        ) > -1
-                      ? true
-                      : false
-                  "
-                  showValue="减弱"
-                ></label-box>
-                <label-box
-                  :isChecked="
-                    predialysis.blood_access_part_opera_name.indexOf(
-                      '内瘘波动及震颤-消失'
-                    ) > -1
-                      ? true
-                      : predialysis.internal_fistula.indexOf(
-                          '内瘘波动及震颤-消失'
-                        ) > -1
-                      ? true
-                      : false
-                  "
-                  showValue="消失"
-                ></label-box>
-                )
-                <label-box
+                >
+                {{predialysis.blood_access_part_opera_id == item.id ? item.name :''}}
+                </span>
+                部位：
+                {{predialysis.blood_access_part_id ? predialysis.blood_access_part_id : ''}}&nbsp;&nbsp;
+
+                内瘘：{{predialysis.internal_fistula == ""?'无':predialysis.internal_fistula}}
+                <!-- <label-box
                   v-for="(item, index) in arrtwo"
                   :key="index"
                   :isChecked="
@@ -569,69 +530,47 @@
                       : false
                   "
                   :showValue="item.name"
-                ></label-box>
+                ></label-box> -->
+              </span>
+              <span style="display: inline-block; margin-left: 15px" v-else>
+                血管通路:无
               </span>
             </td>
           </tr>
           <tr>
             <td colspan="8" style="text-align: left">
-              <span style="display: inline-block; margin-left: 15px"
-                >中心静脉导管:</span
-              >
+              <span v-if="predialysis.venous_catheterization==1||predialysis.venous_catheterization==2">
+                <span style="display: inline-block; margin-left: 15px"
+                >中心静脉导管: {{predialysis.venous_catheterization == 1?'长期':'短期'}}</span
+              >&nbsp;&nbsp;
               <!-- (部位：{{ getPartName(predialysis.blood_access_part_id) }}) -->
-              (部位：{{ predialysis.blood_access_part_id }})
-              <label-box
-                showValue="长期"
-                :isChecked="
-                  predialysis.venous_catheterization == 1 ? true : false
-                "
-              ></label-box>
-              <label-box
-                showValue="临时"
-                :isChecked="
-                  predialysis.venous_catheterization == 2 ? true : false
-                "
-              ></label-box
-              >&nbsp;&nbsp; 感染：
-              <label-box
-                showValue="有"
-                :isChecked="
-                  predialysis.catheter.indexOf('感染-有') > -1 ? true : false
-                "
-              ></label-box>
-              <label-box
-                showValue="无"
-                :isChecked="
-                  predialysis.catheter.indexOf('感染-无') > -1 ? true : false
-                "
-              ></label-box
-              >&nbsp;&nbsp;流畅度：
-              <label-box
-                showValue="好"
-                :isChecked="
-                  predialysis.catheter.indexOf('通畅度-好') > -1 ? true : false
-                "
-              ></label-box>
-              <label-box
-                showValue="差"
-                :isChecked="
-                  predialysis.catheter.indexOf('通畅度-差') > -1 ? true : false
-                "
-              ></label-box
-              >&nbsp;&nbsp;溶栓：
-              <label-box
-                showValue="有"
-                :isChecked="
-                  predialysis.catheter.indexOf('溶栓-有') > -1 ? true : false
-                "
-              ></label-box>
-              <label-box
-                showValue="无"
-                :isChecked="
-                  predialysis.catheter.indexOf('溶栓-无') > -1 ? true : false
-                "
-              ></label-box>
+              部位：{{ predialysis.blood_access_part_id }}&nbsp;&nbsp;
+              
+              感染：<span v-if="predialysis.is_infect==1">
+                无
+              </span>
+              <span v-if="predialysis.is_infect==2">
+                有
+              </span>&nbsp;&nbsp;
+              
+              流畅度：
+              <span v-if="predialysis.catheter.indexOf('通畅度-好') > -1">
+                好
+              </span>
+              <span v-if="predialysis.catheter.indexOf('通畅度-差') > -1">
+                差
+              </span>&nbsp;&nbsp;
+             
+             <span v-if="predialysis.catheter.indexOf('溶栓-有') > -1 ||predialysis.catheter.indexOf('溶栓-无') > -1">
+               溶栓：<span v-if="predialysis.catheter.indexOf('溶栓-有') > -1">有</span>
+                     <span v-if="predialysis.catheter.indexOf('溶栓-无') > -1">无</span>
+             </span>
+              
               &nbsp;&nbsp;外露：{{ predialysis.exposed }}cm
+              </span>
+              <span style="display: inline-block; margin-left: 15px" v-else>
+                中心静脉导管:无
+              </span>
             </td>
           </tr>
           <tr>
@@ -808,14 +747,18 @@
               <span style="display: inline-block; margin-left: 15px"
                 >使用特殊药物:</span
               >
-              <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
-              <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>:
               <label-box
-                :isChecked="prescription.special_medicine == 3 ? true : false"
+                :isChecked="prescription.special_medicine == 1 ? true : false"
+                showValue="无"
+              ></label-box>
+              <!-- <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>: -->
+              有：
+              <label-box
+                :isChecked="prescription.special_medicine == 2 ? true : false"
                 showValue="降压药"
               ></label-box>
               <label-box
-                :isChecked="prescription.special_medicine == 4 ? true : false"
+                :isChecked="prescription.special_medicine == 3 ? true : false"
                 showValue="抗凝药"
               ></label-box>
               其他：{{ prescription.special_medicine_other }}
@@ -995,7 +938,10 @@
         <table class="print-table" border="1" style="line-height: 30px">
           <tr style="line-height: 20px">
             <td style="min-width: 80px">时间</td>
-
+            <td style="min-width: 80px">
+              体温
+              <br />℃
+            </td>
             <td style="min-width: 80px">
               血流量
               <br />ml/min
@@ -1016,12 +962,16 @@
               超滤量
               <br />ml
             </td>
+            <td style="min-width: 80px">
+              置换量
+              <br />ml
+            </td>
             <td style="min-width: 80px">
               血压
               <br />(mmHg)
             </td>
             <td style="min-width: 80px">
-              心率
+              脉搏
               <br />次/分
             </td>
             <!-- <td style="min-width:60px">
@@ -1033,12 +983,15 @@
           </tr>
 
           <tr v-for="(monitor, monindex) in monitors" :key="monindex">
-            <td style="height:30px;line-height:30px;">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-
+            <td style="height: 30px; line-height: 30px">
+              {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            </td>
+            <td>{{ monitor.temperature }}</td>
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_volume }}</td>
+            <td>{{ monitor.displacement_quantity }}</td>
             <td>
               {{
                 monitor.systolic_blood_pressure
@@ -1421,7 +1374,7 @@ export default {
       systolic_blood_pressure: "",
       diastolic_blood_pressure: "",
       mission: "",
-      doctor:{},
+      doctor: {},
       dialysis_summary: "",
       orderForm: {
         start_nurse: "",
@@ -2430,6 +2383,57 @@ export default {
       if (bloodAccessParOpera[i].name == "直穿") {
         arrtwo.push(bloodAccessParOpera[i]);
       }
+      if (bloodAccessParOpera[i].name == "动脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "动静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "直线型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "袢型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVG") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVF") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "颈内静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "股静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
       if (bloodAccessParOpera[i].name == "人造血管") {
         arrtwo.push(bloodAccessParOpera[i]);
       }

src/xt_pages/hospitalStation/allListTemplate/printOne.vue

@@ -118,14 +118,6 @@
       }
 
     },
-    watch:{
-        list: {
-            handler(newVal) {
-                this.getPage()
-            },
-            deep: true
-        }
-    }
   }
 
 

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -13,9 +13,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id!=10215 && org_id!=10265 && org_id!=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
-            <printThree v-if="org_id == 0 || org_id == 10265 ||org_id == 4" :paramsObj="invoiceParams"></printThree>
+            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=0" :paramsObj="invoiceParams"></printOne>
+            <printTwo v-if="org_id == 10215  " :paramsObj="invoiceParams"></printTwo>
+            <printThree v-if="org_id == 10265" :paramsObj="invoiceParams"></printThree>
         </div>
     </div>
   </div>
@@ -95,7 +95,7 @@ export default {
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
         this.invoiceParams = val
-        
+
       },
       deep:true
     }
@@ -149,7 +149,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -1,9 +1,9 @@
 <template>
     <div id='invoice-print'>
-       
+
         <div style="display:flex;justify-content: space-between;">
             <!-- 机构名称 -->
-            <div>{{ list.department_name }}</div>
+            <div>{{ list.org_name }}</div>
             <!-- 单据号 -->
             <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
             <div></div>
@@ -18,20 +18,20 @@
             <!-- 个人电脑编号 -->
             <div style="position: absolute;top:90px;left:240px;"></div>
             <!-- 科室 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
             <!-- 床号 -->
             <div style="position: absolute;top:90px;left:240px;"></div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 住院号 -->
-            <div style="position: absolute;top:90px;left:120px;"> {{ list.number }}</div>
+            <div style="position: absolute;top:90px;left:120px;"> {{ list.his_hospital_record.number?list.order.mdtrt_id:'' }}</div>
             <!-- 入院日期 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.in_hosptial_time?list.his_hospital_record.in_hosptial_time.spilt(' ')[0]:''}}</div>
             <!-- 出院日期 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.out_hosptial_time?list.his_hospital_record.out_hosptial_time.spilt(' ')[0]:''}}</div>
             <!-- 住院天数 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+          <div style="position: absolute;top:90px;left:240px;">{{getDay(list.his_hospital_record.in_hosptial_time.split(' ')[0] ,list.his_hospital_record.out_hosptial_time.split(' ')[0])}}</div>
         </div>
 
         <!-- <div style="display:flex;justify-content: space-between;">
@@ -47,37 +47,37 @@
             <div style="position: absolute;top:160px;left:180px">检查费</div>
             <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
             <div style="position: absolute;top:160px;left:340px">护理费</div>
-            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:420px"></div>
             <div style="position: absolute;top:160px;left:500px">麻醉费</div>
-            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:40px">中成药费</div>
-            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:110px"></div>
             <div style="position: absolute;top:190px;left:180px">治疗费</div>
-            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
             <div style="position: absolute;top:190px;left:340px">CT核磁</div>
-            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:420px"></div>
             <div style="position: absolute;top:190px;left:500px">床位费</div>
-            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:220px;left:40px">中草药费</div>
-            <div style="position: absolute;top:220px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:110px"></div>
             <div style="position: absolute;top:220px;left:180px">手术费</div>
-            <div style="position: absolute;top:220px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
             <div style="position: absolute;top:220px;left:340px">输血费</div>
-            <div style="position: absolute;top:220px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:420px"></div>
             <div style="position: absolute;top:220px;left:500px">取暖费</div>
-            <div style="position: absolute;top:220px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:250px;left:40px">高压氧费</div>
-            <div style="position: absolute;top:250px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:110px"></div>
             <div style="position: absolute;top:250px;left:180px">化验费</div>
             <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
             <div style="position: absolute;top:250px;left:340px">氧气费</div>
-            <div style="position: absolute;top:250px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:420px"></div>
             <div style="position: absolute;top:250px;left:500px">其他</div>
             <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
@@ -139,57 +139,63 @@
 
         <div style="position: absolute;top:310px;left:320px">
             <!-- 个人账户支付 -->
+          {{list.order.acct_pay?list.order.acct_pay:''}}
         </div>
         <div style="position: absolute;top:310px;left:380px">
             <!-- 统筹支付 -->
-           
+          {{list.order.hifp_pay?list.order.hifp_pay:''}}
         </div>
         <div style="position: absolute;top:310px;left:500px">
-            <!-- 现金支付 -->
+          {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
+          <!-- 现金支付 -->
         </div>
         <div style="position: absolute;top:340px;left:320px">
-            <!-- 公务员补助 -->
+          {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
+          <!-- 公务员补助 -->
         </div>
         <div style="position: absolute;top:340px;left:380px">
-            <!-- 医疗救助 -->
-            
+          {{list.order.maf_pay?list.order.maf_pay:''}}
+          <!-- 医疗救助 -->
         </div>
         <div style="position: absolute;top:340px;left:500px">
             <!-- 大病 -->
-            
+          {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
+
+
         </div>
         <div style="position: absolute;top:340px;left:560px">
             <!-- 其他基金支付 -->
-            
+          {{list.order.oth_pay?list.order.oth_pay:''}}
+
         </div>
         <div style="position: absolute;top:370px;left:320px">
             <!-- 预交款合计 -->
-            
+
         </div>
         <div style="position: absolute;top:370px;left:380px">
             <!-- 补交款 -->
-            
         </div>
         <div style="position: absolute;top:370px;left:500px">
             <!-- 应退款 -->
-            
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">
                 <!-- 开票日期 -->
-                
+              {{printDate}}
+
             </div>
             <div style="position: absolute;top:400px;left:280px">
                 <!-- 结算日期： -->
+              {{list.order.setl_time?list.order.setl_time.split(' ')[0]:''}}
             </div>
             <div style="position: absolute;top:400px;left:580px">
                 <!-- 经手人： -->
+              {{list.admin_user_name}}
             </div>
         </div>
     </div>
 </template>
 
-
 <script>
 import { getInvoice } from '@/api/project/project'
 export default {
@@ -222,6 +228,19 @@ export default {
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
+      getDay(dateString1,dateString2){
+        var  startDate = Date.parse(dateString1);
+        var  endDate = Date.parse(dateString2);
+        if (startDate>endDate){
+          return 0;
+        }
+        if (startDate==endDate){
+          return 1;
+        }
+        var days=(endDate - startDate)/(1*24*60*60*1000);
+        return  days;
+
+      },
         getInvoice(params){
             getInvoice(params).then((res) => {
                 console.log('res',res)

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -35,8 +35,8 @@
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
             <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_money).toFixed(2) : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_pay).toFixed(2) : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_pay.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -98,7 +98,6 @@
 
             <el-button v-loading="loadingone" size="small"
                        v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
-
                        @click="open(2)"
                        type="primary">出院
             </el-button>
@@ -129,11 +128,11 @@
                        type="primary">收费
             </el-button>
 
-            <el-button v-loading="loadingtwo"
-                       size="small"
-                       @click="open(3)"
-                       type="primary">收费
-            </el-button>
+<!--            <el-button v-loading="loadingtwo"-->
+<!--                       size="small"-->
+<!--                       @click="open(3)"-->
+<!--                       type="primary">收费-->
+<!--            </el-button>-->
             <el-button size="small" @click="open(4)" type="primary"
                        v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -658,10 +658,10 @@
               </tr>
               <tr>
                 <td>其他费</td>
+                <td>&nbsp;{{info.other_cost_total?info.other_cost_total:""}}</td>
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;{{info.other_cost_self_total?info.other_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -63,7 +63,6 @@
                                 </template>
                             </el-table-column>
 
-
                             <el-table-column align="center" prop="name" width="80" label="备注">
                                 <template slot-scope="scope">
                                     <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -11,10 +11,10 @@
           >打印</el-button
         >
       </template> -->
-            
+
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278 &&org_id == 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+<!--        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>-->
       </div>
   </div>
 </template>
@@ -76,10 +76,11 @@ export default {
             scanStyles: false
           });
         },500)
-        
-      }else{
+
+      }
+      else{
         const style =
-        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;page-break-after:always;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;page-break-after:always;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:360px;}.doctor_style{border:none;}.doctor_style tr{page-break-inside:avoid;}.doctor_style tr td{border:1px solid #000}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;} .doctor_style{border: none} }';
         printJS({
           printable: "prescriptionPrint",
           type: "html",
@@ -87,7 +88,7 @@ export default {
           scanStyles: false
         });
       }
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -102,10 +103,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
     getAllHisPatientList(){
          const params = {
@@ -131,16 +132,16 @@ export default {
             // console.log(this.patientTableData[0])
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
-            this.cal_two = cal_two   
+            this.cal_two = cal_two
          }
       })
     },
 
     changePatient(row){
-      console.log("row",row)
-      this.patient_id = row.patient_id
-      this.record_date = this.record_date
-      this.prescription_id = this.prescription_id
+      // console.log("row",row)
+      // this.patient_id = row.patient_id
+      // this.record_date = this.record_date
+      // this.prescription_id = this.prescription_id
       //   var params = {
       //     patient_id:row.patient_id,
       //     record_date:this.record_date,
@@ -165,31 +166,31 @@ export default {
     searchAction(){
 
     }
-    
+
   },
 
   created() {
-    this.org_id = this.$store.getters.xt_user.org_id
-    this.getAllDoctorList()
-    var record_date = this.paramsObj.record
-    this.record_date = record_date
-    console.log("record_date",record_date)
-    this.prescription_id = this.paramsObj.prescription_id
-    this.patient_id = this.paramsObj.patient_id
-    this.ids = this.paramsObj.ids
-    this.getAllHisPatientList(record_date)
+    // this.org_id = this.$store.getters.xt_user.org_id
+    // this.getAllDoctorList()
+    // var record_date = this.paramsObj.record_date
+    // this.record_date = record_date
+    // console.log("record_date",record_date)
+    // this.prescription_id = this.paramsObj.prescription_id
+    // this.patient_id = this.paramsObj.patient_id
+    // this.ids = this.paramsObj.ids
+    // this.getAllHisPatientList(record_date)
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
-        this.paramsObj = val
-        this.patient_id = this.paramsObj.patient_id
-        var record_date = this.paramsObj.record
-        this.record_date = record_date
-        var prescription_id = this.paramsObj.prescription_id
-        this.prescription_id = prescription_id
-        this.ids = this.paramsObj.ids
-        
+        // this.paramsObj = val
+        // this.patient_id = this.paramsObj.patient_id
+        // var record_date = this.paramsObj.record
+        // this.record_date = record_date
+        // var prescription_id = this.paramsObj.prescription_id
+        // this.prescription_id = prescription_id
+        // this.ids = this.paramsObj.ids
+
       },
       deep:true
     }
@@ -362,7 +363,7 @@ export default {
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
-  
+
   .el-date-editor{
     .el-input__inner{
       padding-right:0px;

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -1,9 +1,9 @@
 <template>
   <div id='prescriptionPrint'>
     <div v-for="(i,index) in printData">
-      <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :key="index" v-if="item.project.length > 0">
-        <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
-          <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+      <div id='prescription-print' class="prescription-print" style="page-break-after:always;" v-for="(item,index) in i.prescriptions" :key="index" v-if="item.project.length > 0">
+        <div class="toptitle" style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
+          <div  style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
             <span>费别</span>
             <span>自费</span>
             <span>公费</span>
@@ -13,7 +13,7 @@
           <div>就诊日期：{{ getTime(i.info.ctime, '{y}-{m}-{d}') }}</div>
         </div>
 
-        <div class="printTitle">{{ orgname }}</div>
+        <div class="printTitle">{{ orgname }}测试</div>
         <div class="printTitle">处方、治疗单</div>
 
         <div class="infoTitle">
@@ -94,8 +94,8 @@
           <div>费用：{{ getTotalOne(item.project).toFixed(2) ? getTotalOne(item.project).toFixed(2) : '' }}元</div>
         </div>
 
-        <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
-          <tr>
+        <table class="doctor_style" style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+          <tr >
             <td style="width:16%;">治疗时间</td>
             <td style="width:16%;"></td>
             <td style="width:16%;"></td>
@@ -410,17 +410,7 @@ export default {
     this.orgname = xtuser.org.org_name
 
   },
-  watch: {
-    // patient_id: function(val) {
-    //   console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
-    //   //    this.getPrescriptionPrint()
-    // },
-    // ids: function(val) {
-    //   this.ids = val
-    //   console.log('this.idsids', this.ids)
-    //   this.getPrescriptionPrint()
-    // }
-  }
+
 }
 </script>
 
@@ -506,4 +496,12 @@ export default {
 .actionBar div {
   width: 150px;
 }
+.doctor_style {
+  tr{
+    page-break-inside:avoid;
+    td{
+      border: 1px solid #000;
+    }
+  }
+}
 </style>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -247,18 +247,19 @@ export default {
                   scanStyles: false
                 })
               }
-              if (this.printType == 3) {
+              if (this.printType == 1) {
                 const style =
-                    '@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}#prescriptionPrint div{box-shadow:none;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+                    '@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
                 printJS({
                   printable: 'printMain',
                   type: 'html',
                   style: style,
                   scanStyles: false
                 })
-              } else {
+              }
+              if (this.printType == 2) {
                 const style =
-                    '@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+                    '@media print {html {height: auto;margin: 0px;} .printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:360px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}.doctor_style{border: none}.doctor_style tr{page-break-inside:avoid;}.doctor_style tr td{border: 1px solid #000;}}'
                 printJS({
                   printable: 'printMain',
                   type: 'html',
@@ -266,6 +267,26 @@ export default {
                   scanStyles: false
                 })
               }
+              if (this.printType == 3) {
+                const style =
+                    '@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}#prescriptionPrint div{box-shadow:none;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+                printJS({
+                  printable: 'printMain',
+                  type: 'html',
+                  style: style,
+                  scanStyles: false
+                })
+              } 
+              // else {
+              //   const style =
+              //       '@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+              //   printJS({
+              //     printable: 'printMain',
+              //     type: 'html',
+              //     style: style,
+              //     scanStyles: false
+              //   })
+              // }
             })
             .catch((reject) => {
             })