Pārlūkot izejas kodu

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

XMLWAN 2 gadus atpakaļ
vecāks
revīzija
54c1e1e211

+ 2 - 17
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue Parādīt failu

@@ -873,8 +873,6 @@
873 873
     methods: {
874 874
       //调试
875 875
       lili(index,row){
876
-        // console.log("==index==",index)
877
-        // console.log("==row==",row)
878 876
         console.log("==doctor_advices==",this.doctor_advices)
879 877
         console.log("==this.form==",this.form)
880 878
       },
@@ -990,8 +988,6 @@
990 988
       },
991 989
       submitEditAdvice() {
992 990
         // console.log()
993
-        console.log("保存22222222222222")
994
-        console.log("==this.src_type==",this.src_type)
995 991
         if (this.form.advice_name.length == 0) {
996 992
           this.$message.error('请填写医嘱名称')
997 993
           return
@@ -1350,6 +1346,7 @@
1350 1346
                     }
1351 1347
                   }
1352 1348
                   this.execTimeDialogVisible = false
1349
+                  
1353 1350
                   return false
1354 1351
               }
1355 1352
 
@@ -1394,7 +1391,7 @@
1394 1391
           var arr = this.form.advice_name.split("(自备药)")
1395 1392
           this.form.advice_name = arr[0]
1396 1393
        }
1397
-        console.log("保存重要23233232322332",this.form.parent_id)
1394
+
1398 1395
         CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
1399 1396
             this.loading = false
1400 1397
             if (response.data.state == 0) {
@@ -1412,11 +1409,8 @@
1412 1409
               this.currentRow = null
1413 1410
               this.setCurrent()
1414 1411
               this.hideForm()
1415
-              console.log("parnet_i233232233223",this.form.parent_id)
1416 1412
               if (this.form.parent_id > 0) {
1417
-                
1418 1413
                 var spliceIndex = -1
1419
-                console.log("splicinde2332323232323223",spliceIndex)
1420 1414
                 for (let index = this.doctor_advices.length - 1; ; index--) {
1421 1415
                   if (this.doctor_advices[index].parent_id === this.form.parent_id) {
1422 1416
                     spliceIndex = index
@@ -1426,7 +1420,6 @@
1426 1420
                     break
1427 1421
                   }
1428 1422
                 }
1429
-               console.log("splicinde2332323232323223",spliceIndex)
1430 1423
                 if (spliceIndex > -1) {
1431 1424
                   spliceIndex += 1
1432 1425
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1439,7 +1432,6 @@
1439 1432
                     }
1440 1433
                   }
1441 1434
                 }
1442
-               
1443 1435
               } else {
1444 1436
                 this.doctor_advices.unshift(response.data.data.advice)
1445 1437
               }
@@ -1848,7 +1840,6 @@
1848 1840
           })
1849 1841
           .catch(() => {
1850 1842
           })
1851
-        // this.handleSpanTempArr()
1852 1843
       }
1853 1844
       ,
1854 1845
       openDelete(index, row) {
@@ -2025,9 +2016,6 @@
2025 2016
             }
2026 2017
           }
2027 2018
         })
2028
-
2029
-        // this.handleSpanTempArr()
2030
-        // this.handleStyle()
2031 2019
       }
2032 2020
       ,
2033 2021
       getXuserName(id) {
@@ -2059,9 +2047,6 @@
2059 2047
       }
2060 2048
       ,
2061 2049
       show(his_is_open,is_advice_open) {
2062
-        console.log("this.doctor_advices",this.doctor_advices)
2063
-        console.log("++++his_is_open++++++",his_is_open)
2064
-        console.log("++++is_advice_open++++++",is_advice_open)
2065 2050
         this.his_is_open = his_is_open
2066 2051
         this.is_advice_open = is_advice_open
2067 2052
         this.isVisibility = true

+ 41 - 23
src/xt_pages/hospitalStation/components/chargeDialog.vue Parādīt failu

@@ -77,20 +77,13 @@
77 77
         ></el-input>
78 78
       </el-form-item>
79 79
 
80
-      <!-- <el-form-item label="支付方式:" style="width:100%;"> -->
81
-      <!-- <el-select v-model="form.pay_way" placeholder="请选择">
82
-          <el-option
83
-            v-for="(item,index) in payWays"
84
-            :key="index"
85
-            :label="item.label"
86
-            :value="item.value">
87
-          </el-option>
88
-        </el-select> -->
89
-      <!-- <el-input v-model="pay_way_index" placeholder="请输入内容" @change=""></el-input> -->
90
-      <!-- <el-radio-group v-model="form.pay_way">
91
-          <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
92
-        </el-radio-group>
93
-      </el-form-item> -->
80
+    <el-form-item label="支付方式:" style="width:100%;">
81
+         <el-radio-group v-model="form.pay_way">
82
+          <el-radio :label="item.value" :value="item.value" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
83
+           <el-button type="primary" v-if="form.pay_way == 5" @click="reading()">读卡</el-button>
84
+
85
+         </el-radio-group>
86
+      </el-form-item>
94 87
 
95 88
       <el-form-item label="个人现金支付方式:" style="width: 100%">
96 89
         <el-checkbox v-model="form.dec_way" @change="changedecimal">
@@ -100,16 +93,14 @@
100 93
           <el-form-item class="specialFormItem">
101 94
             <div style="display: flex">
102 95
               <!--            这里不要改成el-input,因为使用el-input会导致一个奇怪的bug,千万不要改!!!!!!!!!!!!!!!!!!!!-->
103
-              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
104
-
105
-              </el-input>元
96
+              <input  v-model="form.tmp_decimal" class="input_style" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">元
106 97
             </div>
107 98
           </el-form-item>
108 99
         </span>
109 100
       </el-form-item>
110 101
 
111 102
 
112
-      <el-form-item label="付款金额:" prop="id_card" :validate-event="is_Name">
103
+      <el-form-item label="付款金额:" prop="id_card">
113 104
         <el-input
114 105
           style="color: black"
115 106
           type="number"
@@ -119,7 +110,7 @@
119 110
       </el-form-item>
120 111
 
121 112
 
122
-      <el-form-item label="付款卡号:" prop="id_card" :validate-event="is_Name">
113
+      <el-form-item label="付款卡号:" prop="id_card">
123 114
         <el-input v-model="form.pay_card_no"></el-input>
124 115
       </el-form-item>
125 116
 
@@ -187,6 +178,7 @@
187 178
   import {
188 179
     idtobalance
189 180
   }from "@/api/deposit";
181
+  import axios from "axios";
190 182
   const moment = require('moment')
191 183
   export default {
192 184
     name: 'chargeDialog',
@@ -270,6 +262,29 @@
270 262
       created() {
271 263
       },
272 264
       methods: {
265
+        reading() {
266
+          var that = this
267
+          let params = {
268
+            'id_card_type': 1,
269
+            'admin_user_id': this.$store.getters.xt_user.user.id,
270
+            'certificates':1,
271
+          }
272
+          axios.get('http://127.0.0.1:9532/zh/api/readcard', {
273
+            params: params
274
+          })
275
+              .then(function(response) {
276
+                if (response.data.state == 0) {
277
+                  that.$message.error(response.data.msg)
278
+                  return false
279
+                } else {
280
+                  that.$message({ message: '读卡成功', type: 'success' })
281
+                }
282
+              })
283
+              .catch(function(error) {
284
+
285
+              })
286
+        },
287
+
273 288
         init() {
274 289
           console.log("====this.form.dec_way===", this.form.dec_way)
275 290
         },
@@ -347,7 +362,7 @@
347 362
             this.form.acct_pay = this.order.acct_pay
348 363
             this.form.psn_pay = this.order.psn_cash_pay
349 364
             this.form.total = this.order.medfee_sumamt
350
-            this.form.pay_price = this.order.medfee_sumamt
365
+            this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
351 366
             this.form.medical_insurance_price = this.order.fund_pay_sumamt
352 367
             this.form.private_price = this.order.psn_part_amt
353 368
           }
@@ -449,9 +464,12 @@
449 464
     width: 50%;
450 465
   }
451 466
 }
452
-
453
-.input_style{
467
+.input_style {
454 468
   border-radius: 5px;
455
-  border: 1px solid #dbdbdb;
469
+  border: 1px solid #dddddd;
470
+}
471
+.input_style:focus {
472
+outline:none;
473
+border: 1px solid #66b1ff;
456 474
 }
457 475
 </style>

+ 39 - 33
src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue Parādīt failu

@@ -7,7 +7,7 @@
7 7
                 <!-- 发票代码 -->
8 8
 
9 9
             </div>
10
-                
10
+
11 11
             <div  style="position: absolute;top:40px;left:300px"></div>
12 12
 
13 13
             <div style="position: absolute;top:40px;left:560px"></div>
@@ -23,10 +23,15 @@
23 23
             <!-- <div  style="position: absolute;left:560px;top:70px;">
24 24
 
25 25
             </div> -->
26
-             <div  style="position: absolute;left:650px;top:70px;">
27
-            <!-- 类别(改成城乡医保或者职工医保,具体对应住院的挂号选的那个医保) -->
26
+          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '390'">
27
+            类别:城乡居民基本医疗保险
28
+          </div>
29
+          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '310'">
30
+            类别:职工基本医疗保险
31
+          </div>
32
+          <div  style="position: absolute;left:650px;top:70px;" v-else>
28 33
             类别:
29
-            </div>
34
+          </div>
30 35
         </div>
31 36
 
32 37
         <div style="display:flex;justify-content: space-between;">
@@ -60,49 +65,49 @@
60 65
 
61 66
         <div style="display:flex;justify-content: space-between;">
62 67
             <div style="position: absolute;top:160px;left:40px">西药费</div>
63
-            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
68
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal?list.westernMedicineCostTotal:'0.00' }}</div>
64 69
             <div style="position: absolute;top:160px;left:220px">检查费</div>
65
-            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal }}</div>
70
+            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal?list.checkCostTotal:'0.00' }}</div>
66 71
             <div style="position: absolute;top:160px;left:400px">材料费</div>
67
-            <div style="position: absolute;top:160px;left:470px">0</div>
72
+            <div style="position: absolute;top:160px;left:470px">0.00</div>
68 73
             <div style="position: absolute;top:160px;left:580px">麻醉费</div>
69
-            <div style="position: absolute;top:160px;left:650px">0</div>
74
+            <div style="position: absolute;top:160px;left:650px">0.00</div>
70 75
         </div>
71 76
         <div style="display:flex;justify-content: space-between;">
72 77
             <div style="position: absolute;top:190px;left:40px">中成药费</div>
73
-            <div style="position: absolute;top:190px;left:110px">0</div>
78
+            <div style="position: absolute;top:190px;left:110px">0.00</div>
74 79
             <div style="position: absolute;top:190px;left:220px">治疗费</div>
75
-            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal}}</div>
80
+            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal?list.treatCostTotal:'0.00'}}</div>
76 81
             <div style="position: absolute;top:190px;left:400px">护理费</div>
77
-            <div style="position: absolute;top:190px;left:470px">0</div>
82
+            <div style="position: absolute;top:190px;left:470px">0.00</div>
78 83
             <div style="position: absolute;top:190px;left:580px">床位费</div>
79
-            <div style="position: absolute;top:190px;left:650px">0</div>
84
+            <div style="position: absolute;top:190px;left:650px">0.00</div>
80 85
         </div>
81 86
         <div style="display:flex;justify-content: space-between;">
82 87
             <div style="position: absolute;top:220px;left:40px">中草药费</div>
83
-            <div style="position: absolute;top:220px;left:110px">0</div>
88
+            <div style="position: absolute;top:220px;left:110px">0.00</div>
84 89
             <div style="position: absolute;top:220px;left:220px">手术费</div>
85
-            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal }}</div>
90
+            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal?list.operationCostTotal:'0.00' }}</div>
86 91
             <div style="position: absolute;top:220px;left:400px">输血费</div>
87
-            <div style="position: absolute;top:220px;left:470px">0</div>
92
+            <div style="position: absolute;top:220px;left:470px">0.00</div>
88 93
             <div style="position: absolute;top:220px;left:580px">取暖费</div>
89
-            <div style="position: absolute;top:220px;left:650px">0</div>
94
+            <div style="position: absolute;top:220px;left:650px">0.00</div>
90 95
         </div>
91 96
         <div style="display:flex;justify-content: space-between;">
92 97
             <div style="position: absolute;top:250px;left:40px">高压氧费</div>
93
-            <div style="position: absolute;top:250px;left:110px">0</div>
98
+            <div style="position: absolute;top:250px;left:110px">0.00</div>
94 99
             <div style="position: absolute;top:250px;left:220px">化验费</div>
95
-            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal }}</div>
100
+            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal?list.laboratoryCostTotal:'0.00' }}</div>
96 101
             <div style="position: absolute;top:250px;left:400px">氧气费</div>
97
-            <div style="position: absolute;top:250px;left:470px">0</div>
102
+            <div style="position: absolute;top:250px;left:470px">0.00</div>
98 103
             <div style="position: absolute;top:250px;left:580px">其他费</div>
99
-            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal }}</div>
104
+            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal?list.otherCostTotal:'0.00' }}</div>
100 105
         </div>
101 106
 
102 107
         <div>
103 108
             <span>
104 109
             <span style="position: absolute;top:280px;left:40px">合计金额(大写):</span>
105
-            <span  style="position: absolute;top:280px;left:180px">
110
+            <!-- <span  style="position: absolute;top:280px;left:180px">
106 111
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
107 112
                     {{ zhongwen.substring(0,1) }}十万
108 113
                 </span>
@@ -128,8 +133,7 @@
128 133
             </span>
129 134
             <span style="position: absolute;top:280px;left:350px">
130 135
                 <span v-if="zhongwen.indexOf('拾') > -1">
131
-<!--                    {{ // zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾-->
132
-                        {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
136
+                {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
133 137
 
134 138
                 </span>
135 139
                 <span v-else>零拾</span>
@@ -151,7 +155,8 @@
151 155
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}分
152 156
                 </span>
153 157
                 <span v-else>零分</span>
154
-            </span>
158
+            </span> -->
159
+            <span style="position: absolute;top:280px;left:190px;letter-spacing: 20px;">{{zhongwen}}</span>
155 160
             </span>
156 161
             <span style="position: absolute;top:280px;left:510px">合计:{{ list.order.medfee_sumamt }}</span>
157 162
         </div>
@@ -159,22 +164,22 @@
159 164
 
160 165
         <div style="position: absolute;top:310px;left:40px">
161 166
             <!-- 个人账户支付 -->
162
-          个人账户支付:{{list.order.acct_pay?list.order.acct_pay:'0'}}
167
+          个人账户支付:{{list.order.acct_pay?list.order.acct_pay:'0.00'}}
163 168
         </div>
164 169
         <div style="position: absolute;top:310px;left:250px">
165 170
             <!-- 统筹支付 -->
166
-          统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0'}}
171
+          统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
167 172
         </div>
168 173
         <div style="position: absolute;top:310px;left:480px">
169
-          现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0'}}
174
+          现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
170 175
           <!-- 现金支付 -->
171 176
         </div>
172 177
         <div style="position: absolute;top:340px;left:40px">
173
-          公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0'}}
178
+          公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
174 179
           <!-- 公务员补助 -->
175 180
         </div>
176 181
         <div style="position: absolute;top:340px;left:250px">
177
-          医疗救助:{{list.order.maf_pay?list.order.maf_pay:'0'}}
182
+          医疗救助:{{list.order.maf_pay?list.order.maf_pay:'0.00'}}
178 183
           <!-- 医疗救助 -->
179 184
         </div>
180 185
         <!-- 大病 -->
@@ -189,15 +194,15 @@
189 194
         </div> -->
190 195
         <div style="position: absolute;top:370px;left:40px">
191 196
             <!-- 预交款合计 -->
192
-            预交款合计:0
197
+            预交款合计:
193 198
         </div>
194 199
         <div style="position: absolute;top:370px;left:250px">
195 200
             <!-- 补交款 -->
196
-            补交款:0
201
+            补交款:
197 202
         </div>
198 203
         <div style="position: absolute;top:370px;left:480px">
199 204
             <!-- 应退款 -->
200
-            应退款:0
205
+            应退款:
201 206
         </div>
202 207
         <div>
203 208
             <div style="position: absolute;top:400px;left:40px">
@@ -241,6 +246,7 @@ export default {
241 246
           in_hosptial_time:'',
242 247
           out_hosptial_time:'',
243 248
           number:'',
249
+          insutype:'',
244 250
         }
245 251
     },
246 252
     mounted(){
@@ -295,7 +301,7 @@ export default {
295 301
                 this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
296 302
                 this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
297 303
               }
298
-
304
+              this.insutype = this.list.order.insutype
299 305
               this.id_card_no = this.list.his_hospital_record.id_card_no
300 306
               this.number = this.list.his_hospital_record.number
301 307
               this.psn_no = this.list.his_hospital_record.psn_no

+ 23 - 23
src/xt_pages/hospitalStation/shouJuTemplate/shouJuPrintOne.vue Parādīt failu

@@ -43,43 +43,43 @@
43 43
 
44 44
     <div style="display:flex;justify-content: space-between;">
45 45
       <div style="position: absolute;top:160px;left:40px">西药</div>
46
-      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
46
+      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal?list.westernMedicineCostTotal:"0.00" }}</div>
47 47
       <div style="position: absolute;top:160px;left:180px">检查费</div>
48
-      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
48
+      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal?list.checkCostTotal:"0.00" }}</div>
49 49
       <div style="position: absolute;top:160px;left:340px">护理费</div>
50
-      <div style="position: absolute;top:160px;left:420px"></div>
50
+      <div style="position: absolute;top:160px;left:420px">0.00</div>
51 51
       <div style="position: absolute;top:160px;left:500px">麻醉费</div>
52
-      <div style="position: absolute;top:160px;left:580px"></div>
52
+      <div style="position: absolute;top:160px;left:580px">0.00</div>
53 53
     </div>
54 54
     <div style="display:flex;justify-content: space-between;">
55 55
       <div style="position: absolute;top:190px;left:40px">中成药费</div>
56
-      <div style="position: absolute;top:190px;left:110px"></div>
56
+      <div style="position: absolute;top:190px;left:110px">0.00</div>
57 57
       <div style="position: absolute;top:190px;left:180px">治疗费</div>
58
-      <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
58
+      <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal?list.treatCostTotal:"0.00"}}</div>
59 59
       <div style="position: absolute;top:190px;left:340px">CT核磁</div>
60
-      <div style="position: absolute;top:190px;left:420px"></div>
60
+      <div style="position: absolute;top:190px;left:420px">0.00</div>
61 61
       <div style="position: absolute;top:190px;left:500px">床位费</div>
62
-      <div style="position: absolute;top:190px;left:580px"></div>
62
+      <div style="position: absolute;top:190px;left:580px">0.00</div>
63 63
     </div>
64 64
     <div style="display:flex;justify-content: space-between;">
65 65
       <div style="position: absolute;top:220px;left:40px">中草药费</div>
66
-      <div style="position: absolute;top:220px;left:110px"></div>
66
+      <div style="position: absolute;top:220px;left:110px">0.00</div>
67 67
       <div style="position: absolute;top:220px;left:180px">手术费</div>
68
-      <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
68
+      <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal?list.operationCostTotal:'0.00' }}</div>
69 69
       <div style="position: absolute;top:220px;left:340px">输血费</div>
70
-      <div style="position: absolute;top:220px;left:420px"></div>
70
+      <div style="position: absolute;top:220px;left:420px">0.00</div>
71 71
       <div style="position: absolute;top:220px;left:500px">取暖费</div>
72
-      <div style="position: absolute;top:220px;left:580px"></div>
72
+      <div style="position: absolute;top:220px;left:580px">0.00</div>
73 73
     </div>
74 74
     <div style="display:flex;justify-content: space-between;">
75 75
       <div style="position: absolute;top:250px;left:40px">高压氧费</div>
76
-      <div style="position: absolute;top:250px;left:110px"></div>
76
+      <div style="position: absolute;top:250px;left:110px">0.00</div>
77 77
       <div style="position: absolute;top:250px;left:180px">化验费</div>
78
-      <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
78
+      <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal?list.laboratoryCostTotal:"0.00" }}</div>
79 79
       <div style="position: absolute;top:250px;left:340px">氧气费</div>
80
-      <div style="position: absolute;top:250px;left:420px"></div>
80
+      <div style="position: absolute;top:250px;left:420px">0.00</div>
81 81
       <div style="position: absolute;top:250px;left:500px">其他</div>
82
-      <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
82
+      <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal?list.otherCostTotal:"0.00" }}</div>
83 83
     </div>
84 84
 
85 85
     <div>
@@ -139,33 +139,33 @@
139 139
 
140 140
     <div style="position: absolute;top:310px;left:320px">
141 141
       <!-- 个人账户支付 -->
142
-      {{list.order.acct_pay?list.order.acct_pay:''}}
142
+      {{list.order.acct_pay?list.order.acct_pay:'0.00'}}
143 143
     </div>
144 144
     <div style="position: absolute;top:310px;left:380px">
145 145
       <!-- 统筹支付 -->
146
-      {{list.order.hifp_pay?list.order.hifp_pay:''}}
146
+      {{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
147 147
     </div>
148 148
     <div style="position: absolute;top:310px;left:500px">
149
-      {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
149
+      {{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
150 150
       <!-- 现金支付 -->
151 151
     </div>
152 152
     <div style="position: absolute;top:340px;left:320px">
153
-      {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
153
+      {{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
154 154
       <!-- 公务员补助 -->
155 155
     </div>
156 156
     <div style="position: absolute;top:340px;left:380px">
157
-      {{list.order.maf_pay?list.order.maf_pay:''}}
157
+      {{list.order.maf_pay?list.order.maf_pay:'0.00'}}
158 158
       <!-- 医疗救助 -->
159 159
     </div>
160 160
     <div style="position: absolute;top:340px;left:500px">
161 161
       <!-- 大病 -->
162
-      {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
162
+      {{list.order.hifmi_pay?list.order.hifmi_pay:'0.00'}}
163 163
 
164 164
 
165 165
     </div>
166 166
     <div style="position: absolute;top:340px;left:560px">
167 167
       <!-- 其他基金支付 -->
168
-      {{list.order.oth_pay?list.order.oth_pay:''}}
168
+      {{list.order.oth_pay?list.order.oth_pay:'0.00'}}
169 169
 
170 170
     </div>
171 171
     <div style="position: absolute;top:370px;left:320px">

+ 3 - 2
src/xt_pages/outpatientCharges/components/chargeDialog.vue Parādīt failu

@@ -289,7 +289,7 @@
289 289
           this.form.acct_pay = this.order.acct_pay
290 290
           this.form.psn_pay = this.order.psn_cash_pay
291 291
           this.form.total = this.order.medfee_sumamt
292
-          this.form.pay_price = this.order.medfee_sumamt
292
+          this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
293 293
           this.form.medical_insurance_price = this.order.fund_pay_sumamt
294 294
           this.form.private_price =  this.order.psn_part_amt
295 295
         }
@@ -347,7 +347,8 @@
347 347
         }
348 348
         this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
349 349
       }
350
-    },mounted() {
350
+    },
351
+    mounted() {
351 352
       var nowDate = new Date()
352 353
       var nowYear = nowDate.getFullYear()
353 354
       var nowMonth = nowDate.getMonth() + 1

+ 6 - 6
src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue Parādīt failu

@@ -58,10 +58,10 @@
58 58
         </tr>
59 59
 
60 60
         <tr>
61
-          <td style="width: 20%;white-space: nowrap;">甲类:{{item.jiaTotal}}</td>
62
-          <td style="width: 20%;white-space: nowrap;">乙类药品:{{item.yiTotal}}</td>
61
+          <td style="width: 20%;white-space: nowrap;">甲类:{{item.jiaTotal?item.jiaTotal:"0.00"}}</td>
62
+          <td style="width: 20%;white-space: nowrap;">乙类药品:{{item.yiTotal?item.yiTotal:"0.00"}}</td>
63 63
           <td style="width: 5%;white-space: nowrap;">非药品:{{0.00}}</td>
64
-          <td style="width: 5%;white-space: nowrap;">丙类:{{item.bingTotal}}</td>
64
+          <td style="width: 5%;white-space: nowrap;">丙类:{{item.bingTotal?item.bingTotal:"0.00"}}</td>
65 65
           <td style="width: 5%;white-space: nowrap;">其他:{{0.00}}</td>
66 66
           <td></td>
67 67
           <td style="width: 20%;white-space: nowrap;">小计:{{item.total}}</td>
@@ -87,9 +87,9 @@
87 87
 
88 88
         <tr>
89 89
           <td>报销类别费用合计</td>
90
-          <td>甲类:{{getJaiTotal()}}</td>
91
-          <td>乙类药品:{{getYiTotal()}}</td>
92
-          <td>丙类:{{getBingTotal()}}</td>
90
+          <td>甲类:{{getJaiTotal()?getJaiTotal():"0.00"}}</td>
91
+          <td>乙类药品:{{getYiTotal()?getYiTotal():"0.00"}}</td>
92
+          <td>丙类:{{getBingTotal()?getBingTotal():"0.00"}}</td>
93 93
           <td>非药品:0.00</td>
94 94
           <td></td>
95 95
           <td>其他:0.00</td>

+ 2 - 2
src/xt_pages/outpatientTool/gatherPrint.vue Parādīt failu

@@ -142,7 +142,7 @@
142 142
     methods:{
143 143
       printtpage() {
144 144
       const style =
145
-        '@media print {.list-print{width:960px;margin:0 auto} .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: 25px;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;}';
145
+        '@media print {.list-print{width:960px;margin:0 auto} .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;} .listInfo div{width:400px;} .listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;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;}';
146 146
       printJS({
147 147
         printable: "list-print",
148 148
         type: "html",
@@ -1090,7 +1090,7 @@
1090 1090
     justify-content: space-between;
1091 1091
     margin: 10px 0;
1092 1092
     div{
1093
-      width: 200px;
1093
+      width: 400px;
1094 1094
     }
1095 1095
 }
1096 1096
 .listTable{