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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1037,11 +1037,11 @@
           >
           </DialysisPrintOrderFortySeven>
 
-           <DialysisPrintOrderFortyEight
+           <DialysisPrintOrderFiftyOne
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 48"
           >
-          </DialysisPrintOrderFortyEight>
+          </DialysisPrintOrderFiftyOne>
 
             <DialysisPrintOrderFortyNine
             v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -538,6 +538,7 @@
                       <tr>
                         <td width="60">时间</td>
                         <td width="60">血压<br />(mmHg)</td>
+                        <td width="60">体温<br />(°C)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
@@ -572,6 +573,7 @@
                           {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                           {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                         </td>
+                        <td>{{ monitor.monitor_temperature ? monitor.monitor_temperature : "" }}</td>
                         <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                         <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</td>
                         <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
@@ -636,6 +638,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
                         <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12" width="50"></td>
                         <td v-if="org_id == 9919"></td>
                         <td style="line-height:16px;padding:0px;">

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -88,7 +88,7 @@
           :disabled="true"
         ></el-input>
       </el-form-item>
-      <!-- <el-form-item label="药物过敏史: " prop="name">
+      <el-form-item label="药物过敏史: " prop="name">
         <el-input
           v-model="allergic_history"
           placeholder="药物过敏史"
@@ -152,7 +152,7 @@
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -275,7 +275,7 @@
                 width="600px"
                 title="打印"
                 :visible.sync="recordVisible">
-            <recordPrint :patientid="patientid" ref="recordPrint"></recordPrint>
+            <recordPrint :patientid="patientid" ref="recordPrint" :showBtn='true'></recordPrint>
         </el-dialog>
 
     </div>

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -2,7 +2,7 @@
   <div>
     <template>
       <el-button
-        style="position:fixed;right:25px;z-index:999"
+        style="position: fixed; right: 25px; z-index: 999"
         :loading="loading"
         size="small"
         icon="el-icon-printer"
@@ -11,36 +11,43 @@
         >打印</el-button
       >
     </template>
-    <div class="app-container" style="padding-top:40px;">
-        <div class='dialysisPage'>
-            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=4&& org_id !=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
-            <printThree v-if="org_id == 10265 || org_id == 0|| org_id == 4" :paramsObj="invoiceParams"></printThree>
-        </div>
+    <div class="app-container" style="padding-top: 40px">
+      <div class="dialysisPage">
+        <printOne
+          v-if="
+            org_id != 10215 && org_id != 10265 && org_id != 4 && org_id != 0
+          "
+          :paramsObj="invoiceParams"
+        ></printOne>
+        <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
+        <printThree
+          v-if="org_id == 10265 || org_id == 0 || org_id == 4"
+          :paramsObj="invoiceParams"
+        ></printThree>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import printOne from './invoiceTemplate/printOne'
-import printTwo from './invoiceTemplate/printTwo'
-import printThree from './invoiceTemplate/printThree'
+import printOne from "./invoiceTemplate/printOne";
+import printTwo from "./invoiceTemplate/printTwo";
+import printThree from "./invoiceTemplate/printThree";
 export default {
   name: "invoicePrint",
   components: {
     printOne,
     printTwo,
-    printThree
+    printThree,
   },
-  props:{
-    invoiceParams:Object
+  props: {
+    invoiceParams: Object,
   },
   data() {
     return {
       childResponse: {},
-    //   invoiceParams:{}
-      org_id:''
-
+      //   invoiceParams:{}
+      org_id: "",
     };
   },
   methods: {
@@ -67,15 +74,26 @@ export default {
       return "";
     },
     printThisPage() {
-
-      const style =
-        '@media print {#invoice-print{font-size:12px;}.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%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+      if (this.org_id == 10265 || this.org_id == 0 || this.org_id == 4) {
+        const style1 =
+          "@media print {#invoice-print{font-size:16px;}.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%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
         printJS({
-            printable: "invoice-print",
-            type: "html",
-            style: style,
-            scanStyles: false
+          printable: "invoice-print",
+          type: "html",
+          style: style1,
+          scanStyles: false,
         });
+      } else {
+        const style =
+          "@media print {#invoice-print{font-size:12px;}.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%;}.chargeBox{border: 1px solid #000;}.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}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
+        printJS({
+          printable: "invoice-print",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      }
+
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
       //     printable: "dialysis-print-box",
@@ -87,73 +105,73 @@ export default {
     },
   },
   created() {
-      console.log('this.invoiceParams',this.invoiceParams)
-      this.org_id = this.$store.getters.xt_user.org_id
-      console.log(this.org_id,'this.org_id')
+    console.log("this.invoiceParams", this.invoiceParams);
+    this.org_id = this.$store.getters.xt_user.org_id;
+    console.log(this.org_id, "this.org_id");
   },
-  watch:{
-    paramsObj:{//深度监听，可监听到对象、数组的变化
-      handler(val, oldVal){
-        this.invoiceParams = val
-
+  watch: {
+    paramsObj: {
+      //深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+        this.invoiceParams = val;
       },
-      deep:true
-    }
-  }
+      deep: true,
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
 }
-.infoMain .infoP{
-    width: 33%;
-    line-height: 24px;
+.infoMain .infoP {
+  width: 33%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    height:600px;
+.prescriptionBox {
+  padding: 0 10px;
+  height: 600px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
 }
-.drugsBox p{
-    line-height: 30px;
+.drugsBox p {
+  line-height: 30px;
 }
-.drugsOne{
-    line-height: 24px;
+.drugsOne {
+  line-height: 24px;
 }
-.drugsOne span{
-    margin-right: 20px;
+.drugsOne span {
+  margin-right: 20px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.actionBar p{
-    width:150px;
+.actionBar p {
+  width: 150px;
 }
 </style>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -1,41 +1,50 @@
 <template>
     <div id='invoice-print'>
 
+        <div style="display:flex;justify-content: space-between;">
+            
+            <div style="position: absolute;top:40px;left:40px"></div>
+            
+            <div  style="position: absolute;top:40px;left:300px"></div>
+
+            <div style="position: absolute;top:40px;left:560px"></div>
+        </div>
+
         <div style="display:flex;justify-content: space-between;">
             <!-- 机构名称 -->
-            <div>{{ list.org_name }}</div>
+            <div style="position: absolute;top:70px;left:40px">机构名称：{{ list.org_name }}</div>
             <!-- 单据号 -->
-            <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:200px">{{ list.number }}</div>
             <div></div>
             <div  style="position: absolute;left:560px;top:70px;">
             <!-- 发票序号 -->
             </div>
-             <div  style="position: absolute;left:660px;top:70px;">
+             <div  style="position: absolute;left:460px;top:70px;">
             <!-- 类别 -->
-            类别：
+            类别：医保
             </div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 姓名 -->
-            <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
             <!-- 个人电脑编号 -->
-            <div style="position: absolute;top:90px;left:240px;">{{psn_no}}</div>
+            <div style="position: absolute;top:90px;left:220px;">{{psn_no}}</div>
             <!-- 科室 -->
-            <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
+            <div style="position: absolute;top:90px;left:420px;">{{'血透'}}</div>
             <!-- 床号 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:560px;"></div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 住院号 -->
-            <div style="position: absolute;top:90px;left:120px;"> {{ number?number:'' }}</div>
+            <div style="position: absolute;top:120px;left:40px;"> {{ number?number:'' }}</div>
             <!-- 入院日期 -->
-            <div style="position: absolute;top:90px;left:240px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
+            <div style="position: absolute;top:120px;left:220px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 出院日期 -->
-            <div style="position: absolute;top:90px;left:240px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
+            <div style="position: absolute;top:120px;left:420px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 住院天数 -->
-          <div style="position: absolute;top:90px;left:240px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
+          <div style="position: absolute;top:120px;left:560px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
         </div>
 
         <!-- <div style="display:flex;justify-content: space-between;">
@@ -46,7 +55,7 @@
 
 
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:160px;left:40px">西药</div>
+            <div style="position: absolute;top:160px;left:40px">西药费</div>
             <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
             <div style="position: absolute;top:160px;left:180px">检查费</div>
             <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
@@ -88,6 +97,7 @@
 
         <div>
             <span>
+            <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span> 
             <span  style="position: absolute;top:280px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
@@ -141,24 +151,24 @@
         </div>
 
 
-        <div style="position: absolute;top:310px;left:320px">
+        <div style="position: absolute;top:310px;left:40px">
             <!-- 个人账户支付 -->
-          {{list.order.acct_pay?list.order.acct_pay:''}}
+          个人账户支付：{{list.order.acct_pay?list.order.acct_pay:''}}
         </div>
-        <div style="position: absolute;top:310px;left:380px">
+        <div style="position: absolute;top:310px;left:250px">
             <!-- 统筹支付 -->
-          {{list.order.hifp_pay?list.order.hifp_pay:''}}
+          统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:''}}
         </div>
-        <div style="position: absolute;top:310px;left:500px">
-          {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
+        <div style="position: absolute;top:310px;left:480px">
+          现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
           <!-- 现金支付 -->
         </div>
-        <div style="position: absolute;top:340px;left:320px">
-          {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
+        <div style="position: absolute;top:340px;left:40px">
+          公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
           <!-- 公务员补助 -->
         </div>
-        <div style="position: absolute;top:340px;left:380px">
-          {{list.order.maf_pay?list.order.maf_pay:''}}
+        <div style="position: absolute;top:340px;left:250px">
+          医疗救助:{{list.order.maf_pay?list.order.maf_pay:''}}
           <!-- 医疗救助 -->
         </div>
         <!-- 大病 -->
@@ -171,31 +181,39 @@
           {{list.order.oth_pay?list.order.oth_pay:''}}
 
         </div> -->
-        <div style="position: absolute;top:370px;left:320px">
+        <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-
+            预交款合计:
         </div>
-        <div style="position: absolute;top:370px;left:380px">
+        <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
+            补交款:
         </div>
-        <div style="position: absolute;top:370px;left:500px">
+        <div style="position: absolute;top:370px;left:480px">
             <!-- 应退款 -->
+            应退款:
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">
                 <!-- 开票日期 -->
-              {{printDate}}
+              开票日期:{{printDate}}
 
             </div>
             <div style="position: absolute;top:400px;left:280px">
                 <!-- 结算日期： -->
-              {{list.order.setl_time?list.order.setl_time.split(' ')[0]:''}}
+              结算日期：{{list.order.setl_time?list.order.setl_time.split(' ')[0]:''}}
             </div>
-            <div style="position: absolute;top:400px;left:580px">
-                <!-- 经手人： -->
+            <div style="position: absolute;top:400px;left:500px">
+               经手人：<!-- 经手人： -->
               {{list.admin_user_name}}
             </div>
         </div>
+
+        <div>
+            <div style="position: absolute;top:600px;left:40px">
+                <!-- 开票人: -->
+            </div>
+        </div>
     </div>
 </template>
 

src/xt_pages/hospitalStation/listPrint.vue

@@ -13,20 +13,23 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <!-- <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne> -->
+      <printTwo :list="list" :patient="patient" :order="order" :admin="admin"></printTwo>
     </div>
   </div>
 </template>
 
 <script>
   import printOne from './listTemplate/printOne'
+  import printTwo from './listTemplate/printTwo'
   import { getHisOrderDetail } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
     name: 'listPrint',
     components: {
-      printOne
+      printOne,
+      printTwo
     },
     props: {
       paramsObj: Object
@@ -173,9 +176,12 @@
           printable: 'list-print',
           type: 'html',
           style: style,
-          scanStyles: false
+          scanStyles: false,
+          // documentTitle:"EFFORT", 
+          // repeatTableHeader:true,  //重复表头
         })
 
+
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
         //     printable: "dialysis-print-box",

src/xt_pages/hospitalStation/listTemplate/printTwo.vue

@@ -0,0 +1,527 @@
+<template>
+  <div id="list-print" class="list-print">
+    <div v-for="(i, index) in pageArr.length" :key="index">
+      <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
+      <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
+      <div class="listInfo">
+        <div>病人ID:</div>
+        <div>住院号：{{ patient.dialysis_no }}</div>
+        <div>次数：</div>
+        <div>姓名：{{ patient.name }}</div>
+        <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
+      </div>
+
+      <div class="listInfo">
+        <div>入院科室：</div>
+        <div>出院科室：</div>
+        <div>入院日期：</div>
+        <div>出院日期：</div>
+        <div>住院天数：</div>
+      </div>
+
+      <div
+        class="listInfo"
+        style="padding-bottom: 10px; border-bottom: 1px solid"
+      >
+        <div>出院诊断：</div>
+        <div>床位号：</div>
+        <div>费别：</div>
+      </div>
+
+      <table
+        class="listTable"
+        border="1"
+        frame="hsides"
+        rules="none"
+        cellspacing="0"
+      >
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：床位费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：护理费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：化验费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+        <tr style="border: 1px solid;page-break-after:always">
+          <td style="width: 19%">账单名称：检查费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+        
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：麻醉费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+         
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：其他费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：取暖费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr style="page-break-after:always">
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：手术费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：西药费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：治疗费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+
+        <tr style="border: 1px solid">
+          <td style="width: 19%">账单名称：中成药费</td>
+          <td style="width: 31%">费用名称</td>
+          <td style="width: 14%">规格</td>
+          <td style="width: 10%">类别</td>
+          <td style="width: 10%">单价(元)</td>
+          <td style="width: 6%">数量</td>
+          <td style="width: 10%">金额(元)</td>
+        </tr>
+
+        <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
+          <td style="width: 19%"></td>
+          <td style="width: 31%"></td>
+          <td style="width: 14%">{{ item.spec }}</td>
+          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+          <td style="width: 10%">{{ item.price.toFixed(2) }}</td>
+          <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
+          <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
+        </tr>
+        <tr>
+          <td style="width: 19%">甲类：</td>
+          <td style="width: 31%">乙类药品：</td>
+          <td style="width: 14%">非药品：</td>
+          <td style="width: 10%">丙类：</td>
+          <td style="width: 10%">其他：</td>
+          <td></td>
+          <td style="width: 6%">小计：</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>
+            总费用：
+          </td>
+        </tr>
+
+        <tr>
+          <td>报销类别费用合计</td>
+          <td>甲类：</td>
+          <td>乙类药品：</td>
+          <td>丙类：</td>
+          <td>非药品：</td>
+          <td></td>
+          <td>其他：</td>
+          
+        </tr>
+
+
+      </table>
+      <div class="tableBottom">
+        <!-- <div class="tableBottomOne">制表人：{{ admin.user_name }}</div> -->
+        <div class="tableBottomOne">制表日期：{{ getNowTime() }}</div>
+        <!-- <div class="tableBottomOne">总费用：{{ order.medfee_sumamt }}元</div> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from "@/utils/tools";
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function () {
+        return [];
+      },
+    },
+    patient: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    order: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    admin: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: [],
+    };
+  },
+  // mounted(){
+  //     this.getPage()
+  // },
+  methods: {
+    getNowTime: function () {
+      let dateTime;
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let hh = new Date().getHours();
+      let mf =
+        new Date().getMinutes() < 10
+          ? "0" + new Date().getMinutes()
+          : new Date().getMinutes();
+      let ss =
+        new Date().getSeconds() < 10
+          ? "0" + new Date().getSeconds()
+          : new Date().getSeconds();
+      dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
+      return dateTime;
+    },
+    getTimes(time) {
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getPage() {
+      if (this.list.length <= 13) {
+        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;
+        for (var i = 0; i < this.page; i++) {
+          this.pageArr.push(13);
+        }
+        if (num != 0) {
+          this.pageArr.push(num);
+        }
+      }
+
+      console.log(this.pageArr,'this.pageArr')
+    },
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        this.getPage();
+      },
+      deep: true,
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.list-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;
+  padding: 20px 10px;
+}
+.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: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable tr td {
+  padding: 0 5px;
+}
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
+}
+.tableBottomOne {
+  margin-right: 40px;
+}
+</style>

src/xt_pages/hospitalStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
      <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 9675 && org_id != 9671 &&org_id != 0"
+        v-if="org_id != 10217&&org_id != 9675 && org_id != 9671 &&org_id != 0 &&org_id != 10164"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -22,7 +22,7 @@
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if="org_id == 10217 || org_id == 0 ||org_id==9675||org_id==9671"
+        v-if="org_id == 10217 || org_id == 0 ||org_id==9675||org_id==9671||org_id == 10164"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -113,9 +113,8 @@ export default {
       const style =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
        const style1 =
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
-      
-      
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+
       if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({
           printable: "prescription-print",

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -2,7 +2,7 @@
   <div id="prescription-print">
     <div class="prescription-print">
       <div class="printTitle">{{ orgname }}血透中心病历</div>
-       <!-- <div class="record_Title">
+      <!-- <div class="record_Title">
             <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
                 <span v-if="patient.gender == 1">男</span>
@@ -11,8 +11,10 @@
             <div>年龄：{{patient.age?patient.age:''}}岁</div>
             <div>透析病历号:{{patient.id?patient.id:''}}</div>
         </div> -->
-      <div class="infoTitle" style="margin-top:20px;">
-        <div class="name_slot">姓名：{{ patient.name ? patient.name : "" }}</div>
+      <div class="infoTitle" style="margin-top: 20px">
+        <div class="name_slot">
+          姓名：{{ patient.name ? patient.name : "" }}
+        </div>
         <div class="address_slot">
           家庭住址：{{ patient.home_address ? patient.home_address : "" }}
         </div>
@@ -23,47 +25,56 @@
           <span v-if="patient.gender == 1">男</span>
           <span v-if="patient.gender == 2">女</span>
         </div>
-        <div class="address_slot">工作单位：{{patient.work_unit}}</div>
-       
+        <div class="address_slot">工作单位：{{ patient.work_unit }}</div>
       </div>
       <div class="infoTitle">
-        <div class="name_slot">出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
-        <div class="address_slot">身份证号：{{patient.id_card_no}}</div>
+        <div class="name_slot">
+          出生日期：{{ patient.id_card_no.slice(6, 10) }}年{{
+            patient.id_card_no.slice(10, 12)
+          }}月{{ patient.id_card_no.slice(12, 14) }}日
+        </div>
+        <div class="address_slot">身份证号：{{ patient.id_card_no }}</div>
       </div>
       <div class="infoTitle">
-        <div class="name_slot">联系人：{{patient.contact_name}}</div>
-        <div class="address_slot">联系电话：{{ patient.phone ? patient.phone : "" }}</div>
+        <div class="name_slot">联系人：{{ patient.contact_name }}</div>
+        <div class="address_slot">
+          联系电话：{{ patient.phone ? patient.phone : "" }}
+        </div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>进入透析时间：{{getTime(patient.first_dialysis_date)}}</div>
+        <div>进入透析时间：{{ getTime(patient.first_dialysis_date) }}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="infoTitle">
-        <div style="width: 300px">原发病：{{history.primary_disease}}</div>
-        <div class="address_slot">确诊肾衰日期：{{getTime(history.confirm_failure_date)}}</div>
+        <div style="width: 300px">原发病：{{ history.primary_disease }}</div>
+        <div class="address_slot">
+          确诊肾衰日期：{{ getTime(history.confirm_failure_date) }}
+        </div>
       </div>
       <div class="otherInfo">
         <div>
-          药物过敏史：{{ history.allergic_history ? history.allergic_history : "" }}
+          药物过敏史：{{
+            history.allergic_history ? history.allergic_history : ""
+          }}
         </div>
       </div>
       <div class="otherInfo">
-        <div>初始透析日期：{{getTime(patient.first_dialysis_date)}}</div>
+        <div>初始透析日期：{{ getTime(patient.first_dialysis_date) }}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>血管通路：{{accessList.blood_access_part_opera_id}}</div>
+        <div>血管通路：{{ accessList.blood_access_part_opera_id }}</div>
         <div style="flex: 1"></div>
       </div>
 
-      <div class="otherInfo" style="min-height: 60px;">
+      <div class="otherInfo" style="min-height: 60px">
         <div class="otherName">主诉：</div>
         <div style="flex: 1">
           {{ history.chief_conplaint ? history.chief_conplaint : "" }}
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 180px;">
+      <div class="otherInfo" style="min-height: 180px">
         <div class="otherName">现病史：</div>
         <div style="flex: 1">
           {{
@@ -74,63 +85,83 @@
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 100px;">
+      <div class="otherInfo" style="min-height: 100px">
         <div class="otherName">既往史：</div>
         <div style="flex: 1">
           {{ history.past_history ? history.past_history : "" }}
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 80px;">
+      <div class="otherInfo" style="min-height: 80px">
         <div class="otherName">个人史：</div>
         <div style="flex: 1">
           {{ history.personal_history ? history.personal_history : "" }}
         </div>
       </div>
-
-      <div class="otherInfo" style="min-height: 150px;">
+ 
+      <div class="otherInfo" style="min-height: 150px">
         <div class="otherName">家族史：</div>
         <div style="flex: 1">
-          {{ history.family_history ? history.family_history : "" }}啊实打实大苏打实打实
+          {{ history.family_history ? history.family_history : "" }}
         </div>
       </div>
     </div>
-<div style="page-break-after: always; margin-top: 50px"></div>
+    <div style="page-break-after: always; margin-top: 50px"></div>
     <div class="prescription-print">
       <!-- <div class="printTitle">病历内容</div> -->
       <div class="recordTitle">
         <div>体格检查</div>
-        <div class="recordContent" style="height:250px;">
+        <div class="recordContent" style="height: fit-content;min-height: 250px;">
           <div>
-          <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
-          <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
-          <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-          <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+            <span
+              >体温：{{
+                history.temperature ? history.temperature + "℃" : "/"
+              }}</span
+            >
+            <span
+              >脉搏：{{ history.pulse ? history.pulse + "次/分" : "/" }}</span
+            >
+            <span
+              >呼吸：{{
+                history.breathing ? history.breathing + "次/分" : "/"
+              }}</span
+            >
+            <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
           </div>
-
+           <div style="text-align:left;">
+          {{history.physical_examination}}
         </div>
-        <div></div>
+        </div>
+
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
-        <div class="recordContent">{{history.special_inspection}}</div>
+        <div class="recordContent">{{ history.special_inspection }}</div>
       </div>
       <div class="recordTitle" style="border-bottom: 1px solid">
         <div>实验室及器械检查</div>
-        <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
+        <div class="recordContent" style="height: fit-content;min-height: 250px;">
+          {{ history.lab_apparatus }}
+        </div>
       </div>
-      <div style="display: flex; justify-content:flex-end">
+      <div style="display: flex; justify-content: flex-end">
         <div class="endInfo">
           <div style="height: 100px">
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
           </div>
           <div style="display: flex">
-            <div>医师：{{getDoctor(history.doctor) ? getDoctor(history.doctor) : ""}}</div>
             <div>
-              手签：
+              医师：{{
+                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
+              }}
             </div>
+            <div>手签：</div>
+          </div>
+          <div
+            style="text-align: center; letter-spacing: 3px; padding-top: 20px"
+          >
+            {{ getTime(history.record_date) }}
           </div>
-          <div style="text-align: center; letter-spacing: 3px;padding-top:20px">{{getTime(history.record_date)}}</div>
         </div>
       </div>
     </div>
@@ -141,7 +172,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
-import {getAccessList} from "@/api/patient"
+import { getAccessList } from "@/api/patient";
 export default {
   props: {
     patient: Object,
@@ -156,10 +187,12 @@ export default {
       orgname: "",
       history: {},
       printDate: "",
-      accessList:{},
-      blood_access_part_opera:[],
+      accessList: {},
+      blood_access_part_opera: [],
     };
   },
+
+
   methods: {
     getAge(patient) {
       var thisLen = patient.id_card_no.length;
@@ -198,7 +231,6 @@ export default {
 
           this.doctorList = doctor;
           var department = response.data.data.department;
-          console.log("department", department);
           this.departmentList = department;
         }
       });
@@ -220,14 +252,12 @@ export default {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
           this.patient = patient;
-          console.log(this.patient,'this.patient')
           var history = response.data.data.history;
           this.history = history;
           var hispatient = response.data.data.hispatient;
           this.hispatient = hispatient;
-          var accessList = response.data.data.accessList
-          console.log("accesslist2332323232",accessList)
-          this.accessList = accessList
+          var accessList = response.data.data.accessList;
+          this.accessList = accessList;
         }
       });
     },
@@ -241,38 +271,39 @@ export default {
       return name;
     },
     getTime(val) {
-      if(val < 0){
-        return ""
+      if (val < 0) {
+        return "";
       }
-      if(val == ""){
-      return ""
-      }else {
-      return uParseTime(val, '{y}-{m}-{d}')
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
       }
     },
-    getAccessList(){
-      getAccessList().then(response=>{
-        if(response.data.state == 1){
-          var blood_access_part_opera = response.data.data.blood_access_part_opera
-          this.blood_access_part_opera = blood_access_part_opera
+    getAccessList() {
+      getAccessList().then((response) => {
+        if (response.data.state == 1) {
+          var blood_access_part_opera =
+            response.data.data.blood_access_part_opera;
+          this.blood_access_part_opera = blood_access_part_opera;
         }
-     })
+      });
     },
-    getAccess(id){
-      var name = ""
-      for(let i=0;i<this.blood_access_part_opera.length;i++){
-         if(id == this.blood_access_part_opera[i].value){
-             name = this.blood_access_part_opera[i].name
-         }
+    getAccess(id) {
+      var name = "";
+      for (let i = 0; i < this.blood_access_part_opera.length; i++) {
+        if (id == this.blood_access_part_opera[i].value) {
+          name = this.blood_access_part_opera[i].name;
+        }
       }
-      return name
-    }
+      return name;
+    },
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
     // this.getAllDoctorList();
     // this.getPatientCaseHistory();
-    // this.getAccessList()
+    // this.getAccessList();
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();
@@ -280,12 +311,6 @@ export default {
       data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
-
-  },
-  watch: {
-    patientid: function (val) {
-      console.log("val22332323", val);
-    },
   },
 };
 </script>
@@ -316,8 +341,12 @@ export default {
   width: 200px;
 }
 
-.infoTitle .address_slot{width: 400px;} 
-.infoTitle .name_slot{width: 250px;}
+.infoTitle .address_slot {
+  width: 400px;
+}
+.infoTitle .name_slot {
+  width: 250px;
+}
 
 .otherInfo {
   display: flex;
@@ -350,19 +379,20 @@ export default {
 }
 .recordTitle .recordContent {
   width: 100%;
-  height: 150px;
+  height: fit-content;
+  min-height: 150px;
   text-align: left;
 }
 
-.record_Title{
-    display: flex;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
-    border-bottom: 2px solid #000;
+.record_Title {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+  border-bottom: 2px solid #000;
 }
 
-.record_Title div{
+.record_Title div {
   width: 200px;
 }
 </style>

src/xt_pages/hospitalStation/summary.vue

@@ -844,7 +844,7 @@
         return uParseTime(time, '{y}-{m}-{d}')
       },
       toDetail(row) {
-        this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
+        this.$router.push('/hospitalCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
       }, getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -111,13 +111,13 @@
             <li style="width:30%;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
             <li style="width:30%;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
             <li style="width:30%;">个人账户支付金额:{{ order.acct_pay}}</li>
-            <li style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
+            <li v-if="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li v-else="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
           </ul>
 
         </div>
       </div>
     </div>
-
     <div v-if="listVisible">
       <el-dialog
           class="centerDialog"
@@ -200,6 +200,7 @@ export default {
   },created(){
     this.GetOrderDetail()
   },methods:{
+      // console.log("hisPatientInfo",this.hisPatientInfo)
     open(val){
       if(val == 1){
         this.paramsObj.id == this.$route.query.id

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -88,7 +88,7 @@
           :disabled="true"
         ></el-input>
       </el-form-item>
-      <!-- <el-form-item label="药物过敏史: " prop="name">
+      <el-form-item label="药物过敏史: " prop="name">
         <el-input
           v-model="allergic_history"
           placeholder="药物过敏史"
@@ -152,7 +152,7 @@
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
-      </el-form-item> -->
+      </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id && org_id != 9675 && org_id != 9671 && org_id != 0"
+        v-if="org_id != 10217 && org_id != 9675 && org_id != 9671 && org_id != 0 &&org_id != 10164"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -23,7 +23,7 @@
       ></printOne>
       <printTwo
         v-if="
-          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671
+          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671 || org_id == 10164
         "
         ref="printTwo"
         v-bind:childResponse="childResponse"
@@ -112,7 +112,7 @@ export default {
       const style =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
       const style1 =
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
       if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675) {
         printJS({

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -98,7 +98,7 @@
           {{ history.personal_history ? history.personal_history : "" }}
         </div>
       </div>
-
+ 
       <div class="otherInfo" style="min-height: 150px">
         <div class="otherName">家族史：</div>
         <div style="flex: 1">
@@ -111,7 +111,7 @@
       <!-- <div class="printTitle">病历内容</div> -->
       <div class="recordTitle">
         <div>体格检查</div>
-        <div class="recordContent" style="height: 250px">
+        <div class="recordContent" style="height: fit-content;min-height: 250px;">
           <div>
             <span
               >体温：{{
@@ -140,7 +140,7 @@
       </div>
       <div class="recordTitle" style="border-bottom: 1px solid">
         <div>实验室及器械检查</div>
-        <div class="recordContent" style="height: 250px">
+        <div class="recordContent" style="height: fit-content;min-height: 250px;">
           {{ history.lab_apparatus }}
         </div>
       </div>
@@ -379,7 +379,8 @@ export default {
 }
 .recordTitle .recordContent {
   width: 100%;
-  height: 150px;
+  height: fit-content;
+  min-height: 150px;
   text-align: left;
 }
 

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -183,7 +183,7 @@ export default {
        if(response.data.state == 1){
           var list =  response.data.data.list
           this.tableData = []
-          console.log("list23232332232322323",list)
+          // console.log("list23232332232322323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].orders.length;j++){
               for(let z=0;z<list[i].orders[j].order_info.length;z++){
@@ -203,12 +203,11 @@ export default {
           obj.total_price = (obj.total_price).toFixed(2)
           this.tableData.push(obj)
           
-          console.log("tabledata",this.tableData)
+          // console.log("tabledata",this.tableData)
        }
      })
     },
     getAllPice(){
-      console.log("hhhhh",this.tableData)
       var total_price = 0
       for(let i=0;i<this.tableData.length;i++){
         if(this.tableData[i].index =="合计"){
@@ -219,7 +218,7 @@ export default {
     }
   },
   created() {
-   // this.getHisSummaryDetailList()
+    this.getHisSummaryDetailList()
   },
   watch:{
     "patient_id":function(){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -43,21 +43,28 @@
       <div>
       </div>
     </div>
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
+    <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               show-summary
               max-height="600"
               v-loading="detail_loading"
               highlight-current-row>
-      <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
+      <el-table-column type="index" label="序号" width="60px" align="center">
+           <template slot-scope="scope">{{scope.row.index}}</template>
+      </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
         <template slot-scope="scope"></template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用分类">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+           <span v-if="scope.row.advice_id > 0 ">{{getAdviceName(scope.row.advice_id)}}</span>
+           <span v-if="scope.row.project_id > 0 ">{{getProjectName(scope.row.project_id)}}</span>
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格型号">
         <template slot-scope="scope"></template>
@@ -109,6 +116,7 @@ export default {
       sameRowArr: [],
       keywords: '',
       tableData: [],
+      tableList:[],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
       items: [
@@ -117,7 +125,7 @@ export default {
         { id: 2, name: '项目' }
 
       ]
-
+     
     }
   },
   methods: {
@@ -143,15 +151,60 @@ export default {
       }
      getGatherDetailList(params).then(response=>{
        if(response.data.state == 1){
-         var detailList = response.data.data.detailList
-         console.log("detailist232323322332",detailList)
+         var projectlist = response.data.data.projectlist
+         for(let i=0;i<projectlist.length;i++){
+          this.tableList.push(projectlist[i])
+         }
+         console.log("detailist232323322332",projectlist)
+         var advicelist = response.data.data.advicelist
+         for(let i=0;i<advicelist.length;i++){
+           this.tableList.push(advicelist[i])
+         }
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableList[i].index = i +1
+         }
+         console.log("advicelist332233323232323232",this.tableList)
+      
          var list = response.data.data.list
          console.log("list233223232323",list)
+         for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].orders.length;j++){
+              for(let z=0;z<list[i].orders[j].order_info.length;z++){
+                  list[i].orders[j].order_info[z].record_date = list[i].orders[j].settle_accounts_date
+                  list[i].orders[j].order_info[z].number = list[i].orders[j].number
+                  this.tableData.push(list[i].orders[j].order_info[z])
+               }
+            }
+          }
+        for(let i=0;i<this.tableData.length;i++){
+          this.tableData[i].index = i+1
+          this.tableData[i].total_price = 0
+          this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+        }
+        console.log("322323232323322323",this.tableData)
        }
      })
 
 
     },
+    getAdviceName(id){
+      var drug_name = ""
+      for(let i= 0;i<this.tableData.length;i++){
+         if(id == this.tableData[i].advice_id){
+           drug_name = this.tableData[i].advice.advice_name
+         }
+      }
+      return drug_name
+    },
+    getProjectName(id){
+     var project_name = ""
+     for(let i=0;i<this.tableData.length;i++){
+       if(id == this.tableData[i].project_id){
+         project_name = this.tableData[i].project.project.project_name
+       }
+     }
+     return project_name
+    }
   },
   created() {
     this.getGatherDetailList()

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -420,6 +420,7 @@ export default {
         this.tableList = []
         if(response.data.state == 1){
           var order = response.data.data.order
+          console.log("order233322332323223",order)
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
           this.houseList.push(obj)
@@ -441,22 +442,18 @@ export default {
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * order[i].price * order[i].min_number
-                  //  total_price += order[i].total_price
                  }
                 
                }
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                   // total_price += order[i].count * this.getPrice(order[i].drug_id)
                    total_price +=order[i].total_price
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
                 
                 if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
-                   //total_price += order[i].count * this.getPrice(order[i].drug_id)
-                  //  order[i].total_price = order[i].total_price
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
                  

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -248,8 +248,8 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -961,7 +961,7 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-
+         console.log("lisrt233232323232233223",list)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -971,6 +971,8 @@ export default {
             for(let i=0;i<drugFlowList.length;i++){
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
                     drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
+                   
+
                 }
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
                     drugFlowList[i].count = drugFlowList[i].count
@@ -983,16 +985,20 @@ export default {
          }
          if(is_sys == 0 || is_sys == 12){
             var flowlist = response.data.data.flowlist
+            console.log("flowlist233232232323233223",flowlist)
             this.drugFlowList = []
             for(let i=0;i<flowlist.length;i++){
               if(flowlist[i].count_unit == flowlist[i].max_unit){
-                  flowlist[i].count = flowlist[i].count * flowlist[i].min_number
+                flowlist[i].count = flowlist[i].count * flowlist[i].min_number
+                flowlist[i].count_unit = flowlist[i].min_unit
               }
               if(flowlist[i].count_unit == flowlist[i].min_unit){
                   flowlist[i].count = flowlist[i].count
               }
             }
             this.drugFlowList = flowlist
+            console.log("this.drugFlowList32323232322323323232322323我的",flowlist)
+
          }
 
          for(let i=0;i<list.length;i++){
@@ -1256,8 +1262,8 @@ export default {
      formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
-      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number){
-        console.log("drugfalowlist22332233232",this.drugFlowList)
+      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number,is_sys){
+        
         var total = 0
         var all_price = 0
         for(let i=0;i<this.drugFlowList.length;i++){
@@ -1265,10 +1271,10 @@ export default {
               total += this.drugFlowList[i].count
           }
         }
-        if(max_unit == count_unit){
+        if(max_unit == count_unit && is_sys!=0 && is_sys!=12){
           total = total * min_number
         }
-        all_price = total * price
+        all_price = (total/min_number) * price
 
         return  all_price
       },

src/xt_pages/stock/drugs/inventory.vue

@@ -78,15 +78,15 @@
               </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
-                    <span><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
-                    <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                    <span><el-input style="width:100px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
+                    <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                   </template> 
               </el-table-column>
 
              <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
                 <template slot-scope="scope">
-                  <el-input style="width:50px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
-                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
+                  <el-input style="width:100px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
+                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
                  </template> 
               </el-table-column>