Home Explore Help
Register Sign In
elizebath
/
elizebeth
forked from csx/Vue_New
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

csx 2 years ago
parent
9c21574e46 6b55194654
commit
dc96af3b54
7 changed files with 1271 additions and 1156 deletions
Split View Show Diff Stats
  1. 2 2
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  2. 1157 1062
      src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue
  3. 1 1
      src/xt_pages/hospitalStation/invoicePrint.vue
  4. 64 63
      src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue
  5. 15 17
      src/xt_pages/hospitalStation/listTemplate/printTwo.vue
  6. 29 10
      src/xt_pages/outpatientCharges/summary.vue
  7. 3 1
      src/xt_pages/outpatientCharges/summaryDetail.vue

+ 2 - 2
src/xt_pages/dialysis/dialysisPrintOrder.vue View File 

@@ -1037,11 +1037,11 @@
1037 1037 
           >
1038 1038 
           </DialysisPrintOrderFortySeven>
1039 1039
1040 
-           <DialysisPrintOrderFiftyOne
1040 
+           <DialysisPrintOrderFortyEight
1041 1041 
             v-bind:childResponse="childResponse"
1042 1042 
             v-if="org_template_info.template_id == 48"
1043 1043 
           >
1044 
-          </DialysisPrintOrderFiftyOne>
1044 
+          </DialysisPrintOrderFortyEight>
1045 1045
1046 1046 
             <DialysisPrintOrderFortyNine
1047 1047 
             v-bind:childResponse="childResponse"

File diff suppressed because it is too large
+ 1157 - 1062
src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue


+ 1 - 1
src/xt_pages/hospitalStation/invoicePrint.vue View File 

@@ -76,7 +76,7 @@ export default {
76 76 
     printThisPage() {
77 77 
       if (this.org_id == 10265 || this.org_id == 0 || this.org_id == 4) {
78 78 
         const style1 =
79 
-          "@media print {#invoice-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
79 
+          "@page{size:landscape ; margin: 20mm;} @media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
80 80 
         printJS({
81 81 
           printable: "invoice-print",
82 82 
           type: "html",

+ 64 - 63
src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue View File 

@@ -12,14 +12,15 @@
12 12
13 13 
         <div style="display:flex;justify-content: space-between;">
14 14 
             <!-- 机构名称 -->
15 
-            <div style="position: absolute;top:70px;left:40px">机构名称：{{ list.org_name }}</div>
15 
+            <div style="position: absolute;top:70px;left:40px">机构名称：赤峰费森血液透析中心</div>
16 16 
             <!-- 单据号 -->
17 
-            <div  style="position: absolute;top:70px;left:200px">{{ list.number }}</div>
18 
-            <div></div>
19 
-            <div  style="position: absolute;left:560px;top:70px;">
17 
+            <!-- <div  style="position: absolute;top:70px;left:200px">单据号:{{ list.number }}</div> -->
18 
+            <!-- <div></div> -->
20 19 
             <!-- 发票序号 -->
21 
-            </div>
22 
-             <div  style="position: absolute;left:460px;top:70px;">
20 
+            <!-- <div  style="position: absolute;left:560px;top:70px;">
21 
+
22 
+            </div> -->
23 
+             <div  style="position: absolute;left:650px;top:70px;">
23 24 
             <!-- 类别 -->
24 25 
             类别：医保
25 26 
             </div>
 
@@ -27,24 +28,24 @@
27 28
28 29 
         <div style="display:flex;justify-content: space-between;">
29 30 
             <!-- 姓名 -->
30 
-            <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
31 
+            <div style="position: absolute;top:90px;left:40px;"> 姓名：{{ paramsObj.name }}</div>
31 32 
             <!-- 个人电脑编号 -->
32 
-            <div style="position: absolute;top:90px;left:220px;">{{psn_no}}</div>
33 
+            <div style="position: absolute;top:90px;left:220px;">个人电脑编号:{{psn_no}}</div>
33 34 
             <!-- 科室 -->
34 
-            <div style="position: absolute;top:90px;left:420px;">{{'血透'}}</div>
35 
+            <div style="position: absolute;top:90px;left:530px;">科室：{{'血液透析室'}}</div>
35 36 
             <!-- 床号 -->
36 
-            <div style="position: absolute;top:90px;left:560px;"></div>
37 
+            <div style="position: absolute;top:90px;left:700px;">床号：</div>
37 38 
         </div>
38 39
39 40 
         <div style="display:flex;justify-content: space-between;">
40 41 
             <!-- 住院号 -->
41 
-            <div style="position: absolute;top:120px;left:40px;"> {{ number?number:'' }}</div>
42 
+            <div style="position: absolute;top:120px;left:40px;"> 住院号：{{ number?number:'' }}</div>
42 43 
             <!-- 入院日期 -->
43 
-            <div style="position: absolute;top:120px;left:220px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
44 
+            <div style="position: absolute;top:120px;left:280px;">入院日期：{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
44 45 
             <!-- 出院日期 -->
45 
-            <div style="position: absolute;top:120px;left:420px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
46 
+            <div style="position: absolute;top:120px;left:460px;">出院日期：{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
46 47 
             <!-- 住院天数 -->
47 
-          <div style="position: absolute;top:120px;left:560px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
48 
+          <div style="position: absolute;top:120px;left:640px;">住院天数：{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
48 49 
         </div>
49 50
50 51 
         <!-- <div style="display:flex;justify-content: space-between;">
 
@@ -57,42 +58,42 @@
57 58 
         <div style="display:flex;justify-content: space-between;">
58 59 
             <div style="position: absolute;top:160px;left:40px">西药费</div>
59 60 
             <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
60 
-            <div style="position: absolute;top:160px;left:180px">检查费</div>
61 
-            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
62 
-            <div style="position: absolute;top:160px;left:340px">护理费</div>
63 
-            <div style="position: absolute;top:160px;left:420px"></div>
64 
-            <div style="position: absolute;top:160px;left:500px">麻醉费</div>
65 
-            <div style="position: absolute;top:160px;left:580px"></div>
61 
+            <div style="position: absolute;top:160px;left:220px">检查费</div>
62 
+            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal }}</div>
63 
+            <div style="position: absolute;top:160px;left:400px">材料费</div>
64 
+            <div style="position: absolute;top:160px;left:470px"></div>
65 
+            <div style="position: absolute;top:160px;left:580px">麻醉费</div>
66 
+            <div style="position: absolute;top:160px;left:650px"></div>
66 67 
         </div>
67 68 
         <div style="display:flex;justify-content: space-between;">
68 69 
             <div style="position: absolute;top:190px;left:40px">中成药费</div>
69 70 
             <div style="position: absolute;top:190px;left:110px"></div>
70 
-            <div style="position: absolute;top:190px;left:180px">治疗费</div>
71 
-            <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
72 
-            <div style="position: absolute;top:190px;left:340px">CT核磁</div>
73 
-            <div style="position: absolute;top:190px;left:420px"></div>
74 
-            <div style="position: absolute;top:190px;left:500px">床位费</div>
75 
-            <div style="position: absolute;top:190px;left:580px"></div>
71 
+            <div style="position: absolute;top:190px;left:220px">治疗费</div>
72 
+            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal}}</div>
73 
+            <div style="position: absolute;top:190px;left:400px">CT核磁</div>
74 
+            <div style="position: absolute;top:190px;left:470px"></div>
75 
+            <div style="position: absolute;top:190px;left:580px">床位费</div>
76 
+            <div style="position: absolute;top:190px;left:650px"></div>
76 77 
         </div>
77 78 
         <div style="display:flex;justify-content: space-between;">
78 79 
             <div style="position: absolute;top:220px;left:40px">中草药费</div>
79 80 
             <div style="position: absolute;top:220px;left:110px"></div>
80 
-            <div style="position: absolute;top:220px;left:180px">手术费</div>
81 
-            <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
82 
-            <div style="position: absolute;top:220px;left:340px">输血费</div>
83 
-            <div style="position: absolute;top:220px;left:420px"></div>
84 
-            <div style="position: absolute;top:220px;left:500px">取暖费</div>
85 
-            <div style="position: absolute;top:220px;left:580px"></div>
81 
+            <div style="position: absolute;top:220px;left:220px">手术费</div>
82 
+            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal }}</div>
83 
+            <div style="position: absolute;top:220px;left:400px">输血费</div>
84 
+            <div style="position: absolute;top:220px;left:470px"></div>
85 
+            <div style="position: absolute;top:220px;left:580px">取暖费</div>
86 
+            <div style="position: absolute;top:220px;left:650px"></div>
86 87 
         </div>
87 88 
         <div style="display:flex;justify-content: space-between;">
88 89 
             <div style="position: absolute;top:250px;left:40px">高压氧费</div>
89 90 
             <div style="position: absolute;top:250px;left:110px"></div>
90 
-            <div style="position: absolute;top:250px;left:180px">化验费</div>
91 
-            <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
92 
-            <div style="position: absolute;top:250px;left:340px">氧气费</div>
93 
-            <div style="position: absolute;top:250px;left:420px"></div>
94 
-            <div style="position: absolute;top:250px;left:500px">其他费</div>
95 
-            <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
91 
+            <div style="position: absolute;top:250px;left:220px">化验费</div>
92 
+            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal }}</div>
93 
+            <div style="position: absolute;top:250px;left:400px">氧气费</div>
94 
+            <div style="position: absolute;top:250px;left:470px"></div>
95 
+            <div style="position: absolute;top:250px;left:580px">其他费</div>
96 
+            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal }}</div>
96 97 
         </div>
97 98
98 99 
         <div>
 
@@ -100,54 +101,54 @@
100 101 
             <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span>
101 102 
             <span  style="position: absolute;top:280px;left:180px">
102 103 
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
103 
-                    {{ zhongwen.substring(0,1) }}
104 
+                    {{ zhongwen.substring(0,1) }}十万
104 105 
                 </span>
105 
-                <span v-else>零</span>
106 
+                <span v-else>零十万</span>
106 107 
             </span>
107 
-            <span  style="position: absolute;top:280px;left:220px">
108 
+            <span  style="position: absolute;top:280px;left:230px">
108 109 
                 <span v-if="zhongwen.indexOf('万') > -1">
109 
-                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
110 
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}万
110 111 
                 </span>
111 
-                <span v-else>零</span>
112 
+                <span v-else>零万</span>
112 113 
             </span>
113 
-            <span  style="position: absolute;top:280px;left:260px">
114 
+            <span  style="position: absolute;top:280px;left:270px">
114 115 
                 <span v-if="zhongwen.indexOf('仟') > -1">
115 
-                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
116 
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}仟
116 117 
                 </span>
117 
-                <span v-else>零</span>
118 
+                <span v-else>零仟</span>
118 119 
             </span>
119 
-            <span  style="position: absolute;top:280px;left:300px">
120 
+            <span  style="position: absolute;top:280px;left:310px">
120 121 
                 <span v-if="zhongwen.indexOf('佰') > -1">
121 
-                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
122 
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}佰
122 123 
                 </span>
123 
-                <span v-else>零</span>
124 
+                <span v-else>零佰</span>
124 125 
             </span>
125 
-            <span style="position: absolute;top:280px;left:340px">
126 
+            <span style="position: absolute;top:280px;left:350px">
126 127 
                 <span v-if="zhongwen.indexOf('拾') > -1">
127 
-                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
128 
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾
128 129 
                 </span>
129 
-                <span v-else>零</span>
130 
+                <span v-else>零拾</span>
130 131 
             </span>
131 
-            <span  style="position: absolute;top:280px;left:380px">
132 
-                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
133 
-                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
132 
+            <span  style="position: absolute;top:280px;left:390px">
133 
+                <span v-if="zhongwen.indexOf('元') > -1">
134 
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}元
134 135 
                 </span>
135 
-                <span v-else>零</span>
136 
+                <span v-else>零元</span>
136 137 
             </span>
137 
-            <span  style="position: absolute;top:280px;left:420px">
138 
+            <span  style="position: absolute;top:280px;left:430px">
138 139 
                 <span v-if="zhongwen.indexOf('角') > -1">
139 
-                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
140 
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}角
140 141 
                 </span>
141 
-                <span v-else>零</span>
142 
+                <span v-else>零角</span>
142 143 
             </span>
143 
-            <span  style="position: absolute;top:280px;left:460px">
144 
+            <span  style="position: absolute;top:280px;left:470px">
144 145 
                 <span v-if="zhongwen.indexOf('分') > -1">
145 
-                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
146 
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}分
146 147 
                 </span>
147 
-                <span v-else>零</span>
148 
+                <span v-else>零分</span>
148 149 
             </span>
149 150 
             </span>
150 
-            <span style="position: absolute;top:280px;left:540px">{{ list.order.medfee_sumamt }}</span>
151 
+            <span style="position: absolute;top:280px;left:510px">合计：{{ list.order.medfee_sumamt }}</span>
151 152 
         </div>
152 153
153 154

+ 15 - 17
src/xt_pages/hospitalStation/listTemplate/printTwo.vue View File 

@@ -1,7 +1,9 @@
1 1 
 <template>
2 2 
   <div id="list-print" class="list-print">
3 3 
     <div v-for="(i, index) in pageArr.length" :key="index">
4 
-      <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
4 
+      <div class="listTitle">
5 
+        {{ $store.getters.xt_user.org.org_name }}费用清单
6 
+      </div>
5 7 
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
6 8 
       <div class="listInfo">
7 9 
         <div>病人ID:</div>
 
@@ -63,7 +65,6 @@
63 65 
           <td style="width: 6%">小计：</td>
64 66 
         </tr>
65 67
66 
-
67 68 
         <tr style="border: 1px solid">
68 69 
           <td style="width: 19%">账单名称：护理费</td>
69 70 
           <td style="width: 31%">费用名称</td>
 
@@ -122,7 +123,7 @@
122 123 
           <td style="width: 6%">小计：</td>
123 124 
         </tr>
124 125
125 
-        <tr style="border: 1px solid;page-break-after:always">
126 
+        <tr style="border: 1px solid; page-break-after: always">
126 127 
           <td style="width: 19%">账单名称：检查费</td>
127 128 
           <td style="width: 31%">费用名称</td>
128 129 
           <td style="width: 14%">规格</td>
 
@@ -131,7 +132,6 @@
131 132 
           <td style="width: 6%">数量</td>
132 133 
           <td style="width: 10%">金额(元)</td>
133 134 
         </tr>
134 
-
135 135
136 136 
         <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
137 137 
           <td style="width: 19%"></td>
 
@@ -181,8 +181,6 @@
181 181 
           <td style="width: 6%">小计：</td>
182 182 
         </tr>
183 183
184 
-
185 
-
186 184 
         <tr style="border: 1px solid">
187 185 
           <td style="width: 19%">账单名称：其他费</td>
188 186 
           <td style="width: 31%">费用名称</td>
 
@@ -231,7 +229,7 @@
231 229 
           <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
232 230 
           <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
233 231 
         </tr>
234 
-        <tr style="page-break-after:always">
232 
+        <tr style="page-break-after: always">
235 233 
           <td style="width: 19%">甲类：</td>
236 234 
           <td style="width: 31%">乙类药品：</td>
237 235 
           <td style="width: 14%">非药品：</td>
 
@@ -241,7 +239,6 @@
241 239 
           <td style="width: 6%">小计：</td>
242 240 
         </tr>
243 241
244 
-
245 242 
         <tr style="border: 1px solid">
246 243 
           <td style="width: 19%">账单名称：手术费</td>
247 244 
           <td style="width: 31%">费用名称</td>
 
@@ -271,7 +268,6 @@
271 268 
           <td style="width: 6%">小计：</td>
272 269 
         </tr>
273 270
274 
-
275 271 
         <tr style="border: 1px solid">
276 272 
           <td style="width: 19%">账单名称：西药费</td>
277 273 
           <td style="width: 31%">费用名称</td>
 
@@ -301,7 +297,6 @@
301 297 
           <td style="width: 6%">小计：</td>
302 298 
         </tr>
303 299
304 
-
305 300 
         <tr style="border: 1px solid">
306 301 
           <td style="width: 19%">账单名称：治疗费</td>
307 302 
           <td style="width: 31%">费用名称</td>
 
@@ -359,6 +354,14 @@
359 354 
           <td></td>
360 355 
           <td style="width: 6%">小计：</td>
361 356 
         </tr>
357 
+      </table>
358 
+      <table
359 
+        class="listTable"
360 
+        border="1"
361 
+        frame="below"
362 
+        rules="none"
363 
+        cellspacing="0"
364 
+      >
362 365 
         <tr>
363 366 
           <td></td>
364 367 
           <td></td>
 
@@ -366,9 +369,7 @@
366 369 
           <td></td>
367 370 
           <td></td>
368 371 
           <td></td>
369 
-          <td>
370 
-            总费用：
371 
-          </td>
372 
+          <td>总费用：</td>
372 373 
         </tr>
373 374
374 375 
         <tr>
 
@@ -379,10 +380,7 @@
379 380 
           <td>非药品：</td>
380 381 
           <td></td>
381 382 
           <td>其他：</td>
382 
-
383 383 
         </tr>
384 
-
385 
-
386 384 
       </table>
387 385 
       <div class="tableBottom">
388 386 
         <!-- <div class="tableBottomOne">制表人：{{ admin.user_name }}</div> -->
 
@@ -468,7 +466,7 @@ export default {
468 466 
         }
469 467 
       }
470 468
471 
-      console.log(this.pageArr,'this.pageArr')
469 
+      console.log(this.pageArr, "this.pageArr");
472 470 
     },
473 471 
   },
474 472 
   watch: {

+ 29 - 10
src/xt_pages/outpatientCharges/summary.vue View File 

@@ -277,6 +277,27 @@
277 277 
         settlementObj: {}
278 278
279 279 
       }
280 
+    },
281 
+      //判断列表页是否刷新
282 
+    // beforeRouteLeave(to, from, next) {
283 
+    // console.log(to.path,from,'测试')
284 
+    // if(from.path==='/outpatientCharges/summary'&&to.path === '/outpatientCharges/summary'){
285 
+    //     from.meta.keepAlive = true
286 
+    //     console.log(from.meta,'from.meta跳转后')
287 
+    //     next()
288 
+
289 
+    //   }
290 
+    //     else {
291 
+    //     next()
292 
+    //   }
293 
+    // },
294 
+
295 
+    created() {
296 
+
297 
+      this.fetchAllAdminUsers()
298 
+      this.getDoctorList()
299 
+      this.getHisOrderList()
300 
+
280 301 
     },
281 302 
     methods: {
282 303 
       getMedType(med_type) {
 
@@ -766,13 +787,16 @@
766 787 
         return uParseTime(time, '{y}-{m}-{d}')
767 788 
       },
768 789 
       toDetail(row) {
790 
+
769 791 
         this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
770 
-      }, getTime(value, temp) {
792 
+      },
793 
+      getTime(value, temp) {
771 794 
         if (value != undefined) {
772 795 
           return uParseTime(value, temp)
773 796 
         }
774 797 
         return ''
775 
-      }, getHisOrderList() {
798 
+      },
799 
+      getHisOrderList() {
776 800 
         let params = {
777 801 
           page: this.page,
778 802 
           limit: this.limit,
 
@@ -793,7 +817,8 @@
793 817 
           }
794 818 
         })
795 819
796 
-      }, getDoctorList() {
820 
+      },
821 
+      getDoctorList() {
797 822 
         getDoctorList().then(response => {
798 823 
           if (response.data.state == 0) {
799 824 
             this.$message.error(response.data.msg)
 
@@ -827,12 +852,6 @@
827 852 
       }
828 853 
     }
829 854 
     ,
830 
-    created() {
831 
-
832 
-      this.fetchAllAdminUsers()
833 
-      this.getDoctorList()
834 
-      this.getHisOrderList()
835 
-
836 
-    }
855 
+
837 856 
   }
838 857 
 </script>

+ 3 - 1
src/xt_pages/outpatientCharges/summaryDetail.vue View File 

@@ -197,7 +197,9 @@ export default {
197 197 
       search_input: '',
198 198 
       order:{},
199 199 
     }
200 
-  },created(){
200 
+  },
201 
+
202 
+  created(){
201 203 
     this.GetOrderDetail()
202 204 
   },methods:{
203 205 
       // console.log("hisPatientInfo",this.hisPatientInfo)