Selaa lähdekoodia

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

28169 11 kuukautta sitten
vanhempi
commit
2bb24096c3

+ 20 - 17
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue Näytä tiedosto

@@ -508,17 +508,14 @@
508 508
                   class="under_line"
509 509
                   style="width: 100px; text-align: center"
510 510
                 >
511
-                  {{
512
-                    record.assessment_before_dislysis.systolic_blood_pressure
513
-                      ? record.assessment_before_dislysis.systolic_blood_pressure
514
-                      : "/"
515
-                  }}
516
-                    /
517
-                  {{
518
-                    record.assessment_before_dislysis.diastolic_blood_pressure
519
-                      ? record.assessment_before_dislysis.diastolic_blood_pressure
520
-                      : "/"
521
-                  }}
511
+                  <span v-if="record.assessment_before_dislysis.systolic_blood_pressure !='' &&  record.assessment_before_dislysis.diastolic_blood_pressure !=''">
512
+                      {{ record.assessment_before_dislysis.systolic_blood_pressure ? 
513
+                         record.assessment_before_dislysis.systolic_blood_pressure : ""}} 
514
+                        /
515
+                      {{ record.assessment_before_dislysis.diastolic_blood_pressure ? 
516
+                         record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
517
+                  </span>
518
+                  <span v-else>未测</span>
522 519
                 </div>
523 520
                 mmHg
524 521
               </div>
@@ -813,10 +810,13 @@
813 810
                 <tr v-for="(monitor_record, j) in record.monitor_records" :key="j" >
814 811
                   <td width="50" style="line-height: 30px;">{{ getTime(monitor_record.operate_time, "{h}:{i}") }}</td>
815 812
                   <td width="65">
816
-                    {{monitor_record.systolic_blood_pressure ? monitor_record.systolic_blood_pressure : "/"}} /
817
-                    {{monitor_record.diastolic_blood_pressure ? monitor_record.diastolic_blood_pressure : "/"}}
813
+                    <span v-if="monitor_record.systolic_blood_pressure !='' && monitor_record.diastolic_blood_pressure !=''">
814
+                      {{monitor_record.systolic_blood_pressure ? monitor_record.systolic_blood_pressure : "未测"}} /
815
+                      {{monitor_record.diastolic_blood_pressure ? monitor_record.diastolic_blood_pressure : "未测"}}
816
+                    </span>
817
+                    <span v-else>未测</span>
818 818
                   </td>
819
-                  <td width="50">{{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "/" }}</td>
819
+                  <td width="50">{{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "未测" }}</td>
820 820
                   <td width="50">{{monitor_record.arterial_pressure ? monitor_record.arterial_pressure: "/"}}</td>
821 821
                   <td width="50">{{monitor_record.venous_pressure ? monitor_record.venous_pressure : "/"}}</td>
822 822
                   <td width="50">{{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : "/"}}</td>
@@ -1084,7 +1084,7 @@
1084 1084
                 >
1085 1085
                   {{ record.assessment_after_dislysis.weight_after
1086 1086
                       ? parseFloat(record.assessment_after_dislysis.weight_after -
1087
-                        record.assessment_before_dislysis.additional_weight).toFixed(1): "/"
1087
+                        record.assessment_before_dislysis.additional_weight).toFixed(1): "未测"
1088 1088
                   }}
1089 1089
                 </div>kg
1090 1090
               </div>
@@ -1093,8 +1093,11 @@
1093 1093
                 <div class="under_line"
1094 1094
                   style="width: 90px; text-align: center"
1095 1095
                 >
1096
-                  {{ record.assessment_after_dislysis.systolic_blood_pressure ? record.assessment_after_dislysis.systolic_blood_pressure : "/"}} /
1097
-                  {{ record.assessment_after_dislysis.diastolic_blood_pressure ? record.assessment_after_dislysis.diastolic_blood_pressure : "/"}}
1096
+                  <span v-if="record.assessment_after_dislysis.systolic_blood_pressure !=''&& record.assessment_after_dislysis.diastolic_blood_pressure!=''">
1097
+                    {{ record.assessment_after_dislysis.systolic_blood_pressure ? record.assessment_after_dislysis.systolic_blood_pressure : ""}} /
1098
+                    {{ record.assessment_after_dislysis.diastolic_blood_pressure ? record.assessment_after_dislysis.diastolic_blood_pressure : ""}}
1099
+                  </span>
1100
+                  <span v-else>未测</span>
1098 1101
                 </div>mmHg
1099 1102
               </div>
1100 1103
               <div class="inline_block" style="flex: 1">

+ 17 - 17
src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue Näytä tiedosto

@@ -274,17 +274,11 @@
274 274
                 class="under_line"
275 275
                 style="width: 100px; text-align: center"
276 276
               >
277
-                {{
278
-                  predialysis.systolic_blood_pressure
279
-                    ? predialysis.systolic_blood_pressure
280
-                    : "/"
281
-                }}
282
-                  /
283
-                {{
284
-                  predialysis.diastolic_blood_pressure
285
-                    ? predialysis.diastolic_blood_pressure
286
-                    : "/"
287
-                }}
277
+                <span v-if="predialysis.systolic_blood_pressure !='' && predialysis.diastolic_blood_pressure !=''">
278
+                    {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}} /
279
+                    {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
280
+                </span>
281
+                <span v-else>未测</span>
288 282
               </div>
289 283
               mmHg
290 284
             </div>
@@ -549,10 +543,13 @@
549 543
               <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="padding: 5px 0;line-height: 35px;">
550 544
                 <td width="50">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
551 545
                 <td width="65">
552
-                  {{monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "/"}} /
553
-                  {{monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "/"}}
546
+                  <span v-if="monitor.systolic_blood_pressure !='' && monitor.diastolic_blood_pressure !=''">
547
+                    {{monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "/"}} /
548
+                    {{monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "/"}}
549
+                  </span>
550
+                  <span v-else>未测</span>
554 551
                 </td>
555
-                <td width="50">{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</td>
552
+                <td width="50">{{ monitor.pulse_frequency ? monitor.pulse_frequency : "未测" }}</td>
556 553
                 <td width="50">{{monitor.arterial_pressure ? monitor.arterial_pressure: "/"}}</td>
557 554
                 <td width="50">{{monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
558 555
                 <td width="50">{{monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/"}}</td>
@@ -707,7 +704,7 @@
707 704
                 style="width: 90px; text-align: center"
708 705
               >
709 706
                 {{ afterdialysis.weight_after ?
710
-                    parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight ).toFixed(1) : "/"
707
+                    parseFloat( afterdialysis.weight_after - afterdialysis.additional_weight ).toFixed(1) : "未测"
711 708
                 }}
712 709
               </div>kg
713 710
             </div>
@@ -716,8 +713,11 @@
716 713
               <div class="under_line"
717 714
                 style="width: 90px; text-align: center"
718 715
               >
719
-                {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "/"}} /
720
-                {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "/"}}
716
+                <span v-if="afterdialysis.systolic_blood_pressure !='' && afterdialysis.diastolic_blood_pressure !=''">
717
+                  {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : ""}} /
718
+                  {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : ""}}
719
+                </span>
720
+                <span v-else>未测</span>
721 721
               </div>mmHg
722 722
             </div>
723 723
             <div class="inline_block" style="flex: 1">

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue Näytä tiedosto

@@ -72,7 +72,7 @@
72 72
             org_id != 9504 &&
73 73
             org_id != 10028 &&
74 74
             org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
75
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0   && this.paramsObj.balance_accounts_type == 1">
75
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 1">
76 76
       </printOne>
77 77
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
78 78
             org_id != 10138 &&

+ 9 - 8
src/xt_pages/outpatientCharges/summary.vue Näytä tiedosto

@@ -145,11 +145,11 @@
145 145
           <!--          </el-button-->
146 146
           <!--          >-->
147 147
 
148
-          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
148
+          <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265">报表下载12</el-button>
149 149
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
150 150
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
151 151
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
152
-<!--                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
152
+                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
153 153
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
154 154
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
155 155
 
@@ -1655,7 +1655,11 @@ export default {
1655 1655
     },
1656 1656
 
1657 1657
     export_detail_three() {
1658
-      let params = {}
1658
+      let params = {
1659
+        start_time: this.start_time,
1660
+        end_time: this.end_time,
1661
+        org_id: this.$store.getters.xt_user.org_id,
1662
+      }
1659 1663
       getHisDataThree(params).then((response) => {
1660 1664
         if (response.data.state == 0) {
1661 1665
           this.$message.error(response.data.msg)
@@ -1671,7 +1675,7 @@ export default {
1671 1675
               let obj = {
1672 1676
                 name: order.patient.name,
1673 1677
                 id_card_no: order.patient.id_card_no,
1674
-                year: '2024',
1678
+                year:  order.setl_time.split(' ')[0].split('-')[0],
1675 1679
                 month: order.setl_time.split(' ')[0].split('-')[1],
1676 1680
                 ddd: this.getTimes(order.settle_accounts_date),
1677 1681
                 code: data[b].code,
@@ -1709,7 +1713,6 @@ export default {
1709 1713
                 '单位': list[i].unit,
1710 1714
                 '数量': list[i].count,
1711 1715
                 '金额': list[i].pric,
1712
-                'dan': list[i].pric_two
1713 1716
               }
1714 1717
               tarList.push(obj)
1715 1718
             }
@@ -1729,7 +1732,6 @@ export default {
1729 1732
               '单位',
1730 1733
               '数量',
1731 1734
               '金额',
1732
-              'dan'
1733 1735
 
1734 1736
             ]
1735 1737
             const filterVal = [
@@ -1745,7 +1747,6 @@ export default {
1745 1747
               '单位',
1746 1748
               '数量',
1747 1749
               '金额',
1748
-              'dan'
1749 1750
 
1750 1751
             ]
1751 1752
             const data = this.formatJson(filterVal, tarList)
@@ -2065,7 +2066,7 @@ export default {
2065 2066
           var tarList = []
2066 2067
           for (let i = 0; i < list.length; i++) {
2067 2068
             let obj = {
2068
-              '周期': '2024年第季度',
2069
+              '周期': '2024年第季度',
2069 2070
               '类别': '门诊',
2070 2071
               '医保目录编码': list[i].code,
2071 2072
               '医保目录名称': list[i].name,

+ 7 - 3
src/xt_pages/outpatientDoctorStation/treatPrint.vue Näytä tiedosto

@@ -16,9 +16,11 @@
16 16
         <!-- 此下条为本地开发下页面 -->
17 17
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
18 18
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
19
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610  && org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
19
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 10610 &&org_id != 10598 &&org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
20 20
         <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
21
-        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
21
+        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
22
+        <printFour v-if="org_id == 10598 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
23
+      
22 24
       </div>
23 25
   </div>
24 26
 </template>
@@ -36,6 +38,7 @@ import print from "print-js";
36 38
 import printOne from "./treatTemplate/printOne"
37 39
 import printTwo from "./treatTemplate/printTwo"
38 40
 import printThree from "./treatTemplate/printThree.vue"
41
+import printFour from './treatTemplate/printFour'
39 42
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
40 43
 export default {
41 44
   name: "dialysisPrintOrder",
@@ -43,7 +46,8 @@ export default {
43 46
     BreadCrumb,
44 47
     printOne,
45 48
     printTwo,
46
-    printThree
49
+    printThree,
50
+    printFour
47 51
   },
48 52
   props:{
49 53
     paramsObj:Object,

+ 602 - 0
src/xt_pages/outpatientDoctorStation/treatTemplate/printFour.vue Näytä tiedosto

@@ -0,0 +1,602 @@
1
+<template>
2
+    <div id='prescriptionPrint'>
3
+        <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
4
+            <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;" >
5
+                <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
6
+                    <span>费别</span>
7
+                    <span>自费</span>
8
+                    <span>公费</span>
9
+                    <span>保险</span>
10
+                    <span>其他</span>
11
+                </div>
12
+                <div v-if="org_id == 10460">就诊日期:{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
13
+                <div v-else>就诊日期:{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
14
+            </div>
15
+            <div class="printTitle">{{orgname}}</div>
16
+            <div class="printTitle">处方、治疗单</div>
17
+            <!-- class="infoTitle" -->
18
+            <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
19
+                <div style="width: 300px;">门诊编号:</div>
20
+                <div style="width: 300px;">电脑号:</div>
21
+            </div>
22
+
23
+            <div class="infoMain">
24
+                <div style="margin-bottom: 10px;width:25%">姓名:{{item.patient.name}}</div>
25
+                <div style="margin-bottom: 10px;width:25%">性别:
26
+                    <span v-if="item.patient.gender == 1">男</span>
27
+                    <span v-if="item.patient.gender == 2">女</span>
28
+                </div>
29
+                <div style="margin-bottom: 10px;width:25%">年龄:
30
+                    <span>{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
31
+                </div>
32
+                <div style="margin-bottom: 10px;width:25%">参保类型:{{hisPatient.social_type?hisPatient.social_type:''}}
33
+                </div>
34
+                <div style="margin-bottom: 10px;width:50%;">联系电话:{{item.patient.phone}}</div>
35
+                <div style="width:50%;">地址:{{ item.patient.home_address }}
36
+                  <!-- {{item.patient.unit_address}} -->
37
+                </div>
38
+                <div style="width:100%;">诊断:{{getDiagnosis(item.info.diagnosis)}}</div>
39
+            </div>
40
+
41
+            <div class="prescriptionBox" style="min-height: 720px;">
42
+                <table style="width:100%;text-align:center;line-height:25px;">
43
+                    <tr>
44
+                        <td>序号</td>
45
+                        <td>项目名称</td>
46
+                        <td>数量</td>
47
+                        <td>单位</td>
48
+                        <td>单价</td>
49
+                        <td>部位</td>
50
+                        <td>备注</td>
51
+                        <td>天数</td>
52
+                    </tr>
53
+                    <tr v-for="(it,index) in item.project" :key="index">
54
+                        <td>{{index+1}}</td>
55
+                        <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
56
+                        <td>{{it.count}}</td>
57
+                        <td>{{getUnit(it.unit)}}</td>
58
+                        <td>{{it.price.toFixed(2)}}</td>
59
+                        <td></td>
60
+                        <td>{{it.remark}}</td>
61
+                        <td>{{it.day}}</td>
62
+
63
+                    </tr>
64
+
65
+                    <tr v-for="(it,index) in item.advices" :key="index">
66
+                        <td>{{index+1}}</td>
67
+                        <td>{{it.advice_name?it.advice_name:''}}</td>
68
+                        <td>{{it.single_dose?it.single_dose:''}}</td>
69
+                        <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
70
+                        <td>{{it.price.toFixed(2)}}</td>
71
+                        <td></td>
72
+                        <td>{{it.remark}}</td>
73
+                        <td>{{it.day}}</td>
74
+
75
+                    </tr>
76
+                </table>
77
+            </div>
78
+
79
+            <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
80
+                <div style="width: 300px;" v-if="org_id!=10088 && org_id!=0 && org_id!=10598">开单医生:{{item.doctor?item.doctor:''}}</div>
81
+                <div style="width: 300px;" v-if="org_id==10088 ">
82
+                  开单医生:
83
+                  <span
84
+                    style="width: 100px; display: inline-block"
85
+                    v-if="item.creator == ''"
86
+                  >
87
+                    {{ item.doctor ? item.doctor : "" }}
88
+                  </span>
89
+                    <span
90
+                    style="width: 100px; display: inline-block"
91
+                    v-else-if="doc_name != ''"
92
+                  >
93
+                    {{ doc_name }}
94
+                  </span>
95
+                  <img
96
+                    style="height: 30px"
97
+                    :src="setAdminUserES(item.creator,item.doctor)"
98
+                    alt=""
99
+                    srcset=""
100
+                    v-else
101
+                  />
102
+                </div>
103
+                <div style="width: 300px;" v-if="org_id==10598 || org_id==0">
104
+                  开单医生:
105
+                  <!-- <span
106
+                    style="width: 100px; display: inline-block"
107
+                    v-if="item.creator == ''"
108
+                  >
109
+                    {{ item.doctor ? item.doctor : "" }}
110
+                  </span>
111
+                    <span
112
+                    style="width: 100px; display: inline-block"
113
+                    v-else-if="doc_name != ''"
114
+                  >
115
+                    {{ doc_name }}
116
+                  </span> -->
117
+                  <img
118
+                    style="height: 30px"
119
+                    :src="setAdminUserES(item.creator,item.doctor)"
120
+                    alt=""
121
+                    srcset=""
122
+                  />
123
+                </div>
124
+                <div style="width: 300px;">签章:</div>
125
+                <div style="width: 300px;">费用:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
126
+            </div>
127
+            <div v-if="org_id !=10478">
128
+              <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
129
+                  <tr>
130
+                      <td style="width:16%;">治疗时间</td>
131
+                      <td style="width:16%;"></td>
132
+                      <td style="width:16%;"></td>
133
+                      <td style="width:16%;"></td>
134
+                      <td style="width:16%;"></td>
135
+                      <td style="width:16%;"></td>
136
+                  </tr>
137
+                  <tr>
138
+                      <td style="width:16%;">医生签字</td>
139
+                      <td style="width:16%;"></td>
140
+                      <td style="width:16%;"></td>
141
+                      <td style="width:16%;"></td>
142
+                      <td style="width:16%;"></td>
143
+                      <td style="width:16%;"></td>
144
+                  </tr>
145
+                  <tr>
146
+                      <td style="width:16px;">患者签字</td>
147
+                      <td style="width:16px;"></td>
148
+                      <td style="width:16px;"></td>
149
+                      <td style="width:16px;"></td>
150
+                      <td style="width:16px;"></td>
151
+                      <td style="width:16px;"></td>
152
+                  </tr>
153
+              </table>
154
+            </div>
155
+        </div>
156
+
157
+
158
+        <!-- <div id='prescriptionPrint'>
159
+
160
+            <div v-for="(item,index) in advicePrint" :key="index">
161
+                <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
162
+                    <div style="display:flex;justify-content: space-between;font-weight:bold;">
163
+                        <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
164
+                            <span>费别</span>
165
+                            <span>自费</span>
166
+                            <span>公费</span>
167
+                            <span>保险</span>
168
+                            <span>其他</span>
169
+                        </div>
170
+                        <div>就诊日期:{{getTime(item.ctime)}}</div>
171
+                    </div>
172
+
173
+                    <div class="printTitle">血液透析中心</div>
174
+
175
+                    <div class="printTitle">处方、治疗单</div>
176
+
177
+                    <div class="infoTitle">
178
+                        <div>门诊编号:</div>
179
+                        <div>电脑号:</div>
180
+                    </div>
181
+
182
+                    <div class="infoMain">
183
+                        <div style="margin-bottom: 10px;width:25%">姓名:{{item.patient.name}}</div>
184
+                        <div style="margin-bottom: 10px;width:25%">性别:
185
+                            <span v-if="item.patient.gender == 1">男</span>
186
+                            <span v-if="item.patient.gender == 2">女</span>
187
+                        </div>
188
+                        <div style="margin-bottom: 10px;width:25%">年龄:
189
+                            <span>{{item.patient.age}}</span>
190
+                        </div>
191
+                        <div style="margin-bottom: 10px;width:25%">参保类型:</div>
192
+                        <div style="margin-bottom: 10px;width:50%;">联系电话:{{item.patient.phone}}</div>
193
+                        <div style="width:50%;">地址:{{item.patient.unit_address}}</div>
194
+                        <div style="width:100%;">诊断:{{item.patient.diagnose}}</div>
195
+                    </div>
196
+
197
+                    <div class="prescriptionBox">
198
+                        <table style="width:100%;text-align:center;line-height:25px;">
199
+                            <tr>
200
+                                <td>序号</td>
201
+                                <td>项目名称</td>
202
+                                <td>数量</td>
203
+                                <td>单位</td>
204
+                                <td>单价</td>
205
+                                <td>部位</td>
206
+                                <td>备注</td>
207
+                                <td>天数</td>
208
+                            </tr>
209
+                            <tr v-for="(it,index) in item.project" :key="index">
210
+                                <td>{{index+1}}</td>
211
+                                <td>{{getProjectName(it.project_id)}}</td>
212
+                                <td>{{it.single_dose}}</td>
213
+                                <td>{{getUnit(it.unit)}}</td>
214
+                                <td>{{it.price}}</td>
215
+                                <td></td>
216
+                                <td>{{it.remark}}</td>
217
+                                <td>{{it.day}}</td>
218
+
219
+                            </tr>
220
+                        </table>
221
+                    </div>
222
+                    <div class="infoTitle">
223
+                        <div>开单医生:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
224
+                        <div>签章:</div>
225
+                    </div>
226
+                    <div class="actionBar">
227
+                        <div>执行医生:{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
228
+                        <div>费用:</div>
229
+                    </div>
230
+                    <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
231
+                        <tr>
232
+                            <td style="width:16%;">治疗时间</td>
233
+                            <td style="width:16%;"></td>
234
+                            <td style="width:16%;"></td>
235
+                            <td style="width:16%;"></td>
236
+                            <td style="width:16%;"></td>
237
+                            <td style="width:16%;"></td>
238
+                        </tr>
239
+                        <tr>
240
+                            <td style="width:16%;">医生签字</td>
241
+                            <td style="width:16%;"></td>
242
+                            <td style="width:16%;"></td>
243
+                            <td style="width:16%;"></td>
244
+                            <td style="width:16%;"></td>
245
+                            <td style="width:16%;"></td>
246
+                        </tr>
247
+                        <tr>
248
+                            <td style="width:16px;">患者签字</td>
249
+                            <td style="width:16px;"></td>
250
+                            <td style="width:16px;"></td>
251
+                            <td style="width:16px;"></td>
252
+                            <td style="width:16px;"></td>
253
+                            <td style="width:16px;"></td>
254
+                        </tr>
255
+                    </table>
256
+                </div>
257
+
258
+            </div>
259
+
260
+        </div> -->
261
+    </div>
262
+</template>
263
+<script>
264
+  import { jsGetAge, uParseTime } from '@/utils/tools'
265
+  import { getAllDoctorList, getPrescriptionPrint } from '@/api/project/project'
266
+  import { getInitData } from '@/api/his/his'
267
+
268
+  export default {
269
+    props: {
270
+      patient_id: Number,
271
+      record_date: String,
272
+      prescription_id: Number,
273
+      ids: String
274
+    },
275
+    data() {
276
+      return {
277
+        doctorList: [],
278
+        advicePrint: {},
279
+        operatorMaps: {},
280
+        patient: {},
281
+        doc_name:"",
282
+        tableData: [],
283
+        prescriptionInfo: [],
284
+        projectList: [],
285
+        prescriptions: [],
286
+        settlement:
287
+          [
288
+            { value: 1, label: '医保' },
289
+            { value: 2, label: '自费' },
290
+            { value: 3, label: '公费' },
291
+            { value: 4, label: '农保' },
292
+            { value: 5, label: '会员' },
293
+            { value: 6, label: '职工' },
294
+            { value: 7, label: '合同' },
295
+            { value: 8, label: '医保自费' }
296
+
297
+          ],
298
+        hisPatient: {},
299
+        diagnoses: [],
300
+        org_id:''
301
+      }
302
+    },
303
+    methods: {
304
+      // 电子签名
305
+      setAdminUserES(id,name) {
306
+        if (id == 0) {
307
+          return "";
308
+        }
309
+        if (id in this.operatorMaps) {
310
+          return this.operatorMaps[id].url;
311
+        } else {
312
+          this.doc_name = name
313
+          return "";
314
+        }
315
+      },
316
+      getAge(patient){
317
+        var thisLen = patient.id_card_no.length
318
+        var birth = ''
319
+        if (thisLen == 15) {
320
+          birth = '19' + patient.id_card_no.substr(6, 6)
321
+        } else {
322
+          birth = patient.id_card_no.substr(6, 8)
323
+        }
324
+        var births =
325
+          birth.substr(0, 4) +
326
+          '-' +
327
+          birth.substr(4, 2) +
328
+          '-' +
329
+          birth.substr(6, 2)
330
+        return jsGetAge(births, '-')
331
+
332
+      },
333
+      printThisPage() {
334
+        var ptime = Math.round(new Date().getTime() / 1000)
335
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
336
+
337
+        const style =
338
+          '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;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 p{width: 200px;}}'
339
+        printJS({
340
+          printable: 'prescription-print',
341
+          type: 'html',
342
+          style: style,
343
+          scanStyles: false
344
+        })
345
+      },
346
+      getAllDoctorList() {
347
+        getAllDoctorList().then(response => {
348
+          if (response.data.state == 1) {
349
+            var doctor = response.data.data.doctor
350
+
351
+            this.doctorList = doctor
352
+          }
353
+        })
354
+      },
355
+
356
+      getDoctor(id) {
357
+        var name = ''
358
+        for (let i = 0; i < this.doctorList.length; i++) {
359
+          if (id == this.doctorList[i].admin_user_id) {
360
+            name = this.doctorList[i].user_name
361
+          }
362
+        }
363
+        return name
364
+      },
365
+      getTime(value, temp) {
366
+        if (value != undefined) {
367
+          return uParseTime(value, temp)
368
+        }
369
+        return ''
370
+      },
371
+      getPrescriptionPrint() {
372
+        var params = {
373
+          patient_id: this.patient_id,
374
+          record_date: this.record_date,
375
+          prescription_id: this.prescription_id,
376
+          ids: this.ids,
377
+          p_type:2,
378
+        }
379
+        console.log('999999', params)
380
+        getPrescriptionPrint(params).then(response => {
381
+          if (response.data.state == 1) {
382
+            var advicePrint = response.data.data.advicePrint
383
+            console.log('adviceprint', advicePrint)
384
+            this.advicePrint = advicePrint
385
+            this.prescriptions = advicePrint
386
+            var projectlist = response.data.data.projectlist
387
+            console.log('所有项目列表', projectlist)
388
+            this.projectList = projectlist
389
+            this.hisPatient = response.data.data.hisPatient
390
+            this.doctorList_1 = response.data.data.eles;
391
+            console.log(this.doctorList_1, "医生列表");
392
+            if (this.doctorList_1.length > 0) {
393
+              var operatorsLen = this.doctorList_1.length;
394
+              for (var index = 0; index < operatorsLen; index++) {
395
+                this.$set(
396
+                  this.operatorMaps,
397
+                  this.doctorList_1[index].creator,
398
+                  this.doctorList_1[index]
399
+                );
400
+              }
401
+            }
402
+            this.advicePrint.map((item) => {
403
+              console.log(item.project.length);
404
+              if (item.project.length > 0) {
405
+                for (var i = item.project.length - 1; i >= 0; i--) {
406
+                  if (item.project[i].type == 2) {
407
+                    if (item.project[i].project.cost_classify == 3) {
408
+                      console.log("!1111111")
409
+                      item.project.splice(i, 1);
410
+                    }
411
+                  }
412
+                }
413
+              }
414
+            });
415
+
416
+          }
417
+        })
418
+      },
419
+      getProjectName(id) {
420
+        var project_name = ''
421
+        for (let i = 0; i < this.projectList.length; i++) {
422
+          if (id == this.projectList[i].id) {
423
+            project_name = this.projectList[i].project_name
424
+          }
425
+        }
426
+        return project_name
427
+      },
428
+      getUnit(id) {
429
+        var unit = ''
430
+        for (let i = 0; i < this.projectList.length; i++) {
431
+          if (id == this.projectList[i].id) {
432
+            unit = this.projectList[i].unit
433
+          }
434
+        }
435
+        return unit
436
+      },
437
+
438
+      getTotalOne(id) {
439
+
440
+        var total = 0
441
+        var addtotal = 0
442
+        for (let i = 0; i < this.prescriptions.length; i++) {
443
+          if (id == this.prescriptions[i].id) {
444
+            if (this.prescriptions[i].project != null) {
445
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
446
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
447
+              }
448
+            }
449
+
450
+            if (this.prescriptions[i].additionalcharge != null) {
451
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
452
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
453
+              }
454
+            }
455
+            addtotal = Math.floor(addtotal * 100) / 100
456
+          }
457
+
458
+        }
459
+
460
+        for (let i = 0; i < this.prescriptions.length; i++) {
461
+          if (id == this.prescriptions[i].id) {
462
+            if (this.prescriptions[i].advices != null) {
463
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
464
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
465
+              }
466
+            }
467
+
468
+            if (this.prescriptions[i].additionalcharge != null) {
469
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
470
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
471
+              }
472
+            }
473
+            addtotal = Math.floor(addtotal * 100) / 100
474
+          }
475
+        }
476
+
477
+        return total + addtotal
478
+      },
479
+      getInitData() {
480
+        getInitData().then(response => {
481
+          if (response.data.state == 1) {
482
+            this.diagnoses = response.data.data.diagnose
483
+            console.log('争端', this.diagnoses)
484
+          }
485
+        })
486
+      },
487
+      getDiagnosis(id) {
488
+        let arr = id.split(",");
489
+        var name = "";
490
+        for (let i = 0; i < this.diagnoses.length; i++) {
491
+          if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
492
+            name += this.diagnoses[i].class_name + " ";
493
+          }
494
+        }
495
+        return name
496
+      }
497
+    },
498
+    created() {
499
+      this.getInitData()
500
+      this.getAllDoctorList()
501
+      this.getPrescriptionPrint()
502
+      var xtuser = this.$store.getters.xt_user
503
+      this.orgname = xtuser.org.org_name
504
+      this.org_id = this.$store.getters.xt_user.org_id
505
+    },
506
+    watch: {
507
+      patient_id: function(val) {
508
+        console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
509
+        //    this.getPrescriptionPrint()
510
+      },
511
+      ids: function(val) {
512
+        this.ids = val
513
+        console.log('this.idsids', this.ids)
514
+        this.getPrescriptionPrint()
515
+      }
516
+    }
517
+  }
518
+</script>
519
+
520
+
521
+<style lang="scss" scoped>
522
+    .prescription-print {
523
+        -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
524
+        -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
525
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
526
+        margin-bottom: 20px;
527
+        padding: 20px 10px;
528
+    }
529
+
530
+    .prescription-print {
531
+        font-size: 14px;
532
+    }
533
+
534
+    .printTitle {
535
+        font-size: 18px;
536
+        text-align: center;
537
+        font-weight: bold;
538
+        margin-top: 10px;
539
+    }
540
+
541
+    .infoTitle {
542
+        display: flex;
543
+        // border-bottom: 2px solid #000;
544
+        margin-top: 10px;
545
+        line-height: 24px;
546
+        padding: 0 10px;
547
+    }
548
+
549
+    .infoTitle div {
550
+        width: 300px;
551
+    }
552
+
553
+    .infoMain {
554
+        display: flex;
555
+        flex-wrap: wrap;
556
+        border-bottom: 2px solid #000;
557
+        padding: 0 10px;
558
+    }
559
+
560
+    .infoMain div {
561
+        width: 50%;
562
+        line-height: 24px;
563
+    }
564
+
565
+    .prescriptionBox {
566
+        padding: 0 10px;
567
+
568
+    }
569
+
570
+    .Rp {
571
+        font-size: 22px;
572
+        font-weight: bold;
573
+    }
574
+
575
+    .drugsBox {
576
+        padding-left: 40px;
577
+        margin-bottom: 10px;
578
+    }
579
+
580
+    .drugsBox p {
581
+        line-height: 30px;
582
+    }
583
+
584
+    .drugsOne {
585
+        line-height: 24px;
586
+    }
587
+
588
+    .drugsOne span {
589
+        margin-right: 20px;
590
+    }
591
+
592
+    .actionBar {
593
+        display: flex;
594
+        justify-content: space-between;
595
+        line-height: 24px;
596
+        padding: 0 10px;
597
+    }
598
+
599
+    .actionBar div {
600
+        width: 150px;
601
+    }
602
+</style>

+ 42 - 1
src/xt_pages/outpatientTool/components/gather.vue Näytä tiedosto

@@ -119,7 +119,12 @@ export default {
119 119
       item_time_type:'0',
120 120
       items: [
121 121
         { id: 1, name: '药品' },
122
-        { id: 2, name: '项目' },
122
+        { id: 2, name: '所有项目' },
123
+        { id: 4, name: '检验费' },
124
+        { id: 5, name: '治疗费' },
125
+        { id: 6, name: '护理费' },
126
+        { id: 7, name: '其他' },
127
+
123 128
         { id: 3, name: '耗材' },
124 129
 
125 130
       ]
@@ -326,6 +331,42 @@ export default {
326 331
                 obj3['patient_id'] = tempPatientsTwo[d].patient_id
327 332
                 this.tableData.push(obj3)
328 333
                 break
334
+              case 4:
335
+
336
+                obj['sum'] = price
337
+                obj['price'] = price
338
+                obj['item_name'] = '检验'
339
+                obj['name'] = tempPatientsTwo[d].name
340
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
341
+                this.tableData.push(obj)
342
+                break
343
+              case 5:
344
+
345
+                obj['sum'] = price
346
+                obj['price'] = price
347
+                obj['item_name'] = '治疗'
348
+                obj['name'] = tempPatientsTwo[d].name
349
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
350
+                this.tableData.push(obj)
351
+                break
352
+              case 6:
353
+
354
+                obj['sum'] = price
355
+                obj['price'] = price
356
+                obj['item_name'] = '护理'
357
+                obj['name'] = tempPatientsTwo[d].name
358
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
359
+                this.tableData.push(obj)
360
+                break
361
+              case 7:
362
+
363
+                obj['sum'] = price
364
+                obj['price'] = price
365
+                obj['item_name'] = '其他'
366
+                obj['name'] = tempPatientsTwo[d].name
367
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
368
+                this.tableData.push(obj)
369
+                break
329 370
 
330 371
             }
331 372
 

+ 3 - 2
src/xt_pages/outpatientTool/drugChange.vue Näytä tiedosto

@@ -252,8 +252,9 @@ export default {
252 252
       value:0,
253 253
       is_sale:"0",
254 254
       items: [
255
-        { id: 1, name: '已盘存' },
256
-        { id: 2, name: '未盘存' },
255
+        { id: 1, name: '已销售' },
256
+        { id: 2, name: '已销售退货' },
257
+
257 258
       ],
258 259
       changes: [
259 260
         { id: 1, name: '已变更' },

+ 17 - 7
src/xt_pages/outpatientTool/drugStock.vue Näytä tiedosto

@@ -66,8 +66,8 @@
66 66
         </el-select>
67 67
       </div>
68 68
       <div>
69
-        <el-button type="primary" @click="query()">查询</el-button>
70
-        <el-button type="primary" @click="stock()">盘存</el-button>
69
+        <el-button type="primary" @click="query()" >查询</el-button>
70
+        <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
71 71
         <el-button type="primary" @click="exportdata()">导出</el-button>
72 72
 
73 73
         <!--        <el-button type="primary" @click="change()">变更</el-button>-->
@@ -106,14 +106,14 @@
106 106
         </template>
107 107
       </el-table-column>
108 108
 
109
-      <el-table-column align="center" prop="total" label="开方日期">
109
+      <el-table-column align="center" prop="total" label="生产日期">
110 110
         <template slot-scope="scope">
111 111
           <div>{{scope.row.p_date}}</div>
112 112
         </template>
113 113
       </el-table-column>
114 114
 
115 115
 
116
-      <el-table-column align="center" prop="total" label="结算日期">
116
+      <el-table-column align="center" prop="total" label="有效日期">
117 117
         <template slot-scope="scope">
118 118
           <div>{{scope.row.e_date}}</div>
119 119
         </template>
@@ -141,7 +141,7 @@
141 141
       <el-table-column label="操作" width="200">
142 142
         <template slot-scope="scope">
143 143
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
144
-          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
144
+          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
145 145
         </template>
146 146
       </el-table-column>
147 147
     </el-table>
@@ -241,7 +241,9 @@ export default {
241 241
       stock_type:"0",
242 242
       change_type:"0",
243 243
       selection:[],
244
+      isloading:false,
244 245
       items: [
246
+
245 247
         { id: 1, name: '已盘存' },
246 248
         { id: 2, name: '未盘存' },
247 249
       ],
@@ -269,9 +271,11 @@ export default {
269 271
               confirmButtonText: '确 定',
270 272
               type: 'warning'
271 273
             }).then(() => {
274
+
272 275
             }).catch(() => {
273 276
             })
274 277
           }else{
278
+            that.GetDrugStock()
275 279
 
276 280
           }
277 281
         }
@@ -327,7 +331,6 @@ export default {
327 331
       return jsonData.map(v => filterVal.map(j => v[j]))
328 332
     },
329 333
     stock(){
330
-      console.log(this.selection)
331 334
       let ids  = ""
332 335
       for (var i = 0; i < this.selection.length; i++){
333 336
         if (ids.length == 0){
@@ -341,19 +344,26 @@ export default {
341 344
         ids:ids,
342 345
         admin_user_id:this.$store.getters.xt_user.user.id
343 346
       };
347
+      this.isloading = true
344 348
       axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
345 349
         if (response.data.state == 0) {
350
+          this.isloading = false
351
+
346 352
           that.$message.error(response.data.data.msg);
347 353
           return false
348 354
         } else {
355
+          this.isloading = false
349 356
           if(response.data.data.failed_code == -10){
350 357
             that.$confirm(response.data.data.msg, '医保错误信息', {
351 358
               confirmButtonText: '确 定',
352 359
               type: 'warning'
353 360
             }).then(() => {
361
+
354 362
             }).catch(() => {
355 363
             })
356 364
           }else{
365
+            that.GetDrugStock()
366
+
357 367
 
358 368
           }
359 369
         }
@@ -420,7 +430,7 @@ export default {
420 430
               p_date:this.getTime(response.data.data.info[i].product_date),
421 431
               e_date:this.getTime(response.data.data.info[i].expiry_date),
422 432
               is_pc:response.data.data.info[i].is_pc,
423
-              pc_date:response.data.data.info[i].pc_date,
433
+              pc_date:this.getTime(response.data.data.info[i].pc_date),
424 434
               is_bg:response.data.data.info[i].is_bg,
425 435
               unit: response.data.data.info[i].max_unit,
426 436
             }

+ 7 - 6
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue Näytä tiedosto

@@ -17,14 +17,14 @@
17 17
           <table class="print-table" border="1">
18 18
             <tbody>
19 19
             <tr>
20
-              <td width="80">药品名称</td>
20
+              <td width="60">药品<br>名称</td>
21 21
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
22
-              <td style="line-height:18px;" width="100">规格<br>型号</td>
23
-              <td style="line-height:18px;" width="80">生产<br>厂商</td>
24
-              <td style="line-height:18px;" width="80">经销商</td>
25
-              <td style="line-height:18px;" width="80">进货价</td>
22
+              <td style="line-height:18px;" width="80">规格<br>型号</td>
23
+              <td style="line-height:18px;" width="100">生产<br>厂商</td>
24
+              <td style="line-height:18px;" width="100">经销商</td>
25
+              <td style="line-height:18px;" width="70">进货价</td>
26 26
               <td style="line-height:18px;" width="80">入库<br>数量</td>
27
-              <td style="line-height:18px;" width="80">单位</td>
27
+              <td style="line-height:18px;" width="60">单位</td>
28 28
               <td style="line-height:18px;" width="60">总价</td>
29 29
               <td style="line-height:18px;" width="80">批号</td>
30 30
               <td style="line-height:18px;" width="120">生产日期</td>
@@ -83,6 +83,7 @@
83 83
             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
84 84
             <div style="width:50px;">会计:</div><div style="width:100px;"></div>
85 85
             <div style="width:70px;">制单人:</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
86
+            <div style="width: 200px;">验证签名:</div>
86 87
           </div>
87 88
         </div>
88 89
 

+ 7 - 6
src/xt_pages/stock/stockInOrderDetailPrint.vue Näytä tiedosto

@@ -31,12 +31,12 @@
31 31
                               <tr>
32 32
                                   <td style="line-height:18px;" width="80">耗材<br>名称</td>
33 33
                                   <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
34
-                                  <td style="line-height:18px;" width="80">规格<br>型号</td>
35
-                                  <td style="line-height:18px;" width="80">生产<br>厂商</td>
36
-                                  <td style="line-height:18px;" width="80">经销商</td>
37
-                                  <td style="line-height:18px;" width="80">单位</td>
38
-                                  <td style="line-height:18px;" width="80">进货价</td>
39
-                                  <td style="line-height:18px;" width="80">入库<br>数量</td> 
34
+                                  <td style="line-height:18px;" width="70">规格<br>型号</td>
35
+                                  <td style="line-height:18px;" width="100">生产<br>厂商</td>
36
+                                  <td style="line-height:18px;" width="100">经销商</td>
37
+                                  <td style="line-height:18px;" width="60">单位</td>
38
+                                  <td style="line-height:18px;" width="60">进货价</td>
39
+                                  <td style="line-height:18px;" width="70">入库<br>数量</td> 
40 40
                                   <td style="line-height:18px;" width="60">总价</td>
41 41
                                   <td style="line-height:18px;" width="80">批号</td>
42 42
                                   <td style="line-height:18px;" width="120">生产日期</td>
@@ -79,6 +79,7 @@
79 79
                           <div style="width:50px;">会计:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
80 80
                           <div style="width:50px;">审核:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
81 81
                           <div style="width:70px;">制单人:</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
82
+                          <div style="width: 200px;">验证签名:</div>
82 83
                      </div>
83 84
                   </div>
84 85
                 </div>