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

src/api/his/his.js

@@ -744,3 +744,16 @@ export function handleOne(params) {
 
 
 
+export function getBatchSettleAccount(params) {
+  return request({
+    url: "/api/batch/settleaccount",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
+

src/router/modules/dialysis.js

@@ -803,5 +803,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fiftyThree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fiftyThree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
   ]
 }

src/xt_pages/device/main.vue

@@ -7,11 +7,12 @@
                  @click="add_device_action">新增
       </el-button>
 
-
     </div>
     <div class="app-container">
       <device-list ref="device_list" :zones="zones" :groups="groups" :device_numbers="device_numbers"
-                   @did_select_device="did_select_device"></device-list>
+                   @did_select_device="did_select_device">
+                  
+      </device-list>
       <!--<el-col :span="17">-->
       <!--<device-detail ref="device_detail" :device_numbers="device_numbers" @did_update_device="did_update_device"></device-detail>-->
       <!--</el-col>-->

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1429,14 +1429,14 @@
                           </td>
 
                           <td>
-                            <span v-if="org_id == 9671 || org_id == 10440">
+                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
                                 : "0"
                             }}
                             </span>
-                             <span v-if="org_id!=9671 && org_id!=10440">
+                             <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471">
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/batch_print/batch_print_order_thirtySeven.vue

@@ -107,10 +107,12 @@
                             <span style="display:inline-block;width:15%;margin-left:15px;width:100%;">
                                 治疗抗凝:
                                 <label-box :isChecked="record.prescription.anticoagulant == 3 ? true : record.prescription.anticoagulant == 6 ? true : record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                                <label-box :isChecked="record.prescription.anticoagulant == 8  ? true : false" showValue="依诺肝素"></label-box>
                                 <span style="display:inline-block;width:50px;">
                                     <span v-if="record.prescription.anticoagulant == 3">{{ record.prescription.anticoagulant_zongliang }}</span>
                                     <span v-if="record.prescription.anticoagulant == 6">{{ record.prescription.anticoagulant_zongliang }}</span>
                                     <span v-if="record.prescription.anticoagulant == 7">{{ record.prescription.anticoagulant_zongliang }}</span>
+                                    <span v-if="record.prescription.anticoagulant == 8">{{ record.prescription.anticoagulant_zongliang }}</span>
                                 </span>U
                                 <span style="margin:0 10px;">
                                     <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1041,19 +1041,7 @@
                     <td colspan="3" style="width:130px;height:40px">
                       执行时间
                     </td>
-                    <!-- <td style="width:60px;height:60px">
-              <p style="height:20px;line-height:20px">核对</p>
-            </td>
-            <td style="width:60px;height:40px">
-              <p style="height:20px;line-height:20px">上次透后体重</p>
-            </td>
-            <td style="width:60px;height:40px">
-              {{
-                assessmentafter.weight_after
-                  ? assessmentafter.weight_after
-                  : "0"
-              }}kg
-            </td> -->
+             
                   </tr>
 
                   <tr

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -338,6 +338,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 53">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       <template v-if="this.template_id == 59">
         <el-button
           size="small"
@@ -2106,6 +2115,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/six" });
       }else if (this.template_id == 51) {
         this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
+      }else if (this.template_id == 53) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftyThree" });
       }else if (this.template_id == 59) {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {

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

@@ -1223,7 +1223,7 @@
   import MsgTip from './MsgTip'
   import request from '@/utils/request'
   import multiSelectBox from './MultiSelectBox'
-
+  const moment = require('moment')
   export default {
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip, multiSelectBox },
@@ -2578,7 +2578,38 @@ mu
 
         this.isVisibility = true
         this.checkedCities = []
+        var total_day = ""
+        if(moment().weekday() == 1){
+           total_day ="周一"
+        }
+        if(moment().weekday() == 2){
+           total_day ="周二"
+        }
+        if(moment().weekday() == 3){
+           total_day ="周三"
+        }
+        if(moment().weekday() == 4){
+           total_day ="周四"
+        }
+        if(moment().weekday() == 5){
+           total_day ="周五"
+        }
+        if(moment().weekday() == 6){
+           total_day ="周六"
+        }
+        if(moment().weekday() == 6){
+           total_day ="周七"
+        }
+        console.log("---------",this.targetAdvices)
+        if(this.targetAdvices!=null && this.targetAdvices.length >0){
+            for (let i = 0; i < this.targetAdvices.length; i++) {
+              if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
+                this.targetAdvices[i].isCheck = 1
+              }
+            }
+        }
         for (let i = 0; i < this.targetAdvices.length; i++) {
+         
           if (this.targetAdvices[i].isCheck == 1) {
             this.checkedCities.push(this.targetAdvices[i].id)
           }

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

@@ -864,7 +864,7 @@
             width="140"
             v-if="
               isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800)
+              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598)
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -44,7 +44,7 @@
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -96,7 +96,7 @@
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1493,8 +1493,8 @@
                       
 
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440 || org_id == 10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -94,10 +94,12 @@
                   <span style="display:inline-block;width:15%;margin-left:15px;width:100%;">
                       治疗抗凝:
                       <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                      <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>
                       <span style="display:inline-block;width:50px;">
                           <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
+                          <span v-if="prescription.anticoagulant == 8">{{ prescription.anticoagulant_zongliang }}</span>
                       </span>U
                       <span style="margin:0 10px;">
                           <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -605,7 +605,17 @@
                           <tr>
                               <td width='70'>抗凝方式</td>
                               <td width='100'>
-                                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
+                                <span v-if="prescription.anticoagulant == 3"><label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 4"><label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 5"> <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 6"> <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 7"> <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 8"> <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 9"> <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box></span> 
+                                <span v-if="prescription.anticoagulant == 10"><label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 11"> <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 12"><label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box></span>  
+                                <span v-if="prescription.anticoagulant == 13"><label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box></span>  
                               </td>
                               <!-- <td width='100'>
                                   <div class="under-line">

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -89,6 +89,7 @@
          <el-radio-group v-model="form.pay_way">
           <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
            <el-button type="primary" v-if="form.pay_way == 4 || form.pay_way == 6" @click="reading()">读卡</el-button>
+<!--           <el-button type="primary" v-if="form.pay_way == 6" @click="readEle()">读电子凭证</el-button>-->
 
          </el-radio-group>
       </el-form-item>
@@ -275,9 +276,12 @@
       created() {
       },
       methods: {
+        readEle(){
+
+
+        },
         reading() {
           var that = this
-
           let id_card_type = 1
           if (this.form.pay_way == 6){
             id_card_type = 4

src/xt_pages/hospitalStation/statementPrint.vue

@@ -13,7 +13,7 @@
       >
     </template>
 
-    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10215">
+    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0">
       <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>
       <printOne :info="info" v-else></printOne>
     </div>

src/xt_pages/outpatientCharges/batchStatementPrint.vue

@@ -0,0 +1,693 @@
+<template>
+  <!-- 打印 -->
+  <div>
+    <template>
+      <el-button
+        style="position: fixed; right:26px; z-index: 999"
+        :loading="loading"
+        size="small"
+        icon="el-icon-printer"
+        @click="printThisPage"
+        type="primary"
+      >打印
+      </el-button
+      >
+    </template>
+
+    <div class="dialysisPage" style="padding-top: 40px">
+
+<!--      <batch-print-three-->
+<!--        :info="info"-->
+<!--        v-if="org_id == 10138 || org_id == 0 || org_id == 10278"-->
+<!--      ></batch-print-three>-->
+      <batch-print
+        :info="info"
+        v-if="org_id == 10138 || org_id == 0 || org_id == 10278 || org_id == 10342 || org_id == 10341 "
+      >
+
+      </batch-print>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import {uParseTime} from "@/utils/tools";
+import axios from "axios";
+import print from "print-js";
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import printOne from "./statementTemplate/printOne";
+import privateChargePrint from "./statementTemplate/privateChargePrint";
+
+import printTwo from "./statementTemplate/printTwo";
+import printThree from "./statementTemplate/printThree";
+import printFour from "./statementTemplate/printFour";
+import printFive from "./statementTemplate/printFive";
+import testVue from "./statementTemplate/test";
+import {getAllDoctorList, getAllHisPatientList,} from "@/api/project/project";
+import {getBatchSettleAccount} from "@/api/his/his";
+import printSeven from "./statementTemplate/printSeven";
+import Print10191 from "./statementTemplate/print10191";
+import printTen from "./statementTemplate/printTen";
+import BatchPrintThree from '../outpatientDoctorStation/batch_print_template/batchPrintThree'
+import BatchPrint from './statementTemplate/batchPrint'
+
+// import PrintOther from '../hospitalStation/statementTemplate/printOther'
+export default {
+  name: "batchStatementPrint",
+  components: {
+    BatchPrint,
+    BatchPrintThree,
+    Print10191,
+    printSeven,
+    BreadCrumb,
+    printOne,
+    privateChargePrint,
+    printTwo,
+    printThree,
+    printFour,
+    testVue,
+    printFive,
+    printTen
+  },
+  props: {
+    paramsObj: Object,
+  },
+  data() {
+    return {
+      crumbs: [
+        {path: false, name: "门诊医生站"},
+        {path: false, name: "打印"},
+      ],
+      record_date: "",
+      patientTableData: [],
+      advicePrint: [],
+      hisPatient: {},
+      patient: {},
+      search_input: "",
+      loading: false,
+      patient_id: 0,
+      prescription_id: 0,
+      ids: "",
+      info: null,
+      org_id: "",
+      balanceAccounts: {},
+    };
+  },
+  methods: {
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      if (
+        this.$store.getters.xt_user.org_id == 10138 ||
+        this.$store.getters.xt_user.org_id == 4 ||
+        this.$store.getters.xt_user.org_id == 10278 ||
+        this.$store.getters.xt_user.org_id == 0  ||
+        this.$store.getters.xt_user.org_id == 10342 ||
+        this.$store.getters.xt_user.org_id == 10341
+      ) {
+        setTimeout(() => {
+          const style =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}";
+          const style2 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 50%;}}}";
+          const style3 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}";
+          const style4 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}";
+          const style5 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}";
+          const style6 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}";
+          const style7 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}";
+          const style8 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}";
+          const style9 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}";
+          const style10 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 85%;}}}";
+          const style11 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 87%;}}}";
+          const style12 =
+            "@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 89%;}}}";
+
+            printJS({
+              printable: "prescription-print",
+              type: "html",
+              style: style,
+              scanStyles: false,
+            });
+
+
+        }, 500);
+      } else if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        const style =
+          "@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}";
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      } else {
+        // 医保环境打印格式
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
+          const style =
+            "@media print {.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: 16px;border-color: #000;}}";
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false,
+          });
+        } else if (this.$store.getters.xt_user.org_id == 10191) {
+          const style =
+            "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false,
+          });
+          // const style =
+          //     "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+          // printJS({
+          //   printable: "statement-print",
+          //   type: "html",
+          //   style: style,
+          //   scanStyles: false,
+          // });
+        } else {
+          const style =
+            "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false,
+          });
+        }
+      }
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+        }
+      });
+    },
+    getAllHisPatientList() {
+      const params = {
+        record_date: this.record_date,
+      };
+      getAllHisPatientList(params).then((response) => {
+        if (response.data.state == 1) {
+          this.patientTableData = response.data.data.list;
+          this.patientTableDataTwo = response.data.data.list;
+
+          console.log("222", this.patientTableData);
+          let cal_one = 0;
+          let cal_two = 0;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            if (
+              response.data.data.list[i].prescription == null ||
+              response.data.data.list[i].prescription.length == 0
+            ) {
+              cal_one = cal_one + 1;
+            }
+            if (
+              response.data.data.list[i].prescription != null &&
+              response.data.data.list[i].prescription.length > 0
+            ) {
+              cal_two = cal_two + 1;
+            }
+          }
+          // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          // console.log(this.patientTableData[0])
+          // this.choosePatient(this.patientTableData[0])
+          this.cal_one = cal_one;
+          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;
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //     prescription_id:this.prescription_id,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
+    },
+    getTimes(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    searchAction() {
+    },
+    getInfo(obj) {
+      var that = this;
+      var params = obj
+      getBatchSettleAccount(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false;
+        } else {
+          var orders =  response.data.data.orders
+
+          for(let i = 0; i < orders.length; i++){
+
+            let obj = {
+              type: 1,
+              details: [],
+              total: 0,
+            };
+            let obj2 = {
+              type: 2,
+              details: [],
+              total: 0,
+            };
+            let obj3 = {
+              type: 3,
+              details: [],
+              total: 0,
+            };
+
+            let obj4 = {
+              type: 4,
+              details: [],
+              total: 0,
+            };
+            let num = 0;
+            orders[i].order_infos.map((item) => {
+              if (item.advice_id > 0) {
+                obj.details.push(item);
+                obj.total += item.pric * item.advice.prescribing_number;
+                num++;
+              } else {
+                if (item.project.type == 2) {
+                  obj2.details.push(item);
+                  obj2.total += item.pric * item.project.count;
+                  num++;
+                } else {
+                  obj3.details.push(item);
+                  obj3.total += item.pric * item.project.count;
+                  num++;
+                }
+              }
+            });
+
+            orders[i]["new_detail_list"] = [];
+            orders[i]["new_detail_list"].push(obj);
+            orders[i]["new_detail_list"].push(obj2);
+            orders[i]["new_detail_list"].push(obj3);
+            // that.info.new_detail_list.push(obj4)
+
+
+
+          }
+          this.info = orders
+          console.log( this.info )
+
+
+          // var that = this;
+          //
+          // that.info = response.data.data.info;
+          // that.p_admin = response.data.data.printor_admin;
+          // that.charge_admin = response.data.data.charge_admin;
+          // that.info["p_admin"] = that.p_admin;
+          // that.info["charge_admin"] = that.charge_admin;
+          // that.info["order_number"] = response.data.data.order_number;
+          // that.info["patient"] = response.data.data.patient;
+          // that.info["date"] = response.data.data.date;
+          // that.info["number"] = response.data.data.number;
+          // that.info["order_infos"] = response.data.data.order_infos;
+          // that.info["diagnosis"] = response.data.data.diagnosis;
+          // that.info["fixmedins_name"] = response.data.data.org_name;
+          // that.info["fixmedins_code"] = response.data.data.org_code;
+          // // that.info["doctor_code"] = response.data.data.doctor_code;
+          // // that.info["department"] = response.data.data.department;
+          // // that.info["health_card_no"] = response.data.data.health_card_no;
+          //
+          // that.info["bed_cost_total"] = response.data.data.bedCostTotal;
+          // that.info["bed_cost_self_total"] =
+          //   response.data.data.bedCostSelfTotal;
+          // that.info["bed_cost_part_self_total"] =
+          //   response.data.data.bedCostPartSelfTotal;
+          //
+          // that.info["operation_cost_total"] =
+          //   response.data.data.operationCostTotal;
+          // that.info["operation_cost_self_total"] =
+          //   response.data.data.operationCostSelfTotal;
+          // that.info["operation_cost_part_self_total"] =
+          //   response.data.data.operationCostPartSelfTotal;
+          //
+          // that.info["other_cost_total"] = response.data.data.otherCostTotal;
+          // that.info["other_cost_self_total"] =
+          //   response.data.data.otherCostSelfTotal;
+          // that.info["other_cost_part_self_total"] =
+          //   response.data.data.otherCostPartSelfTotal;
+          //
+          // that.info["material_cost_total"] =
+          //   response.data.data.materialCostTotal;
+          // that.info["material_cost_self_total"] =
+          //   response.data.data.materialCostSelfTotal;
+          // that.info["material_cost_part_self_total"] =
+          //   response.data.data.materialCostPartSelfTotal;
+          //
+          // that.info["western_medicine_cost_total"] =
+          //   response.data.data.westernMedicineCostTotal;
+          // that.info["western_medicine_cost_self_total"] =
+          //   response.data.data.westernMedicineCostSelfTotal;
+          // that.info["western_medicine_cost_part_self_total"] =
+          //   response.data.data.westernMedicineCostPartSelfTotal;
+          //
+          // that.info["chinese_traditional_medicine_cost_total"] =
+          //   response.data.data.chineseTraditionalMedicineCostTotal;
+          // that.info["chinese_traditional_medicine_cost_self_total"] =
+          //   response.data.data.chineseTraditionalMedicineCostSelfTotal;
+          // that.info["chinese_traditional_medicine_cost_part_self_total"] =
+          //   response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+          //
+          // that.info["check_cost_total"] = response.data.data.checkCostTotal;
+          // that.info["check_cost_self_total"] =
+          //   response.data.data.checkCostSelfTotal;
+          // that.info["check_cost_part_self_total"] =
+          //   response.data.data.checkCostPartSelfTotal;
+          //
+          // that.info["laboratory_cost_total"] =
+          //   response.data.data.laboratoryCostTotal;
+          // that.info["laboratory_cost_self_total"] =
+          //   response.data.data.laboratoryCostSelfTotal;
+          // that.info["laboratory_cost_part_self_total"] =
+          //   response.data.data.laboratoryCostPartSelfTotal;
+          //
+          // that.info["treat_cost_total"] = response.data.data.treatCostTotal;
+          // that.info["treat_cost_self_total"] =
+          //   response.data.data.treatCostSelfTotal;
+          // that.info["treat_cost_part_self_total"] =
+          //   response.data.data.treatCostPartSelfTotal;
+          // that.info["date"] = response.data.data.date;
+          // // that.info["number"] = response.data.data.number;
+          // that.info["order_infos"] = response.data.data.order_infos;
+          // that.info["diagnosis"] = response.data.data.diagnosis;
+          //
+          // let list = []
+          // for (let i = 0; i < response.data.data.order_infos.length; i++) {
+          //   let order = response.data.data.order_infos[i]
+          //   let obj = {
+          //     name: "",
+          //     spec: "",
+          //     cnt: "",
+          //     det_item_fee_sumamt: "",
+          //   }
+          //
+          //   if (order.advice_id > 0 && order.project_id == 0) {
+          //     obj.name = order.advice.advice_name
+          //     let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+          //     obj.spec = spec
+          //     obj.cnt = order.cnt
+          //     obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+          //     list.push(obj)
+          //
+          //   } else if (order.advice_id == 0 && order.project_id > 0) {
+          //     if (order.project.type == 2) {
+          //       obj.name = order.project.project.project_name
+          //       obj.spec = ""
+          //       obj.cnt = order.cnt
+          //       obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+          //
+          //     } else {
+          //       obj.name = order.project.good_info.good_name
+          //       obj.spec = order.project.good_info.specification_name
+          //       obj.cnt = order.cnt
+          //       obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+          //     }
+          //     list.push(obj)
+          //   }
+          //
+          // }
+          //
+          // console.log(list)
+          // let len = list.length / 2
+          // let L_list = []
+          // let R_list = []
+          // len = Math.trunc(len)
+          // for (let i = 0; i < len; i++) {
+          //   L_list.push(list[i])
+          // }
+          // console.log(len)
+          // for (let i = len; i < list.length; i++) {
+          //   console.log(list[i])
+          //   R_list.push(list[i])
+          // }
+          // console.log(L_list)
+          // console.log(R_list)
+          //
+          // that.info["L_list"] = L_list
+          // that.info["R_list"] = R_list
+
+        }
+      });
+    }
+
+  },
+
+  created() {
+    this.getInfo(this.paramsObj);
+    this.org_id = this.$store.getters.xt_user.org_id;
+
+  },
+  watch: {
+    paramsObj: {
+      //深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+        this.paramsObj = val;
+        this.getInfo(this.paramsObj);
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+};
+</script>
+
+<style>
+.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;
+}
+
+.dialysis-print-order .table-box {
+  width: 100%;
+  line-height: 23px;
+  font-size: 14px;
+}
+
+.dialysis-print-order .print-table {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+}
+
+.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: 30px;
+}
+
+.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;
+}
+
+.table-box1 {
+  border: 1px solid #000;
+  width: 100%;
+  line-height: 30px;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+
+.table-box1 tr {
+  border-bottom: 1px solid #000;
+}
+</style>
+
+<style lang="scss">
+.newContainer {
+
+.dialysisPage::-webkit-scrollbar {
+  height: 15px;
+}
+
+.el-date-editor {
+
+.el-input__inner {
+  padding-right: 0px;
+}
+
+}
+.el-table td,
+.el-table th {
+  text-align: center;
+}
+
+}
+.newContainer::-webkit-scrollbar {
+  height: 15px !important;
+}
+</style>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -80,13 +80,28 @@
 
       <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 0">
 
-        <el-checkbox-group v-model="form.pay_ways">
+        <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.cash_pay" ></el-input>
+      </el-form-item>
 
-      <el-form-item label="其他说明：">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.ali_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 
@@ -171,7 +186,7 @@
           medical_insurance_price:0,
           private_price:'',//自费12
           pay_way:"",
-          pay_ways:[],
+          pay_wayss:[],
           dec_way:'false',//是否使用押金支付
           tmp_decimal:"",//本次使用的押金
           pay_price:'',
@@ -191,6 +206,11 @@
           acct_mulaid_pay:'',
           fulamt_ownpay_amt:'',
           acct_used_flag:0,
+          cash_pay:"",
+          band_card_pay:"",
+          wechat_pay:"",
+          ali_pay:"",
+          jifen_pay:"",
         },
         payWays: [
           {value: "1", label: '现金'},
@@ -200,8 +220,6 @@
           {value: "7", label: '积分'},
           {value: "4", label: '医保卡'},
           {value: "8", label: '其他'},
-
-
         ],
         total:"",
 
@@ -226,6 +244,13 @@
           overlmt_self_pay:"",
           acct_mulaid_pay:"",
           fulamt_ownpay_amt:"",
+          pay_wayss: [],
+          acct_used_flag:0,
+          cash_pay:"",
+          band_card_pay:"",
+          wechat_pay:"",
+          ali_pay:"",
+          jifen_pay:"",
         },
 
       }
@@ -333,11 +358,7 @@
         this.form.total = total + this.form.medical_insurance_price
         this.form.discount_price = 0.0
         this.form.preferential_price = 0.0
-        this.form.pay_ways = []
         this.form.acct_used_flag = 0
-
-
-
         this.form.fapiao_code =""
         this.form.fapiao_number = ""
         this.order = order
@@ -379,6 +400,7 @@
             value = this.getValue()
             console.log(value)
             this.$emit('confirm', value)
+
             this.loadingtwo = true
           }
         })

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,11 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 0 && org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
-     <list-print-three v-if="org_id == 0 || org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
+     <list-print-three v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
@@ -576,7 +576,7 @@
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
+          if(this.org_id == 10215 || 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;}}'
             printJS({
@@ -589,7 +589,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: 12px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 20px;}}'
             printJS({
               printable: 'list-print',
               type: 'html',

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -5,8 +5,10 @@
         <div class="listInfo">
 
             <div>患者姓名：{{patient.name}}</div>
-            <div>透析号：{{patient.dialysis_no}}</div>
-            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div v-if="$store.getters.xt_user.org.id != 10191">透析号：{{patient.dialysis_no}}</div>
+          <div v-if="$store.getters.xt_user.org.id == 10191">身份证号：{{patient.id_card_no}}</div>
+
+          <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
             <div>年龄：{{patient.age}}  岁</div>
             <div v-if="order.settle_type == 1">收费日期：{{getTimes(order.settle_accounts_date)}}</div>
             <div v-if="order.settle_type == 2">收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
@@ -39,6 +41,12 @@
             <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
             <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
             <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+          <div class="tableBottomOne">基金总额：{{order.fund_pay_sumamt}}元</div>
+          <div class="tableBottomOne">统筹支付：{{order.hifp_pay}}元</div>
+          <div class="tableBottomOne">医疗救助：{{order.maf_pay}}元</div>
+          <div class="tableBottomOne">医保报销：{{order.fund_pay_sumamt}}元</div>
+          <div class="tableBottomOne">个人支付：{{order.psn_cash_pay}}元</div>
+
         </div>
         </div>
     </div>
@@ -94,21 +102,21 @@
         let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
           :
           new Date().getSeconds()
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+        dateTime = yy + '-' + mm + '-' + dd
         return dateTime
       },
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d}')
       },
       getPage(){
-        if(this.list.length <= 13){
+        if(this.list.length <= 15){
             this.page = 1
             this.pageArr.push(this.list.length)
-        }else if(this.list.length > 13){
-            this.page = parseInt(this.list.length / 13)
-            let num = this.list.length % 13
+        }else if(this.list.length > 15){
+            this.page = parseInt(this.list.length / 15)
+            let num = this.list.length % 15
             for (var i=0;i<this.page;i++){
-                this.pageArr.push(13)
+                this.pageArr.push(15)
             }
             if(num != 0){
                 this.pageArr.push(num)
@@ -164,11 +172,11 @@
     padding: 0 5px;
 }
 .tableBottom{
-    font-size: 16px;
+    font-size: 12px;
     display: flex;
     margin-top: 20px;
 }
 .tableBottomOne{
-    margin-right: 40px;
+    margin-right: 20px;
 }
 </style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1506,7 +1506,7 @@ export default {
     },
     chargeConfirm(form) {
       this.newLoading = true
-      form.pay_ways = form.pay_ways.join(",")
+      form['pay_ways'] = form.pay_wayss.join(",")
       form['id'] = this.patientInfo.id
       form['his_patient_id'] = this.hisPatientInfo.id
       form['record_time'] = this.record_date

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -127,6 +127,7 @@
         prescription_id: 0,
         ids: "",
         info: null,
+        order:null,
         org_id: "",
         balanceAccounts: {},
       };
@@ -1011,9 +1012,10 @@
                     that.p_admin = response.data.data.printor_admin;
                     that.charge_admin = response.data.data.charge_admin;
 
+
+                    that.info["new_order"] =  response.data.data.order
                     that.info["p_admin"] = that.p_admin;
                     that.info["charge_admin"] = that.charge_admin;
-
                     that.info["order_number"] = response.data.data.order_number;
                     that.info["patient"] = response.data.data.patient;
                     that.info["date"] = response.data.data.date;

src/xt_pages/outpatientCharges/statementTemplate/batchPrint.vue

@@ -0,0 +1,531 @@
+<template>
+  <div>
+    <div id='prescription-print'>
+        <div  class="prescription-print"
+            style="position: relative;  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; page-break-after:always"
+            v-for="(infos,index) in info" :key="index">
+          <img style="width:100%;height:80px"
+            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 0 || $store.getters.xt_user.org_id == 10342 || $store.getters.xt_user.org_id == 10341"
+             src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+          <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id==10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
+          <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
+          <div style="display:flex;">
+            <div>单据号：<span
+              style="display:inline-block;width:200px;">{{infos.order.number ? infos.order.number : ''}}</span>
+            </div>
+            <div>透析号：<span style="display:inline-block;width:200px;">{{infos.patient.dialysis_no ? infos.patient.dialysis_no : ''}}</span>
+            </div>
+            <div style="margin-left:2px;">电脑号：<span
+              style="display:inline-block;">{{infos.his.psn_no ? infos.his.psn_no : ''}}</span></div>
+          </div>
+          <div style="display:flex;justify-content: space-between;">
+            <div style="display:flex;" >
+              <div>姓名：<span style="display:inline-block;width:50px;">
+                {{infos.patient.name ? infos.patient.name.indexOf('（') > -1 ? infos.patient.name.substring(0,infos.patient.name.indexOf('（')) : infos.patient.name : ''}}
+              </span>
+              </div>
+              <div>性别：<span
+                style="display:inline-block;width:30px;">{{infos.patient.gender == '1' ? '男' : '女'}}</span>
+              </div>
+              <div>年龄：<span
+                style="display:inline-block;width:50px;">{{getAge(infos.patient)}}岁</span>
+              </div>
+              <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
+              </div>
+              <div>收费日期：<span style="display:inline-block;">{{infos.order.setl_time ? infos.order.setl_time.split(' ')[0] : ''}}</span>
+              </div>
+            </div>
+            <div style="float:right">金额单位：元</div>
+          </div>
+          <div style="min-height: 300px;">
+            <table border='1' style="width:100%;" cellspacing="0">
+              <tr>
+                <td width="70">类别</td>
+                <td>项目</td>
+                <td min-width="180" style="min-width:60px;">规格</td>
+                <td width="40">单位</td>
+                <td width="40">数量</td>
+                <td width="60">单价</td>
+                <td width="70">总额</td>
+                <td width="130">小计</td>
+              </tr>
+              <div v-for="(item,i) in infos.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
+                <tr v-for="(subItem,index) in item.details" :key="index">
+                  <td>
+                    <span v-if="item.type == 1">药品费</span>
+                    <span v-if="item.type == 2">诊疗费</span>
+                    <span v-if="item.type == 3">耗材费</span>
+                    <span v-if="item.type == 4">诊疗费</span>
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                    <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                    <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                    <span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">
+                      <span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">
+                        {{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}
+                      </span>
+                    <span v-if="item.type == 2"></span>
+                    <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                    <span v-if="item.type == 4"></span>
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
+                    <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                    <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                    <span v-if="item.type == 4"></span>
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                    <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                    <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                    <span v-if="item.type == 4"></span>
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">{{ subItem.pric.toFixed(2) }}</span>
+                    <span v-if="item.type == 2">{{ subItem.pric.toFixed(2) }}</span>
+                    <span v-if="item.type == 3">{{ subItem.pric.toFixed(2) }}</span>
+                    <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+
+                  </td>
+                  <td>
+                    <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
+                    <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                    <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                    <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                  </td>
+                  <td :rowspan="item.details.length" v-if="index == 0"
+                      style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
+                  </td>
+                </tr>
+              </div>
+              <tr>
+                <td colspan="7">
+                  <div style="display:flex;flez-wrap:wrap;">
+                    <div style="width:33%;" v-for="(item,index) in infos.new_detail_list" :key="index">
+                      <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
+                      <span v-if="item.type == 2">诊疗费: {{ item.total.toFixed(2) }}</span>
+                      <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
+                      <span v-if="item.type == 4">诊疗费: {{ item.total.toFixed(2) }}</span>
+
+                    </div>
+                  </div>
+                </td>
+                <td>合计: {{infos.medfee_sumamt}}元</td>
+              </tr>
+              <tr>
+                <td colspan="7">
+                  <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
+                    <div style="width:33%;">医疗费总额：{{infos.order.medfee_sumamt?infos.order.medfee_sumamt:""}}元</div>
+                    <div style="width:33%;">基金支付金额：{{infos.order.fund_pay_sumamt?infos.order.fund_pay_sumamt:""}}元</div>
+                    <div style="width:33%;">个人账户支付金额：{{infos.order.acct_pay?infos.order.acct_pay:""}}元</div>
+
+                  </div>
+                  <div style="display:flex;flez-wrap:wrap;font-size:16px;">
+                    <div style="width:33%;">医疗救助基金金额：{{infos.order.maf_pay?infos.order.maf_pay:""}}元</div>
+                    <div style="width:33%;">个人支付金额：{{ infos.order.psn_cash_pay}}元</div>
+                    <div style="width:33%;">个人账户金额：{{infos.order.balc}}元</div>
+                  </div>
+                  <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
+                    <div style="width:33%;">基金统筹支付金额：{{infos.order.hifp_pay?infos.order.hifp_pay:""}}元</div>
+                  </div>
+                </td>
+                <td style="font-size:16px;">合计：{{infos.order.medfee_sumamt}}元</td>
+              </tr>
+
+            </table>
+            <div style="float:right;margin:5px 0;display:flex;">
+              <div>操作人：<span style="width:100px;display:inline-block;">{{infos.printor_admin.user_name}}</span></div>
+              <div>操作日期：<span style="width:100px;display:inline-block;">{{infos.order.setl_time ? infos.order.setl_time.split(' ')[0] : ''}}</span>
+              </div>
+            </div>
+          </div>
+
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+          <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+
+        </div>
+    </div>
+  </div>
+
+</template>
+<script>
+import { getChargePrint } from '@/api/project/project'
+import { jsGetAge, uParseTime } from '@/utils/tools'
+
+export default {
+  name: "batchPrint",
+  data() {
+    return {
+      list: {},
+      prescription: [],
+      patient: {},
+      orgname: '',
+
+      result: {},
+      org_code: '',
+      patient_name: '',
+      doctor_code: '',
+      doctor_name: '',
+
+      name_arr: [],
+      spec_arr: [],
+      count_arr: [],
+      price_arr: [],
+      total_arr: []
+
+    }
+  },
+  props: {
+    paramsObj: Object,
+    info: Array,
+    balanceAccounts: Object
+  },
+  methods: {
+    getAge: function(val) {
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+      }
+    },
+    getName(list) {
+      let new_list = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].aac031 == '1') {
+          new_list.push(list[i])
+        }
+      }
+
+      switch (new_list[0].bcc334) {
+        case 'A31001':
+          return '深圳医保1档'
+          break
+        case 'A31002':
+          return '深圳医保2档'
+
+          break
+        case 'A31003':
+          return '深圳医保3档'
+
+          break
+        case 'A31004':
+          return '二档（少儿）'
+
+          break
+        case 'A31005':
+          return '学生二档'
+
+          break
+        case 'A31006':
+          return '大学生二档'
+
+          break
+        case 'A32001':
+          return '在职公务员'
+          break
+        case 'A32002':
+          return '在职驻深公务员'
+
+          break
+        case 'A39301':
+          return '家属统筹医疗'
+
+          break
+        case 'A41001':
+          return '工伤在职'
+
+          break
+        case 'A51001':
+          return '生育在职'
+
+          break
+        case 'A52001':
+          return '生育医疗一档'
+
+          break
+        case 'A52002':
+          return '生育医疗一档'
+
+          break
+        case 'C31001':
+          return '一档医疗退休'
+
+          break
+        case 'C31002':
+          return '二档医疗退休'
+          break
+
+      }
+
+    },
+    getValue(item) {
+      return this.getItemName(item.aka111) + ': ' + item.bka058 + '元'
+    },
+    getItemName(number) {
+      switch (number) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '西药费'
+
+          break
+        case '03':
+          return '中药费'
+
+          break
+        case '04':
+          return '中成药费'
+
+          break
+        case '05':
+          return '中草药费'
+
+          break
+        case '06':
+          return '检查费'
+
+          break
+        case '07':
+          return '治疗费'
+
+          break
+        case '08':
+          return '放射费'
+
+          break
+        case '09':
+          return '手术费'
+
+          break
+        case '10':
+          return '化验费'
+
+          break
+        case '11':
+          return '输血费'
+
+          break
+        case '12':
+          return '输氧费'
+
+          break
+        case '13':
+          return '其它费'
+
+          break
+        case '14':
+          return '麻醉费'
+
+          break
+        case '15':
+          return '材料费'
+
+          break
+        case '16':
+          return '特殊检查费'
+
+          break
+        case '17':
+          return '特殊治疗费'
+
+          break
+        case '18':
+          return '诊疗费(诊查费)'
+
+          break
+        case '19':
+          return '护理费'
+
+          break
+        case '20':
+          return '诊金'
+
+          break
+        case '21':
+          return '检查费（CT）'
+
+          break
+        case '22':
+          return '检查费（MRT）'
+
+          break
+        case '23':
+          return '检查费（其他）'
+
+          break
+        case '24':
+          return '特需服务费'
+
+          break
+        case '25':
+          return '杂费'
+
+          break
+        case '26':
+          return '挂号费'
+          break
+        case '99':
+          return '诊疗费'
+          break
+
+      }
+
+    },
+    getChargePrint(record_date, patient_id, prescription_id) {
+      var params = {
+        record_date: record_date,
+        patient_id: patient_id,
+        prescription_id: prescription_id
+      }
+      console.log('params', params)
+      getChargePrint(params).then(response => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list
+          console.log('list9999999999', list)
+          this.list = list
+          var prescription = response.data.data.prescription
+          console.log('prescription', prescription)
+          this.prescription = prescription
+          var patient = response.data.data.patient
+          console.log('patient', patient)
+          this.patient = patient
+          var histpatient = response.data.data.hisPatient
+          console.log('hispatient', histpatient)
+        }
+      })
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    }
+  },
+  mounted() {
+    this.org_id = this.$store.getters.xt_user.org_id
+
+
+
+  },
+  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
+
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+
+.prescription-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), 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: 10px;
+  padding: 20px 10px;
+}
+
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+}
+
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 10px;
+  margin-top: 10px;
+}
+
+.infoMain .infoP {
+  width: 33%;
+  line-height: 24px;
+}
+
+.chargeBox {
+  border: 1px solid #000;
+}
+
+.chargeUl {
+  display: flex;
+  justify-content: space-between;
+  text-align: center;
+}
+
+.chargeUl p {
+  height: 40px;
+  line-height: 40px;
+}
+
+.chargeP {
+  height: 40px;
+  line-height: 40px;
+}
+
+.moneyBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  background: #eee;
+  height: 40px;
+  align-items: center;
+  border: 1px solid #000;
+  border-top: none
+}
+
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
+}
+
+.actionBar div {
+  width: 150px;
+}
+
+table {
+
+td {
+  padding: 10px 5px;
+}
+
+}
+</style>

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -110,7 +110,7 @@
             <div>费用总计：{{info.medfee_sumamt}}</div>
             <div>统筹支付：{{info.fund_pay_sumamt}}</div>
             <div>账户支付：{{info.acct_pay}}</div>
-            <div>个人现金支付：{{info.cash_payamt}}</div>
+            <div>个人现金支付：{{info.new_order.psn_cash_pay}}</div>
             <div>其他支付：{{info.oth_pay}}</div>
             <div>减免金额：</div>
           </td>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -12,7 +12,7 @@
                 <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span>
                 </div>
                 <div style="margin-left:2px;">电脑号：<span
-                        style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
+                        style="display:inline-block;">{{info.new_order.psn_no ? info.new_order.psn_no : ''}}</span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
@@ -26,7 +26,7 @@
                     </div>
                     <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
                     </div>
-                    <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span>
                     </div>
                 </div>
                 <div style="float:right">金额单位：元</div>
@@ -117,31 +117,33 @@
                                 </div>
                             </div>
                         </td>
-                        <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                        <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:info.new_order.medfee_sumamt}}元</td>
                     </tr>
                     <tr>
                         <td colspan="7">
                             <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
-                                <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</div>
-                                <div style="width:33%;">基金支付金额：{{info.hifp_pay?info.hifp_pay:0}}元</div>
-                                <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:0}}元</div>
+                                <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:info.new_order.medfee_sumamt}}元</div>
+                                <div style="width:33%;">基金支付金额：{{info.fund_pay_sumamt?info.fund_pay_sumamt:info.new_order.fund_pay_sumamt}}元</div>
+                                <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:info.new_order.acct_pay}}元</div>
 
                             </div>
                             <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                              <div style="width:33%;">医疗救助基金金额：{{info.maf_pay?info.maf_pay:0}}元</div>
-
-                              <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
-                                <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
+                                <div style="width:33%;">医疗救助基金金额：{{info.maf_pay?info.maf_pay:info.new_order.maf_pay}}元</div>
+                                <div style="width:33%;">个人支付金额：{{ info.new_order.psn_cash_pay}}元</div>
+                                <div style="width:33%;">个人账户金额：{{info.new_order.balc}}元</div>
                             </div>
+                          <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
+                            <div style="width:33%;">基金统筹支付金额：{{info.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</div>
+                          </div>
                         </td>
-                        <td style="font-size:16px;">合计：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                        <td style="font-size:16px;">合计：{{info.new_order.medfee_sumamt}}元</td>
                     </tr>
 
                 </table>
             </div>
             <div style="float:right;margin:10px 0;display:flex;">
                 <div>操作人：<span style="width:100px;display:inline-block;">{{info.p_admin.user_name}}</span></div>
-                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span>
                 </div>
             </div>
             <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
@@ -545,7 +547,6 @@
     },
     mounted() {
       this.org_id = this.$store.getters.xt_user.org_id
-
       var record_date = this.paramsObj.record_date
       console.log('record_date', record_date)
       var patient_id = this.paramsObj.patient_id

src/xt_pages/outpatientCharges/summary.vue

@@ -23,6 +23,7 @@
               @input="searchAction"
               @keyup.enter.native="searchAction"
               class="filter-item"
+              placeholder="请输入患者姓名"
           />
           <el-button
               size="small"
@@ -33,20 +34,6 @@
           >
             搜索
           </el-button>
-          <!--                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"-->
-          <!--                               style="width:150px;margin-left:10px;" @change="changeDoctor">-->
-          <!--                        <el-option-->
-          <!--                                label="全部"-->
-          <!--                                value="0">-->
-          <!--                        </el-option>-->
-          <!--                        <el-option-->
-          <!--                                v-for="(item,index) in doctors"-->
-          <!--                                :key="index"-->
-          <!--                                :label="item.user_name"-->
-          <!--                                :value="item.admin_user_id">-->
-          <!--                        </el-option>-->
-          <!--                    </el-select>-->
-
           <el-select
               size="small"
               v-model="sort_type"
@@ -62,7 +49,24 @@
             >
             </el-option>
           </el-select>
-          <el-date-picker
+
+          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType">
+            <el-option label="全部" value="0"></el-option>
+            <el-option label="上午" value="1"></el-option>
+            <el-option label="下午" value="2"></el-option>
+            <el-option label="晚上" value="3"></el-option>
+          </el-select>
+
+          <el-select v-model="zoneVal" placeholder="请选择分区" style="margin-right:20px;" @change="handleZoneChange">
+            <el-option
+              v-for="item in zone_options"
+              :key="item.id"
+              :label="item.text"
+              :value="item.id">
+            </el-option>
+          </el-select>
+
+          <!-- <el-date-picker
               size="small"
               v-model="start_time"
               prefix-icon="el-icon-date"
@@ -90,10 +94,9 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               align="right"
-          ></el-date-picker>
-          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          ></el-date-picker> -->
         </div>
+        <!-- 按钮 -->
         <div>
           <!-- <el-popover
                       placement="bottom"
@@ -104,13 +107,16 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
+          <el-button  v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="batch_print_settlte">批量打印结算单
+          </el-button>
           <el-button size="small" type="primary" @click="export_detail"
           >报表下载
           </el-button
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
-          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_four">报表下载3</el-button>
-<!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
+
+          <!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -129,17 +135,50 @@
 
         </div>
       </div>
+      <div style="margin-bottom: 10px;">
+        <el-date-picker
+              size="small"
+              v-model="start_time"
+              prefix-icon="el-icon-date"
+              @change="handleStartTimeChange"
+              :editable="false"
+              :clearable="false"
+              style="width: 196px; "
+              type="date"
+              placeholder="选择开始日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
+          ></el-date-picker>
+          <span style="text-align: center;">-</span>
+          <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              @change="handleEndTimeChange"
+              :editable="false"
+              :clearable="false"
+              style="width: 196px; "
+              type="date"
+              placeholder="选择结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              align="right"
+          ></el-date-picker>
+      </div>
       <el-table
           :data="tableData"
           border
           style="width: 100%"
           :row-style="{ color: '#303133' }"
+          @selection-change="handleSelectionChange"
           :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
           highlight-current-row
       >
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
         <el-table-column
             prop="date"
             label="序号"
@@ -324,6 +363,24 @@
           :paramsObj="orderObj"
       ></new-statement-print>
     </el-dialog>
+
+    <!-- 批量打印 -->
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="batchStatementVisible"
+    >
+<!--      <batchStatementPrint-->
+<!--        ref="batchPrint"-->
+<!--        :paramsObj="batchOrderObj"-->
+<!--      ></batchStatementPrint>-->
+      <batch-statement-print
+        ref="batchPrint"
+        :paramsObj="batchOrderObj"
+      ></batch-statement-print>
+    </el-dialog>
+
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -386,8 +443,11 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import {getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund,} from "@/api/his/his";
+import {getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund} from "@/api/his/his";
 // import NewStatementPrint from './newStatementPrint'
+
+
+import batchStatementPrint from "./batchStatementPrint.vue";
 import NewStatementPrint from "./statementPrint.vue";
 import listPrint from "./listPrint";
 import allListPrint from "./allListPrint";
@@ -397,15 +457,19 @@ import axios from "axios";
 import invoicePrint from "./invoicePrint";
 import settlementPrint from "./settlementPrint";
 import {jsGetAge, uParseTime} from "@/utils/tools";
-
+const moment = require('moment')
 import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo,getAllOrders,exportOrderInfo,handleOne} from "../../api/his/his";
 
 import {handleData10106,handleData10318,handleData10138Two} from "../../api/his/his_export";
 import StatementListPrint from "./statementListPrint";
-
+import {
+  getDialysisRecordInitData
+} from '@/api/dialysis_record'
+import BatchStatementPrint from './batchStatementPrint'
 export default {
   name: "OutpatientChargesSummary",
   components: {
+    BatchStatementPrint,
     StatementListPrint,
     NewStatementPrintTwo,
     NewStatementPrint,
@@ -418,8 +482,13 @@ export default {
   data() {
     return {
       orderObj: {},
+      batchOrderObj:{},
+      zone_options: [
+        { id: 0, text: '全部分区' }
+      ],
       statementListVisible:false,
       statementVisible: false,
+      batchStatementVisible:false,
       statementVisible9504: false,
       orderObj9504: {},
       crumbs: [
@@ -427,11 +496,14 @@ export default {
         {path: false, name: "项目消费明细汇总"},
       ],
       tableData: [],
+      selecting_schs:[],
       limit: 10,
       page: 1,
       keywords: "",
-      start_time: "",
-      end_time: "",
+      sch_type:"0",//班次
+      zoneVal:0,//分区
+      start_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      end_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       total: "",
       doctors: [],
       sort_type: 1,
@@ -485,12 +557,44 @@ export default {
   },
 
   created() {
+    this.getInitData()
     this.fetchAllAdminUsers();
     this.getDoctorList();
     this.getHisOrderList();
   },
 
   methods: {
+    handleSelectionChange(val) {
+      this.selecting_schs = val
+    },
+    handleSchType(val){
+      this.sch_type = val
+      this.getHisOrderList()
+    },
+    handleZoneChange(val){
+      this.zoneVal = val
+      this.getHisOrderList()
+
+
+    },
+    getInitData: function () {
+      getDialysisRecordInitData().then((rs) => {
+        var resp = rs.data;
+        if (resp.state == 1) {
+          var zones = resp.data.zones;
+          var zone_options = [{ id: 0, text: "全部" }];
+          for (let z_i = 0; z_i < zones.length; z_i++) {
+            const zone = zones[z_i];
+            zone_options.push({ id: zone.id, text: zone.name });
+          }
+          this.zone_options = zone_options;
+
+        } else {
+          this.$message.error(resp.msg);
+        }
+      });
+    },
+
     setStorage() {
       this.$store.commit("SET_PAGEDATA", {
         page: this.page,
@@ -1110,7 +1214,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "2",
+                month: "3",
                 code: data[b].code,
                 pric: data[b].count * data[b].price,
                 item_name: data[b].name,
@@ -2696,7 +2800,24 @@ export default {
       }
       return res
     },
+    batch_print_settlte(){
+      if (this.selecting_schs.length === 0) {
+        this.$message.error('请至少选择一条需要打印的内容')
+        return false
+      } else {
+        var sch_ids = []
+        for (let index = 0; index < this.selecting_schs.length; index++) {
+          sch_ids.push(this.selecting_schs[index].id)
+        }
+        this.batchStatementVisible = true
+        let params = {
+          order_ids: sch_ids.join(","),
+          admin_user_id:  this.$store.getters.xt_user.user.id,
+        };
+        this.batchOrderObj = params
 
+      }
+    },
     export_detail() {
       let params = {
         start_time: this.start_time,
@@ -3280,6 +3401,8 @@ export default {
         type: this.admin_user_id,
         p_type: 2,
         sort_type: this.sort_type,
+        sch_type: this.sch_type,
+        zone_type: this.zoneVal
       };
       getHisOrderList(params).then((response) => {
         if (response.data.state == 0) {

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

@@ -8,13 +8,13 @@
           class="prescription-print"
           style="page-break-after: always"
         >
-          <span v-if="org_id == 10138">
+          <span v-if="org_id == 10138 || org_id == 10341 || org_id == 10342">
             <img
               src="https://kuyi.shengws.com/bailin/bltotle.jpg"
               style="width: 100%"
               alt=""
             /></span>
-          <span v-if="org_id == 10278">
+          <span v-if="org_id == 10278  || org_id == 10341 || org_id == 10342">
             <img
               src="https://kuyi.shengws.com/beierlog.png"
               style="width: 100%"
@@ -220,13 +220,13 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <span v-if="org_id == 10138"
+          <span v-if="org_id == 10138  || org_id == 10341 || org_id == 10342"
           ><img
             src="https://kuyi.shengws.com/bailin/blend.jpg"
             style="width: 100%"
             alt=""
           /></span>
-          <span v-if="org_id == 10278"
+          <span v-if="org_id == 10278  || org_id == 10341 || org_id == 10342"
           ><img
             src="https://kuyi.shengws.com/bailinbeier.png"
             style="width: 100%"

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -8,9 +8,7 @@
         <div>
             <el-form :model="form" class="adviceForm" :rules="rules" ref="form" label-width="90px">
 
-                <el-form-item label="模板名称:"  prop="name" style="width: 100%;margin-bottom:0;">
-                    <el-input v-model="form.name"  placeholder=""></el-input>
-                </el-form-item>
+
 
                 <el-form-item label="透析模式:" style="width: 100%;margin-top: 20px" prop="mode">
                     <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
@@ -158,7 +156,6 @@
     data() {
       return {
         rules: {
-          name: [{required: true, message: "模版名字不能为空", trigger: 'blur'}],
           mode: [{required: true, message: "请选择透析模式", trigger: 'blur'}],
         },
         visible: false,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -119,7 +119,7 @@
                        v-loading="saveLoading">保存
             </el-button>
             <el-button size="small" ref="button_three" @click="open_two()" type="primary">处方调用</el-button>
-            <!--<el-button size="small" @click="open_three()" type="primary">存模板</el-button>-->
+            <el-button size="small" @click="open_three()" type="primary">保存模板</el-button>
 
             <!-- <el-popover
                                 placement="bottom"
@@ -1704,7 +1704,7 @@ export default {
                   unit: prescription.project[b].unit,
                   type: prescription.project[b].type,
                   execution_state: prescription.project[b].execution_state,
-                
+
 
                 }
 
@@ -1713,14 +1713,14 @@ export default {
                   obj['medical_code'] = prescription.project[b].project.medical_code
                   obj['project_name'] = prescription.project[b].project.project_name
                   obj['project'] = prescription.project[b].project
-                 
+
 
                 } else if (prescription.project[b].type == 3) {
                   obj['statistical_classification'] = ''
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] = prescription.project[b].good_info.good_name
                   obj['good_info'] = prescription.project[b].good_info
-                
+
 
                 }
                 tempProject.push(obj)
@@ -1866,7 +1866,7 @@ export default {
                     unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
                     execution_state: 2,
-                    
+
 
                   }
 
@@ -1876,7 +1876,7 @@ export default {
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['price'] = prescription.project[b].project.price
                     obj['project'] = prescription.project[b].project
-                    
+
 
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
@@ -1884,7 +1884,7 @@ export default {
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['price'] = prescription.project[b].good_info.packing_price
                     obj['good_info'] = prescription.project[b].good_info
-                  
+
                   }
                   tempProject.push(obj)
                 }
@@ -2166,7 +2166,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-                       
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2325,7 +2325,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-                         
+
 
                         }
 
@@ -2710,7 +2710,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-                       
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2860,7 +2860,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-                         
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -3224,7 +3224,7 @@ export default {
                       unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state,
-                  
+
                     }
 
                     if (prescription.project[b].type == 2) {
@@ -3374,7 +3374,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: 2,
-                       
+
 
                       }
 
@@ -3818,7 +3818,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-                       
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3826,7 +3826,7 @@ export default {
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] = prescription.project[b].project
-                      
+
 
                       } else if (prescription.project[b].type == 3) {
                         if (prescription.project[b].team_id > 0) {
@@ -3835,7 +3835,7 @@ export default {
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] = prescription.project[b].good_info
-                       
+
 
                       }
                       tempProject.push(obj)
@@ -3979,7 +3979,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-                          
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -4448,7 +4448,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-                       
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -4608,7 +4608,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-                         
+
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/outpatientTool/components/settle.vue

@@ -129,7 +129,29 @@
               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="微信支付">
+          <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="支付宝支付">
+          <template slot-scope="scope">{{scope.row.ali_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="银行卡支付">
+          <template slot-scope="scope">{{scope.row.band_card_pay}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="积分支付">
+          <template slot-scope="scope">{{scope.row.jifen_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="现金支付">
+          <template slot-scope="scope">{{scope.row.cash_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="其他说明">
+          <template slot-scope="scope">{{scope.row.oth_desc}}</template>
+        </el-table-column>
 
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">

src/xt_pages/outpatientTool/labelPrint.vue

@@ -6,12 +6,12 @@
         <div>
             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
-                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                    <el-input  style="width:150px;" v-model="keywords" @input="searchAction"
                               @keyup.enter.native='searchAction'
                               placeholder="请输入患者姓名"
                               class="filter-item"/>
-                    <el-select size="small" v-model="item_type" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeItem">
+                    <el-select  v-model="item_type" placeholder="请选择"
+                               style="width:150px;" @change="changeItem">
                         <el-option
                                 label="全部"
                                 value="0">
@@ -31,6 +31,19 @@
                             @change="changeDate"
                     >
                     </el-date-picker>
+
+                    <el-select v-model="tube_color" style="width:160px;" placeholder="请选择" @change="changeItemTwo">
+                      <el-option
+                        label="全部"
+                        value="0">
+                      </el-option>
+                      <el-option
+                        v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
                 </div>
             </div>
             <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
@@ -67,9 +80,11 @@
                             <el-button
                                     type="primary"
                                     size="small"
-                                    icon="el-icon-edit-outline"
+                                    icon="el-icon-printer"
                                     @click="Print(scope.row, scope.$index)"
                             >
+
+                            <!-- icon="el-icon-edit-outline" -->
                             </el-button>
                         </el-tooltip>
                     </template>
@@ -130,7 +145,7 @@
   import { uParseTime } from '@/utils/tools'
   import SignPrint from '../dialysis/signPrint'
   import JsBarcode from 'jsbarcode'
-
+  import { getDictionaryDataConfig } from '@/utils/data'
   // import NewStatementPrint from './newStatementPrint'
   const moment = require('moment')
   export default {
@@ -141,6 +156,7 @@
     },
     data() {
       return {
+        tube_color:"0",
         current_ctime: 0,
         current_number: '',
         current_project_name: '',
@@ -171,6 +187,10 @@
       }
     },
     methods: {
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },
       printAction: function() {
         const style = '@media print { .sign{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
         printJS({
@@ -229,6 +249,10 @@
         this.page = 1
         this.limit = 10
         this.getList()
+      },changeItemTwo(){
+        this.page = 1
+        this.limit = 10
+        this.getList()
       },
       changeItem() {
         this.page = 1
@@ -246,7 +270,8 @@
           is_print: this.item_type,
           keyword: this.keywords,
           page: this.page,
-          limit: this.limit
+          limit: this.limit,
+          tube_color:this.tube_color,
         }
         GetLabelList(params).then(response => {
           if (response.data.state == 0) {

src/xt_pages/outpatientTool/yidiClear.vue

@@ -11,6 +11,7 @@
         <el-date-picker
             v-model="month"
             type="month"
+            value-format="yyyy-MM"
             placeholder="选择年月">
         </el-date-picker>
       </div>
@@ -93,6 +94,7 @@ export default {
   methods: {
     getYidiClear(){
       var that = this;
+      console.log(this.month)
       let params = {
         'year':this.month.split("-")[0],
         'month':this.month.split("-")[1],

src/xt_pages/user/components/PatientDetail.vue

@@ -11,7 +11,7 @@
           <el-col :span="1">&nbsp;</el-col>
 
           <template v-for="(item, index) in form.formItem">
-            <el-col :span="7" :key="index">
+            <el-col :span="7" >
               <el-form-item
                 :label="item.item_name"
                 v-if="item.range_type == 1"
@@ -34,6 +34,7 @@
                 :key="item.item_id"
                 :prop="'formItem.' + index + '.value'"
               >
+              <!-- :key="item.item_id" -->
                 <el-select
                   v-model="item.value"
                   placeholder="请选择"
@@ -817,7 +818,7 @@
         </el-form-item>
       </el-col>
     </el-form>
-
+    <!-- 打印预览 -->
     <div style="display: none">
       <div id="print-info-box">
         <div class="print_main_content">

src/xt_pages/user/coursePrint.vue

@@ -61,7 +61,7 @@
               </div>
             </div>
 
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440">
+            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440 || org_id == 10131">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}

src/xt_pages/user/firstDiseasePrint.vue

@@ -8,10 +8,8 @@
     </div>
     <div class="app-container">
       <div id="print_content">
-        <div class="print_page_main_content">
+        <div class="print_page_main_content" style="height: 100%;">
            <div class="order-yy-name"></div>
-          <!-- <div class="order_title" style="padding-top:12px;text-align:center;">首次病程记录</div>
-        -->
           <h1 style="text-align:center;">首次病程记录</h1>
           <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
             <div class="inline_block;">
@@ -45,29 +43,25 @@
 
              <div class="inline_block" style="width:100%;">
               <span style="font-size:20px">初步诊断：</span>
-              <div v-html="hosDetail.tentative_diagnosis" class="printP" style="text-indent:20px">
-
+              <div v-html="hosDetail.tentative_diagnosis" class="printP" style="text-indent:20px;">
               </div>
              </div>
 
              <div class="inline_block" style="width:100%;">
               <span style="font-size:20px"> 诊断依据：</span>
-              <div v-html="hosDetail.diagnostic_basis" class="printP" style="text-indent:20px">
-
+              <div v-html="hosDetail.diagnostic_basis" class="printP" style="text-indent:20px; margin-bottom: 0px;">
               </div>
              </div>
 
              <div class="inline_block" style="width:100%;">
                 <span  style="font-size:20px">鉴别诊断：</span> 
                 <div v-html="hosDetail.differential_diagnosis" class="printP" style="text-indent:20px">
-
                 </div>
               </div>
 
               <div class="inline_block" style="width:100%;">
                  <span style="font-size:20px">诊疗计划：</span>
                 <div v-html="hosDetail.treatment_plan" class="printP" style="text-indent:20px">
-
                 </div>
               </div>
 
@@ -98,6 +92,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import {getFirstDetail,getPatientInfo} from "@/api/patient"
 import { getAllDoctorList } from "@/api/device"
 import { getDataConfig } from "@/utils/data";
+import print from "print-js";
 export default {
   name: 'dialysisPrintOrderOne',
   components: {
@@ -135,7 +130,7 @@ export default {
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{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:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;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;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;font-weight: bold;margin: 10px 0;}'
+        // const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{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:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;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;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;font-weight: bold;margin: 10px 0;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',
@@ -233,12 +228,12 @@ export default {
       return count + 1
     },
     printAction: function() {
-      const style = '@media print {.printP div{margin-bottom:5px;} .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: 20px;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: 14px;padding: 6px 5px;line-height: 16px;}.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:1000px;}.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 style = '@media print {.printP div{margin-bottom:5px;} .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: 20px;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: 14px;padding: 6px 5px;line-height: 16px;}.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:1000px;}.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;}'
       printJS({
         printable: 'print_content',
         type: 'html',
         documentTitle: '  ',
-        style: style,
+        // style: style,
         scanStyles: false
       })
     },
@@ -301,7 +296,7 @@ export default {
 <style>
 .borderBox  p{
   font-weight: bold;
-  margin: 10px 0;
+  /* margin: 10px 0; */
 }
 .dialysis-print-order {
   width: 960px;
@@ -320,7 +315,7 @@ export default {
   font-weight: 600;
   text-align: center;
   font-size: 22px;
-  padding: 10px 20px 20px 20px;
+  /* padding: 10px 20px 20px 20px; */
 }
 
 .dialysis-print-order .table-box {

src/xt_pages/workforce/components/editTableData.vue

@@ -1691,7 +1691,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-// import print from "print-js";
+import print from "print-js";
 import draggable from "vuedraggable";
 const moment = require("moment");
 import {

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -1,182 +1,182 @@
-<template>
-  <div>
-    <el-dialog
-      :visible.sync="msgTipVisible"
-      width="40%"
-      :modal-append-to-body='false'
-      :close-on-click-modal="false"
-    >
-      <span>若执行排班导入,系统将会清除当前已有临时排班数据,是否继续导入？</span>
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="msgTipVisible = false">取 消</el-button>
-    <el-button type="primary" @click="handleUpload()">确 定</el-button>
-  </span>
-    </el-dialog>
-     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick" >
-    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">导入排班
-    </el-button>
-  </div>
-</template>
-
-<script>
-  import XLSX from 'xlsx'
-
-  export default {
-    name: "scheduleUploadExcel",
-    props: {
-      beforeUpload: Function,
-      onSuccess: Function
-    },
-    data() {
-      return {
-        loading: false,
-        msgTipVisible:false,
-        excelData: {
-          header: null,
-          results: null
-        }
-      }
-    },
-    methods: {
-      generateDate({ header, results }) {
-        console.log("header",header)
-        console.log("results",results)
-        this.excelData.header = header
-        this.excelData.results = results
-
-        this.onSuccess && this.onSuccess(this.excelData)
-      },
-      handleDrop(e) {
-        e.stopPropagation()
-        e.preventDefault()
-        if (this.loading) return
-        const files = e.dataTransfer.files
-        if (files.length !== 1) {
-          this.$message.error('Only support uploading one file!')
-          return
-        }
-        const rawFile = files[0] // only use files[0]
-
-        if (!this.isExcel(rawFile)) {
-          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
-          return false
-        }
-        this.upload(rawFile)
-        e.stopPropagation()
-        e.preventDefault()
-      },
-      handleDragover(e) {
-        e.stopPropagation()
-        e.preventDefault()
-        e.dataTransfer.dropEffect = 'copy'
-      },
-      handleUpload() {
-        this.msgTipVisible = false
-
-        document.getElementById('excel-upload-input').click()
-      },
-      handleClick(e) {
-
-        const files = e.target.files
-        const rawFile = files[0] // only use files[0]
-        console.log("rawfiel",rawFile)
-        if (!rawFile)
-        return
-        this.upload(rawFile)
-
-      },
-      upload(rawFile) {
-
-        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
-        console.log("3333",this.beforeUpload)
-        if (!this.beforeUpload) {
-          this.readerData(rawFile)
-          return
-        }
-        const before = this.beforeUpload(rawFile)
-        console.log("before",before)
-        if (before) {
-          this.readerData(rawFile)
-        }
-      },
-      readerData(rawFile) {
-
-        this.loading = true
-        return new Promise((resolve, reject) => {
-          const reader = new FileReader()
-          reader.onload = e => {
-
-            const data = e.target.result
-            console.log("data22222",data)
-            const fixedData = this.fixdata(data)
-            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
-            const firstSheetName = workbook.SheetNames[0]
-            const worksheet = workbook.Sheets[firstSheetName]
-
-            const header = this.get_header_row(worksheet)
-
-            const results = XLSX.utils.sheet_to_json(worksheet)
-            this.generateDate({ header, results })
-            this.loading = false
-            resolve()
-          }
-          reader.readAsArrayBuffer(rawFile)
-        })
-      },
-      fixdata(data) {
-        let o = ''
-        let l = 0
-        const w = 10240
-        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
-        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
-        return o
-      },
-      get_header_row(sheet) {
-
-        if(sheet['!ref'] == undefined){
-          this.loading = false
-          return
-        }
-
-        const headers = []
-        const range = XLSX.utils.decode_range(sheet['!ref'])
-        let C
-        const R = range.s.r /* start in the first row */
-        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
-          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
-          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
-          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
-          headers.push(hdr)
-        }
-        return headers
-
-
-
-      },
-      isExcel(file) {
-
-        return /\.(xlsx|xls|csv)$/.test(file.name)
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  #excel-upload-input {
-    display: none;
-    z-index: -9999;
-  }
-
-  #drop {
-    border: 2px dashed #bbb;
-    width: 600px;
-    height: 160px;
-    line-height: 160px;
-    margin: 0 auto;
-    font-size: 24px;
-    border-radius: 5px;
-    text-align: center;
-    color: #bbb;
-    position: relative;
-  }
-</style>
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="msgTipVisible"
+      width="40%"
+      :modal-append-to-body='false'
+      :close-on-click-modal="false"
+    >
+      <span>若执行排班导入,系统将会清除当前已有临时排班数据,是否继续导入？</span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="msgTipVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleUpload()">确 定</el-button>
+  </span>
+    </el-dialog>
+     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick" >
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">导入排班
+    </el-button>
+  </div>
+</template>
+
+<script>
+  import XLSX from 'xlsx'
+
+  export default {
+    name: "scheduleUploadExcel",
+    props: {
+      beforeUpload: Function,
+      onSuccess: Function
+    },
+    data() {
+      return {
+        loading: false,
+        msgTipVisible:false,
+        excelData: {
+          header: null,
+          results: null
+        }
+      }
+    },
+    methods: {
+      generateDate({ header, results }) {
+        console.log("header",header)
+        console.log("results",results)
+        this.excelData.header = header
+        this.excelData.results = results
+
+        this.onSuccess && this.onSuccess(this.excelData)
+      },
+      handleDrop(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        if (this.loading) return
+        const files = e.dataTransfer.files
+        if (files.length !== 1) {
+          this.$message.error('Only support uploading one file!')
+          return
+        }
+        const rawFile = files[0] // only use files[0]
+
+        if (!this.isExcel(rawFile)) {
+          this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
+          return false
+        }
+        this.upload(rawFile)
+        e.stopPropagation()
+        e.preventDefault()
+      },
+      handleDragover(e) {
+        e.stopPropagation()
+        e.preventDefault()
+        e.dataTransfer.dropEffect = 'copy'
+      },
+      handleUpload() {
+        this.msgTipVisible = false
+
+        document.getElementById('excel-upload-input').click()
+      },
+      handleClick(e) {
+
+        const files = e.target.files
+        const rawFile = files[0] // only use files[0]
+        console.log("rawfiel",rawFile)
+        if (!rawFile)
+        return
+        this.upload(rawFile)
+
+      },
+      upload(rawFile) {
+
+        this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+        console.log("3333",this.beforeUpload)
+        if (!this.beforeUpload) {
+          this.readerData(rawFile)
+          return
+        }
+        const before = this.beforeUpload(rawFile)
+        console.log("before",before)
+        if (before) {
+          this.readerData(rawFile)
+        }
+      },
+      readerData(rawFile) {
+
+        this.loading = true
+        return new Promise((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = e => {
+
+            const data = e.target.result
+            console.log("data22222",data)
+            const fixedData = this.fixdata(data)
+            const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+            const firstSheetName = workbook.SheetNames[0]
+            const worksheet = workbook.Sheets[firstSheetName]
+
+            const header = this.get_header_row(worksheet)
+
+            const results = XLSX.utils.sheet_to_json(worksheet)
+            this.generateDate({ header, results })
+            this.loading = false
+            resolve()
+          }
+          reader.readAsArrayBuffer(rawFile)
+        })
+      },
+      fixdata(data) {
+        let o = ''
+        let l = 0
+        const w = 10240
+        for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+        o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+        return o
+      },
+      get_header_row(sheet) {
+
+        if(sheet['!ref'] == undefined){
+          this.loading = false
+          return
+        }
+
+        const headers = []
+        const range = XLSX.utils.decode_range(sheet['!ref'])
+        let C
+        const R = range.s.r /* start in the first row */
+        for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+          var cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })] /* find the cell in the first row */
+          var hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+          if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+          headers.push(hdr)
+        }
+        return headers
+
+
+
+      },
+      isExcel(file) {
+
+        return /\.(xlsx|xls|csv)$/.test(file.name)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  #excel-upload-input {
+    display: none;
+    z-index: -9999;
+  }
+
+  #drop {
+    border: 2px dashed #bbb;
+    width: 600px;
+    height: 160px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 24px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+  }
+</style>

src/xt_pages/workforce/components/tableData.vue

@@ -74,77 +74,79 @@
       </div>
     </div>
 
-    <el-dialog :visible.sync="searchTableVisible" width="80%">
-      <el-table
-        :data="schedulePatients"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :row-style="{ color: '#303133' }"
-        style="width: 100%"
-        border
-      >
-        <el-table-column label="姓名" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.patient }}
-          </template>
-        </el-table-column>
-        <el-table-column label="透析日期" width="200">
-          <template slot-scope="scope">
-            {{ getDialysisDate(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="分区">
-          <template slot-scope="scope">
-            {{ scope.row.zone.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="班次" width="80">
-          <template slot-scope="scope">
-            {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机号" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.number.number }}
-          </template>
-        </el-table-column>
-        <el-table-column label="透析模式" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.mode.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="300">
-          <template slot-scope="scope">
-            <span v-if="now_time <=scope.row.schedule_date">
+    <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
+      <div style="position: relative;">
+        <el-table
+          :data="schedulePatients"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+          :row-style="{ color: '#303133' }"
+          style="width: 100%"
+          border
+        >
+          <el-table-column label="姓名" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.patient }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析日期" width="200">
+            <template slot-scope="scope">
+              {{ getDialysisDate(scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="分区">
+            <template slot-scope="scope">
+              {{ scope.row.zone.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="班次" width="80">
+            <template slot-scope="scope">
+              {{ getSchedulesType(scope.row.schedule_type,scope.row) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="机号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.number.number }}
+            </template>
+          </el-table-column>
+          <el-table-column label="透析模式" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.mode.name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300">
+            <template slot-scope="scope">
+              <span v-if="now_time <=scope.row.schedule_date">
+                <el-button
+                size="mini"
+                type="primary"
+                @click="CancelSchedule(scope.row.id)"
+              >
+                取消排班
+              </el-button>
               <el-button
-              size="mini"
-              type="primary"
-              @click="CancelSchedule(scope.row.id)"
-            >
-              取消排班
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="changeMachineNumber(scope.$index, scope.row)"
-            >
-              调整机号
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="changeMode(scope.$index, scope.row)"
-            >
-              调整模式
-            </el-button>
-            </span>
-
-          </template>
-        </el-table-column>
-      </el-table>
+                size="mini"
+                type="primary"
+                @click="changeMachineNumber(scope.$index, scope.row)"
+              >
+                调整机号
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                @click="changeMode(scope.$index, scope.row)"
+              >
+                调整模式
+              </el-button>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </el-dialog>
+    
     <div class="center-tab">
       <el-table
         :row-style="{ color: '#303133' }"
@@ -3328,6 +3330,21 @@ textarea{
 .backPurple{
   color: #f32424 !important;
 }
+.eldialog{
+  .el-dialog__headerbtn {
+    // position: absolute;
+    // top: 20px;
+    // right: 20px;
+    // padding: 0;
+    // background: 0 0;
+    // border: none;
+    // outline: 0;
+    // cursor: pointer;
+    // font-size: 16px;
+    z-index: 3 !important;
+}
+}
+
 // .el-table td .cell{
 //   padding: 0px 0px !important;
 // }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -907,7 +907,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -18,22 +18,26 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
-            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
-             
-
-              <div class="signPrint" style="font-size:16px;">
-                <div style="font-size:24px;font-weight: 400;">姓名:
-                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
-                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
-                  <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
-                  <span> {{getGender(main_collection.patient.gender)}}，</span> 
-                    {{getNewAge(main_collection.patient.id_card_no) }}岁）</span> 
-                  <span v-if="type ==2 && printObj.name == 1">（{{ main_collection.dialysis_no }}，
-                  <span>{{getGender(main_collection.gender) }}，</span>  
-                    {{getNewAge(main_collection.id_card_no) }}岁）</span> 
-                  
-                </div>
-                <div class="printCell">
+            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''"
+            style="display: inline-block; width: 42%; margin: 0px 35px 20px; 
+            box-sizing: border-box;
+            border: 1px solid black;
+            ">
+              <!-- <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
+                box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 20px rgba(0, 0, 0, 0.06) inset; -->
+                <div class="signPrint" style="font-size:16px;width: 100%;padding:5px; word-wrap:break-word;">
+                  <div style="font-size:24px;font-weight: 400;">姓名:
+                    <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
+                    <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                    <span v-if="type ==1 && printObj.name == 1">({{ main_collection.patient.dialysis_no }},
+                    <span> {{getGender(main_collection.patient.gender)}},</span> 
+                      {{getNewAge(main_collection.patient.id_card_no) }}岁)</span> 
+                    <span v-if="type ==2 && printObj.name == 1">({{ main_collection.dialysis_no }},
+                    <span>{{getGender(main_collection.gender) }},</span>  
+                      {{getNewAge(main_collection.id_card_no) }}岁)</span> 
+                    
+                  </div>
+               <div class="printCell">
                   透析模式:
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
@@ -186,9 +190,6 @@
                     分区/床号：
                     <span  style="width:auto;">{{main_collection.zone.name}}/</span>
                     {{ main_collection.number.number }}
-                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
                   </span>
                  
                 </div>
@@ -203,7 +204,8 @@
                  
                 </div>
               
-              </div>
+                </div> 
+              <!-- </div> -->
            </div>
           </div>
         </div>
@@ -381,12 +383,12 @@
         const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -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), 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;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
-        if (this.org_id == 9671 || this.org_id == 10340) {
+        if (this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0) {
           printJS({
             printable: 'print_content',
             type: 'html',
             documentTitle: '  ',
-            style: style2,
+            style: style,
             scanStyles: false
           })
         } else if (this.org_id == 10188 || this.org_id == 10217) {
@@ -811,13 +813,13 @@
     }
   }
 }
-.signPrint{
-  -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), 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;
-}
+// .signPrint{
+//   // -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), 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 5px;
+// }
 .printCell{
   span{
     display: inline-block;