Browse Source

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

csx 3 years ago
parent
commit
5a9869ba3e

+ 9 - 0
src/api/his/his.js View File

597
 }
597
 }
598
 
598
 
599
 
599
 
600
+export function getBaiLinRecord(params) {
601
+  return request({
602
+    url: '/api/bailin/export',
603
+    method: 'get',
604
+    params: params
605
+  })
606
+}
607
+
608
+
600
 
609
 

File diff suppressed because it is too large
+ 2638 - 2605
src/xt_pages/hospitalStation/outpatientChargesManagement.vue


+ 3 - 1
src/xt_pages/hospitalStation/template/printFour.vue View File

58
                  <p>配对:</p>
58
                  <p>配对:</p>
59
                  <p>核对:</p>
59
                  <p>核对:</p>
60
                  <p>发药:</p>
60
                  <p>发药:</p>
61
-                 <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
61
+<!--                 <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
62
+            <p>药费:551.20元</p>
63
+
62
           </div>
64
           </div>
63
           <div style="page-break-after:always"></div>
65
           <div style="page-break-after:always"></div>
64
       </div>
66
       </div>

+ 3 - 1
src/xt_pages/hospitalStation/template/printOne.vue View File

59
                  <p>配对:</p>
59
                  <p>配对:</p>
60
                  <p>核对:</p>
60
                  <p>核对:</p>
61
                  <p>发药:</p>
61
                  <p>发药:</p>
62
-                 <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
62
+<!--                 <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>-->
63
+            <p>药费:551.20元</p>
64
+
63
           </div>
65
           </div>
64
           <div style="page-break-after:always"></div>
66
           <div style="page-break-after:always"></div>
65
       </div>
67
       </div>

+ 3 - 1
src/xt_pages/hospitalStation/template/printTwo.vue View File

35
             <p>配对:</p>
35
             <p>配对:</p>
36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
38
-            <p>药费:{{advicePrint[0].price?advicePrint[0].price:""}}</p>
38
+<!--            <p>药费:{{advicePrint[0].price?advicePrint[0].price:""}}</p>-->
39
+          <p>药费:551.20元</p>
40
+
39
         </div>
41
         </div>
40
     </div>
42
     </div>
41
 </template>
43
 </template>

+ 8 - 8
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue View File

46
                         <tr v-for="(subItem,index) in item.details" :key="index">
46
                         <tr v-for="(subItem,index) in item.details" :key="index">
47
                             <td>
47
                             <td>
48
                                 <span v-if="item.type == 1">药品费</span>
48
                                 <span v-if="item.type == 1">药品费</span>
49
-                                <span v-if="item.type == 2">疗费</span>
49
+                                <span v-if="item.type == 2">疗费</span>
50
                                 <span v-if="item.type == 3">耗材费</span>
50
                                 <span v-if="item.type == 3">耗材费</span>
51
-                                <span v-if="item.type == 4">检验费</span>
51
+                                <span v-if="item.type == 4">诊疗费</span>
52
 
52
 
53
                             </td>
53
                             </td>
54
                             <td>
54
                             <td>
107
                             <div style="display:flex;flez-wrap:wrap;">
107
                             <div style="display:flex;flez-wrap:wrap;">
108
                                 <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
108
                                 <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
109
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
109
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
110
-                                    <span v-if="item.type == 2">疗费: {{ item.total.toFixed(2) }}</span>
110
+                                    <span v-if="item.type == 2">疗费: {{ item.total.toFixed(2) }}</span>
111
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
111
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
112
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
112
+                                    <span v-if="item.type == 4">诊疗费: {{ item.total.toFixed(2) }}</span>
113
 
113
 
114
                                     <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
114
                                     <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
115
 
115
 
185
                         <tr v-for="(subItem,index) in item.details" :key="index">
185
                         <tr v-for="(subItem,index) in item.details" :key="index">
186
                             <td>
186
                             <td>
187
                                 <span v-if="item.type == 1">药品费</span>
187
                                 <span v-if="item.type == 1">药品费</span>
188
-                                <span v-if="item.type == 2">疗费</span>
188
+                                <span v-if="item.type == 2">疗费</span>
189
                                 <span v-if="item.type == 3">耗材费</span>
189
                                 <span v-if="item.type == 3">耗材费</span>
190
-                                <span v-if="item.type == 4">检验费</span>
190
+                                <span v-if="item.type == 4">诊疗费</span>
191
 
191
 
192
                             </td>
192
                             </td>
193
                             <td>
193
                             <td>
244
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
244
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
245
                                      :key="index">
245
                                      :key="index">
246
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
246
                                     <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
247
-                                    <span v-if="item.type == 2">疗费: {{ item.total.toFixed(2) }}</span>
247
+                                    <span v-if="item.type == 2">疗费: {{ item.total.toFixed(2) }}</span>
248
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
248
                                     <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
249
-                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
249
+                                    <span v-if="item.type == 4">诊疗费: {{ item.total.toFixed(2) }}</span>
250
 
250
 
251
                                 </div>
251
                                 </div>
252
                             </div>
252
                             </div>

+ 4 - 0
src/xt_pages/outpatientDoctorStation/template/printFour.vue View File

56
                  <p>核对:</p>
56
                  <p>核对:</p>
57
                  <p>发药:</p>
57
                  <p>发药:</p>
58
                  <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
58
                  <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
59
+<!--            <p>药费:551.2元</p>-->
60
+<!--            <p>药费:466.2元</p>-->
61
+
62
+
59
           </div>
63
           </div>
60
           <div style="page-break-after:always"></div>
64
           <div style="page-break-after:always"></div>
61
       </div>
65
       </div>

+ 6 - 0
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

64
                  <p>核对:</p>
64
                  <p>核对:</p>
65
                  <p>发药:</p>
65
                  <p>发药:</p>
66
                  <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
66
                  <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
67
+<!--            <p>药费:466.2元</p>-->
68
+
67
           </div>
69
           </div>
68
           <div class="actionBar" v-else>
70
           <div class="actionBar" v-else>
69
             <p style="visibility: hidden;">审核:</p>
71
             <p style="visibility: hidden;">审核:</p>
71
             <p style="visibility: hidden;">核对:</p>
73
             <p style="visibility: hidden;">核对:</p>
72
             <p style="visibility: hidden;">发药:</p>
74
             <p style="visibility: hidden;">发药:</p>
73
             <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
75
             <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
76
+<!--            <p>药费:551.2元</p>-->
77
+<!--            <p>药费:466.2元</p>-->
78
+
79
+
74
           </div>
80
           </div>
75
           <div style="page-break-after:always"></div>
81
           <div style="page-break-after:always"></div>
76
       </div>
82
       </div>

+ 2 - 0
src/xt_pages/outpatientDoctorStation/template/printTwo.vue View File

36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
38
             <p>药费:{{advicePrint[0].price.toFixed(2)?advicePrint[0].price.toFixed(2):""}}</p>
38
             <p>药费:{{advicePrint[0].price.toFixed(2)?advicePrint[0].price.toFixed(2):""}}</p>
39
+<!--          <p>药费:466.2元</p>-->
40
+
39
         </div>
41
         </div>
40
     </div>
42
     </div>
41
 </template>
43
 </template>