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

src/xt_pages/outpatientCharges/batchStatementPrint.vue

@@ -3,7 +3,7 @@
   <div>
     <template>
       <el-button
-        style="position: fixed; right: 25px; z-index: 999"
+        style="position: fixed; right:26px; z-index: 999"
         :loading="loading"
         size="small"
         icon="el-icon-printer"
@@ -14,8 +14,6 @@
       >
     </template>
 
-
-
     <div class="dialysisPage" style="padding-top: 40px">
 
 <!--      <batch-print-three-->
@@ -24,7 +22,7 @@
 <!--      ></batch-print-three>-->
       <batch-print
         :info="info"
-        v-if="org_id == 10138 || org_id == 0 || org_id == 10278"
+        v-if="org_id == 10138 || org_id == 0 || org_id == 10278 || org_id == 10342 || org_id == 10341 "
       >
 
       </batch-print>
@@ -105,11 +103,14 @@ export default {
       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 == 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 {#statement-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%;}}}";
+            "@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 =
@@ -132,96 +133,17 @@ export default {
             "@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%;}}}";
-          if (this.num >= 13) {
+
             printJS({
               printable: "prescription-print",
               type: "html",
               style: style,
               scanStyles: false,
             });
-          } else if (this.num == 12) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style2,
-              scanStyles: false,
-            });
-          } else if (this.num == 11) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style3,
-              scanStyles: false,
-            });
-          } else if (this.num == 10) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style4,
-              scanStyles: false,
-            });
-          } else if (this.num == 9) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style5,
-              scanStyles: false,
-            });
-          } else if (this.num == 8) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style6,
-              scanStyles: false,
-            });
-          } else if (this.num == 7) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style7,
-              scanStyles: false,
-            });
-          } else if (this.num == 6) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style8,
-              scanStyles: false,
-            });
-          } else if (this.num == 5) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style9,
-              scanStyles: false,
-            });
-          } else if (this.num == 4) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style10,
-              scanStyles: false,
-            });
-          } else if (this.num == 3) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style11,
-              scanStyles: false,
-            });
-          } else if (this.num <= 2) {
-            printJS({
-              printable: "prescription-print",
-              type: "html",
-              style: style12,
-              scanStyles: false,
-            });
-          }
+
+
         }, 500);
-      } else if (
-        this.$store.getters.xt_user.org_id == 9504 ||
-        this.$store.getters.xt_user.org_id == 10028
-      ) {
+      } 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({
@@ -232,10 +154,7 @@ export default {
         });
       } else {
         // 医保环境打印格式
-        if (
-          this.$store.getters.xt_user.org_id == 9919 ||
-          this.$store.getters.xt_user.org_id == 10106
-        ) {
+        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({
@@ -244,10 +163,7 @@ export default {
             style: style,
             scanStyles: false,
           });
-        } else if (
-          this.$store.getters.xt_user.org_id == 0 ||
-          this.$store.getters.xt_user.org_id == 10191
-        ) {
+        } 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({

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/statementTemplate/batchPrint.vue

@@ -1,154 +1,159 @@
 <template>
   <div>
-    <div  id='prescription-print' class="prescription-print"
-         style="position: relative;">
-      <img style="width:100%;height:80px" v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 0 " 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;">{{info[0].order.number ? info[0].order.number : ''}}</span>
-        </div>
-        <div>透析号：<span style="display:inline-block;width:200px;">{{info[0].patient.dialysis_no ? info[0].patient.dialysis_no : ''}}</span>
-        </div>
-        <div style="margin-left:2px;">电脑号：<span
-          style="display:inline-block;">{{info[0].his.psn_no ? info[0].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;">{{info[0].patient.name ? info[0].patient.name.indexOf('（') > -1 ? info[0].patient.name.substring(0,info[0].patient.name.indexOf('（')) : info[0].patient.name : ''}}</span>
-          </div>
-          <div>性别：<span
-            style="display:inline-block;width:30px;">{{info[0].patient.gender == '1' ? '男' : '女'}}</span>
-          </div>
-          <div>年龄：<span
-            style="display:inline-block;width:50px;">{{getAge(info[0].patient)}}岁</span>
-          </div>
-          <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
+    <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>收费日期：<span style="display:inline-block;width:100px;">{{info[0].order.setl_time ? info[0].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 info[0].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>
-
-                <!--<span v-if="item.type == 4"></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 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(' ') : ''}}</span>
+              </div>
+            </div>
+            <div style="float:right">金额单位：元</div>
           </div>
-          <tr>
-            <td colspan="7">
-              <div style="display:flex;flez-wrap:wrap;">
-                <div style="width:33%;" v-for="(item,index) in info[0].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>
-
-                  <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
-
-                </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>
-            </td>
-            <td>合计: {{info[0].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[0].order.medfee_sumamt}}元</div>
-                <div style="width:33%;">基金支付金额：{{info[0].order.hifp_pay}}元</div>
-                <div style="width:33%;">个人账户支付金额：{{info[0].order.acct_pay}}元</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.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%;">医疗费总额：{{infos.order.medfee_sumamt}}元</div>
+                    <div style="width:33%;">基金支付金额：{{infos.order.hifp_pay}}元</div>
+                    <div style="width:33%;">个人账户支付金额：{{infos.order.acct_pay}}元</div>
+
+                  </div>
+                  <div style="display:flex;flez-wrap:wrap;font-size:16px;">
+                    <div style="width:33%;">医疗救助基金金额：{{infos.order.maf_pay}}元</div>
+
+                    <div style="width:33%;">个人支付金额：{{ infos.order.psn_pay }}元</div>
+                    <div style="width:33%;">个人账户金额：{{infos.order.balc}}元</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 style="display:flex;flez-wrap:wrap;font-size:16px;">
-                <div style="width:33%;">医疗救助基金金额：{{info[0].order.maf_pay}}元</div>
+            </div>
+          </div>
 
-                <div style="width:33%;">个人支付金额：{{ info[0].order.psn_pay }}元</div>
-                <div style="width:33%;">个人账户金额：{{info[0].order.balc}}元</div>
-              </div>
-            </td>
-            <td style="font-size:16px;">合计：{{info[0].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[0].printor_admin.user_name}}</span></div>
-        <div>操作日期：<span style="width:100px;display:inline-block;">{{info[0].order.setl_time ? info[0].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="">
-      <img style="width:100%;" v-if="$store.getters.xt_user.org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+          <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>
@@ -181,7 +186,7 @@ export default {
   },
   props: {
     paramsObj: Object,
-    info: Object,
+    info: Array,
     balanceAccounts: Object
   },
   methods: {
@@ -423,14 +428,7 @@ export default {
   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
-    console.log('patient_id', patient_id)
-    var prescription_id = this.paramsObj.prescription_id
-    this.getChargePrint(record_date, patient_id, prescription_id)
-    var xtuser = this.$store.getters.xt_user
-    this.orgname = xtuser.org.org_name
+
 
   },
   watch: {
@@ -452,11 +450,12 @@ export default {
 
 
 <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: 20px;
+  margin-bottom: 10px;
   padding: 20px 10px;
 }
 

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/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"
@@ -70,7 +57,7 @@
             <el-option label="晚上" value="3"></el-option>
           </el-select>
 
-          <el-select v-model="zoneVal" placeholder="分区" style="margin-right:20px;" @change="handleZoneChange">
+          <el-select v-model="zoneVal" placeholder="请选择分区" style="margin-right:20px;" @change="handleZoneChange">
             <el-option
               v-for="item in zone_options"
               :key="item.id"
@@ -79,7 +66,7 @@
             </el-option>
           </el-select>
 
-          <el-date-picker
+          <!-- <el-date-picker
               size="small"
               v-model="start_time"
               prefix-icon="el-icon-date"
@@ -107,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"
@@ -121,7 +107,7 @@
                       <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 == 0" size="small" type="primary" @click="batch_print_settlte">批量打印结算单
+          <el-button  v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278" size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
           >报表下载
@@ -149,6 +135,37 @@
 
         </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
@@ -347,7 +364,7 @@
       ></new-statement-print>
     </el-dialog>
 
-
+    <!-- 批量打印 -->
     <el-dialog
       class="centerDialog"
       width="1200px"
@@ -483,8 +500,8 @@ export default {
       limit: 10,
       page: 1,
       keywords: "",
-      sch_type:"0",
-      zoneVal:0,
+      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: "",
@@ -2782,7 +2799,8 @@ export default {
         }
       }
       return res
-    },batch_print_settlte(){
+    },
+    batch_print_settlte(){
       if (this.selecting_schs.length === 0) {
         this.$message.error('请至少选择一条需要打印的内容')
         return false

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/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">
@@ -80,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>

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">