Procházet zdrojové kódy

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

28169 před 1 rokem
rodič
revize
c2ac81d84c

+ 3 - 1
src/xt_pages/outpatientCharges/statementPrint.vue Zobrazit soubor

@@ -931,6 +931,8 @@ export default {
931 931
               that.info['order_infos'] = response.data.data.order_infos
932 932
               that.info['diagnosis'] = response.data.data.diagnosis
933 933
               that.info['his'] = response.data.data.his
934
+              that.info['dia_config'] = response.data.data.dia_config
935
+
934 936
 
935 937
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
936 938
                 if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
@@ -1357,7 +1359,7 @@ export default {
1357 1359
                   response.data.data.otherInscpTotal
1358 1360
                 that.info['otherSelfTotal'] =
1359 1361
                   response.data.data.otherSelfTotal
1360
-
1362
+                that.info['dia_config'] = response.data.data.dia_config
1361 1363
 
1362 1364
                 //org_id 10485,此代码为阳春恒健血液透析中心结算单模版数据处理逻辑
1363 1365
                 var list = []

+ 4 - 2
src/xt_pages/outpatientCharges/summary.vue Zobrazit soubor

@@ -549,9 +549,11 @@
549 549
                 </tr>
550 550
                 <tr>
551 551
                   <td>起始单号:</td>
552
-                  <td>{{tableData2.length > 0&&tableData2[0].number}}</td>
552
+                  <td v-if="tableData2.length > 0">{{tableData2[0].number}}</td>
553
+                  <td v-else></td>
553 554
                   <td>终止单号:</td>
554
-                  <td>{{tableData2.length > 0&&tableData2[tableData2.length-1].number}}</td>
555
+                  <td v-if="tableData2.length > 0">{{tableData2[tableData2.length-1].number}}</td>
556
+                  <td v-else></td>
555 557
                   <td>缴款人员:</td>
556 558
                   <td>{{staff}}</td>
557 559
                 </tr>