huangyw hace 2 años
padre
commit
7274976f2d

+ 3 - 3
src/xt_pages/DepositManagement/DepositRefund.vue Ver fichero

@@ -39,7 +39,7 @@
39 39
               />
40 40
             </div>
41 41
 
42
-            <div style="margin-right: 30px">
42
+            <div style="width: 287px;margin-right: 30px;white-space: nowrap;">
43 43
               退款类型:
44 44
               <el-select v-model="refundtype" placeholder="请选择" @change="updaterefundtype">
45 45
                 <el-option
@@ -52,7 +52,7 @@
52 52
               </el-select>
53 53
             </div>
54 54
 
55
-            <div style="margin-right: 30px">
55
+            <div style="width: 288px;margin-right: 30px;white-space: nowrap;">
56 56
               审核状态:
57 57
               <el-select v-model="examinetype" placeholder="请选择" @change="updateexaminetype">
58 58
                 <el-option
@@ -65,7 +65,7 @@
65 65
               </el-select>
66 66
             </div>
67 67
 
68
-            <div style="width: 465px">
68
+            <div style="width: 465px;white-space: nowrap;">
69 69
               <span>日期查询:</span>
70 70
               <el-date-picker
71 71
                 v-model="value1"

+ 1 - 0
src/xt_pages/DepositManagement/DepositSearch.vue Ver fichero

@@ -47,6 +47,7 @@
47 47
           color: '#606266',
48 48
         }"
49 49
         :data="tableData"
50
+        
50 51
         border
51 52
       >
52 53
         <el-table-column type="index" label="序号" align="center" width="200">

+ 37 - 2
src/xt_pages/DepositManagement/Template/DeductionDetails.vue Ver fichero

@@ -51,6 +51,9 @@
51 51
           color: '#606266',
52 52
         }"
53 53
         :data="tableData"
54
+        max-height="550"
55
+        show-summary
56
+        sum-text="押金支付金额合计"
54 57
         border
55 58
       >
56 59
         <el-table-column type="index" label="序号" align="center" width="100">
@@ -76,7 +79,7 @@
76 79
             <span>{{ scope.row.total	 ? scope.row.total	 : "" }}</span>
77 80
           </template>
78 81
         </el-table-column>
79
-        <el-table-column label="押金支付金额" align="center">
82
+        <el-table-column label="押金支付金额" align="center" prop="decimal">
80 83
           <template slot-scope="scope">
81 84
             <span>{{ scope.row.decimal	 ? scope.row.decimal	 : "" }}</span>
82 85
           </template>
@@ -99,7 +102,7 @@
99 102
         </el-table-column>
100 103
       </el-table>
101 104
 
102
-      <div>押金支付金额合计:<span>{{sum}}</span></div>
105
+      <!-- <div>押金支付金额合计:<span>{{sum}}</span></div> -->
103 106
     </div>
104 107
   </div>
105 108
 </template>
@@ -134,6 +137,38 @@ export default {
134 137
     this.search()
135 138
   },
136 139
   methods: {
140
+
141
+    // 合计表数据
142
+    getSummaries(param) {
143
+        let { columns, data } = param;
144
+        console.log(param,'oo')
145
+        let sums = [];
146
+        columns.forEach((column, index) => {
147
+          
148
+          if (index === 0) {
149
+            sums[index] = '总价';
150
+            return;
151
+          }
152
+          let values = data.map(item => Number(item[column.property]));
153
+          console.log(values,'values')
154
+          if (!values.every(value => isNaN(value))) {
155
+            sums[index] = values.reduce((prev, curr) => {
156
+              const value = Number(curr);
157
+              if (!isNaN(value)) {
158
+                return prev + curr;
159
+              } else {
160
+                return prev;
161
+              }
162
+            }, 0);
163
+            sums[index] += '';
164
+          } else {
165
+            sums[index] = '';
166
+          }
167
+        });
168
+
169
+        return sums;
170
+      },
171
+
137 172
     // 初始化数据
138 173
     init() {},
139 174
 

+ 6 - 2
src/xt_pages/DepositManagement/Template/DeductionSummary.vue Ver fichero

@@ -51,6 +51,10 @@
51 51
           color: '#606266',
52 52
         }"
53 53
         :data="tableData"
54
+         show-summary
55
+        :summary-method="getSummaries"
56
+        max-height="550"
57
+        sum-text="押金支付金额合计"
54 58
         border
55 59
       >
56 60
         <el-table-column type="index" label="序号" align="center" width="200">
@@ -67,14 +71,14 @@
67 71
             <span>{{ scope.row.total	 ? scope.row.total	 : "" }}</span>
68 72
           </template>
69 73
         </el-table-column>
70
-        <el-table-column label="押金支付金额" align="center">
74
+        <el-table-column label="押金支付金额" align="center" prop="decimal">
71 75
           <template slot-scope="scope">
72 76
             <span>{{ scope.row.decimal	 ? scope.row.decimal	 : "" }}</span>
73 77
           </template>
74 78
         </el-table-column>
75 79
       </el-table>
76 80
 
77
-      <div>押金支付金额合计:<span>{{sum}}</span></div>
81
+      <!-- <div>押金支付金额合计:<span>{{sum}}</span></div> -->
78 82
     </div>
79 83
   </div>
80 84
 </template>

+ 6 - 3
src/xt_pages/DepositManagement/Template/RechargeDetails.vue Ver fichero

@@ -50,7 +50,10 @@
50 50
           backgroundColor: 'rgb(245, 247, 250)',
51 51
           color: '#606266',
52 52
         }"
53
+        max-height="550"
53 54
         :data="tableData"
55
+        show-summary
56
+        sum-text="充值金额合计"
54 57
         border
55 58
       >
56 59
         <el-table-column type="index" label="序号" align="center" width="200">
@@ -66,7 +69,7 @@
66 69
           </template>
67 70
         </el-table-column>
68 71
 
69
-        <el-table-column label="充值金额" align="center">
72
+        <el-table-column label="充值金额" align="center" prop="deposit">
70 73
           <template slot-scope="scope">
71 74
             <span>{{ scope.row.deposit	 ? scope.row.deposit	 : "" }}</span>
72 75
           </template>
@@ -121,9 +124,9 @@
121 124
         </el-table-column>
122 125
       </el-table>
123 126
 
124
-      <div>
127
+      <!-- <div>
125 128
           充值金额合计:<span>{{sum}}</span>
126
-      </div>
129
+      </div> -->
127 130
     </div>
128 131
   </div>
129 132
 </template>

+ 6 - 3
src/xt_pages/DepositManagement/Template/RechargeSummary.vue Ver fichero

@@ -50,7 +50,10 @@
50 50
           backgroundColor: 'rgb(245, 247, 250)',
51 51
           color: '#606266',
52 52
         }"
53
+        max-height="550"
53 54
         :data="tableData"
55
+        show-summary
56
+        sum-text="充值金额合计"
54 57
         border
55 58
       >
56 59
         <el-table-column type="index" label="序号" align="center" width="200">
@@ -62,7 +65,7 @@
62 65
           </template>
63 66
         </el-table-column>
64 67
 
65
-        <el-table-column label="充值金额" align="center">
68
+        <el-table-column label="充值金额" align="center" prop="sum_decimal">
66 69
           <template slot-scope="scope">
67 70
             <span>{{ scope.row.sum_decimal	 ? scope.row.sum_decimal	 : "" }}</span>
68 71
           </template>
@@ -74,10 +77,10 @@
74 77
         </el-table-column>
75 78
 
76 79
       </el-table>
77
-
80
+<!-- 
78 81
       <div>
79 82
           充值金额合计:<span>{{sum}}</span>
80
-      </div>
83
+      </div> -->
81 84
     </div>
82 85
   </div>
83 86
 </template>

+ 2 - 2
src/xt_pages/dialysis/dialysisPrintOrder.vue Ver fichero

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

+ 25 - 17
src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue Ver fichero

@@ -490,10 +490,10 @@
490 490
                         <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>
491 491
                       </td>
492 492
                       <td width="60">
493
-                        <label-box :isChecked="prescription.mode_id == 8 ? true : false" showValue="I-HDF"></label-box>
493
+                        <label-box :isChecked="prescription.mode_id == 24 ? true : false" showValue="I-HDF"></label-box>
494 494
                       </td>
495
-                      <td width="50">
496
-                        <label-box :isChecked="prescription.mode_id == 24 ? true : false" showValue="HP"></label-box>
495
+                      <td width="60">
496
+                        <label-box :isChecked="prescription.mode_id == 8 ? true : false" showValue="HFHD"></label-box>
497 497
                         <!-- <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box> -->
498 498
                       </td>
499 499
                       <td width="90">
@@ -504,18 +504,24 @@
504 504
                       <td width="100">
505 505
                         <div class="under-line">
506 506
                           &nbsp;
507
-                          <span v-if="prescription.mode_id > 5">{{ prescription.mode }}</span>
507
+                          <span v-if="prescription.mode_id != 1 &&
508
+                          prescription.mode_id != 2&&
509
+                          prescription.mode_id != 24&&
510
+                          prescription.mode_id != 8&&
511
+                          prescription.mode_id != 9">
512
+                          {{ prescription.mode }}
513
+                          </span>
508 514
                         </div>
509 515
                       </td>
510 516
 
511 517
                       <td width="140">透析器/灌流器型号:</td>
512 518
                       <td width="">
513 519
                         <div class="under-line">
514
-                            <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">
520
+                            <span>
515 521
                               <span>{{prescription.dialysis_dialyszers}}</span>
516 522
                               <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
517 523
                             </span>
518
-                            <span v-else>{{ prescription.dialyzer_perfusion_apparatus }}</span>
524
+                            <!-- <span v-else>{{ prescription.dialyzer_perfusion_apparatus }}</span> -->
519 525
                         </div>
520 526
                       </td>
521 527
                     </tr>
@@ -1496,30 +1502,32 @@ export default {
1496 1502
           var leftAdvice = []
1497 1503
           var rightAdvice = []
1498 1504
           var adlen = advices.length
1499
-
1505
+          console.log(adlen,'adlen')
1500 1506
           var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
1501
-          for (var i = 0; i < halfLen; i++) {
1507
+          for (var i = 0; i < adlen; i++) {
1502 1508
             leftAdvice.push(advices[i])
1503
-            rightAdvice.push(advices[i + halfLen])
1509
+            // rightAdvice.push(advices[i + halfLen])
1504 1510
           }
1505
-          if (halfLen < 5) {
1511
+          if (adlen < 5) {
1506 1512
             var nl = 5 - leftAdvice.length
1507 1513
             for (let index = 0; index < nl; index++) {
1508 1514
               leftAdvice.push([])
1509 1515
             }
1510
-            var nl = 5 - rightAdvice.length
1511
-            for (let index = 0; index < nl; index++) {
1512
-              rightAdvice.push([])
1513
-            }
1516
+            // var nl = 5 - rightAdvice.length
1517
+            // for (let index = 0; index < nl; index++) {
1518
+            //   rightAdvice.push([])
1519
+            // }
1514 1520
           }
1515
-
1521
+          
1516 1522
           this.advices = []
1517
-          for (var i = 0; i < halfLen; i++) {
1523
+          for (var i = 0; i < adlen; i++) {
1518 1524
             var item = []
1519 1525
             item.push(leftAdvice[i])
1520
-            item.push(rightAdvice[i])
1526
+            // item.push(rightAdvice[i])
1521 1527
             this.advices.push(item)
1522 1528
           }
1529
+          console.log(this.advices,'临时医嘱')
1530
+
1523 1531
           this.loading = false
1524 1532
 
1525 1533
           this.doctor_advices =

+ 2 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue Ver fichero

@@ -910,6 +910,8 @@
910 910
                 <img class="es-img" :src="setAdminUserES(advice[0].checker)" alt="" srcset="" v-else />
911 911
               </td>
912 912
               <td></td>
913
+
914
+              
913 915
               <td v-if="advice[1] != undefined">
914 916
                 <span v-if="advice[1].start_time">
915 917
                   <!-- {{advice[1].start_time | parseTime('{y}-{m}-{d} {h}:{i}')}} -->

+ 312 - 213
src/xt_pages/hospitalStation/components/chargeDialog.vue Ver fichero

@@ -1,38 +1,88 @@
1 1
 <template>
2
-  <el-dialog width="854px" title="收费单" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
3
-             :close-on-press-escape="isClose">
4
-
5
-    <el-form :model="form"  ref="formValue" label-width="100px">
6
-
7
-      <el-form-item label="日期:" style="width:100%;">
8
-        <div>{{record_date}}</div>
2
+  <el-dialog
3
+    width="854px"
4
+    title="收费单"
5
+    class="chargeDialog"
6
+    :visible.sync="visibility"
7
+    :close-on-click-modal="isClose"
8
+    :close-on-press-escape="isClose"
9
+  >
10
+    <el-form :model="form" ref="formValue" label-width="100px">
11
+      <el-form-item label="日期:" style="width: 100%">
12
+        <div>{{ record_date }}</div>
9 13
       </el-form-item>
10 14
 
11
-      <el-form-item label="总计:" prop="name" :validate-event="is_Name" style="width:33%;">
12
-        <el-input style="color: black" type="number" v-model="form.total" :disabled="true"></el-input>
15
+      <el-form-item
16
+        label="总计:"
17
+        prop="name"
18
+        :validate-event="is_Name"
19
+        style="width: 33%"
20
+      >
21
+        <el-input
22
+          style="color: black"
23
+          type="number"
24
+          v-model="form.total"
25
+          :disabled="true"
26
+        ></el-input>
13 27
       </el-form-item>
14
-      <el-form-item label="医保:" prop="name" :validate-event="is_Name" style="width:33%;">
15
-        <el-input style="color: black"  type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
28
+      <el-form-item
29
+        label="医保:"
30
+        prop="name"
31
+        :validate-event="is_Name"
32
+        style="width: 33%"
33
+      >
34
+        <el-input
35
+          style="color: black"
36
+          type="number"
37
+          v-model="form.medical_insurance_price"
38
+          :disabled="true"
39
+        ></el-input>
16 40
       </el-form-item>
17 41
 
18
-
19
-      <el-form-item label="自费:" prop="age" :validate-event="is_Name" style="width:33%;">
20
-        <el-input style="color: black"  type="number" v-model="form.private_price" :disabled="true"></el-input>
42
+      <el-form-item
43
+        label="自费:"
44
+        prop="age"
45
+        :validate-event="is_Name"
46
+        style="width: 33%"
47
+      >
48
+        <el-input
49
+          style="color: black"
50
+          type="number"
51
+          v-model="form.private_price"
52
+          :disabled="true"
53
+        ></el-input>
21 54
       </el-form-item>
22 55
 
23
-      <el-form-item label="个账支出:" prop="age" :validate-event="is_Name" style="width:33%;">
24
-        <el-input style="color: black"  type="number" v-model="form.acct_pay" :disabled="true"></el-input>
56
+      <el-form-item
57
+        label="个账支出:"
58
+        prop="age"
59
+        :validate-event="is_Name"
60
+        style="width: 33%"
61
+      >
62
+        <el-input
63
+          style="color: black"
64
+          type="number"
65
+          v-model="form.acct_pay"
66
+          :disabled="true"
67
+        ></el-input>
25 68
       </el-form-item>
26 69
 
27
-
28
-      <el-form-item label="个人现金支出:" prop="age" :validate-event="is_Name" style="width:33%;">
29
-        <el-input style="color: black"  type="number" v-model="form.psn_pay" :disabled="true"></el-input>
70
+      <el-form-item
71
+        label="个人现金支出:"
72
+        prop="age"
73
+        :validate-event="is_Name"
74
+        style="width: 33%"
75
+      >
76
+        <el-input
77
+          style="color: black"
78
+          type="number"
79
+          v-model="form.psn_pay"
80
+          :disabled="true"
81
+        ></el-input>
30 82
       </el-form-item>
31 83
 
32
-
33
-
34
-      <el-form-item label="支付方式:" style="width:100%;">
35
-        <!-- <el-select v-model="form.pay_way" placeholder="请选择">
84
+      <!-- <el-form-item label="支付方式:" style="width:100%;"> -->
85
+      <!-- <el-select v-model="form.pay_way" placeholder="请选择">
36 86
           <el-option
37 87
             v-for="(item,index) in payWays"
38 88
             :key="index"
@@ -40,234 +90,283 @@
40 90
             :value="item.value">
41 91
           </el-option>
42 92
         </el-select> -->
43
-        <el-radio-group v-model="form.pay_way">
93
+      <!-- <el-input v-model="pay_way_index" placeholder="请输入内容" @change=""></el-input> -->
94
+      <!-- <el-radio-group v-model="form.pay_way">
44 95
           <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
45 96
         </el-radio-group>
97
+      </el-form-item> -->
98
+
99
+      <el-form-item label="个人现金支付方式:" style="width: 100%">
100
+        <el-checkbox v-model="form.dec_way" @change="changedecimal">
101
+          使用押金余额抵扣(当前押金余额为¥{{ decimal }})
102
+        </el-checkbox>
103
+        <span v-if="form.dec_way == true">
104
+          <el-form-item class="specialFormItem">
105
+            <div style="display: flex">
106
+              <!--            这里不要改成el-input,因为使用el-input会导致一个奇怪的bug,千万不要改!!!!!!!!!!!!!!!!!!!!-->
107
+              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
108
+              
109
+              </el-input>元
110
+            </div>
111
+          </el-form-item>
112
+        </span>
46 113
       </el-form-item>
47 114
 
48
-
49 115
       <el-form-item label="付款金额:" prop="id_card" :validate-event="is_Name">
50
-        <el-input style="color: black"  type="number" v-model="form.pay_price" :disabled="true"></el-input>
116
+        <el-input
117
+          style="color: black"
118
+          type="number"
119
+          v-model="form.pay_price"
120
+          :disabled="true"
121
+        ></el-input>
51 122
       </el-form-item>
52 123
 
53
-
54 124
       <el-form-item label="付款卡号:" prop="id_card" :validate-event="is_Name">
55 125
         <el-input v-model="form.pay_card_no"></el-input>
56 126
       </el-form-item>
57 127
 
58 128
       <el-form-item class="specialFormItem" label="折扣金额:">
59
-        <div style="display:flex;">
60
-          <el-input style="color: black"  v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
129
+        <div style="display: flex">
130
+          <el-input
131
+            style="color: black"
132
+            v-model="form.discount_price"
133
+            :disabled="form.preferential_price != 0"
134
+            @change="changeDiscountPrice"
135
+          ></el-input>
61 136
         </div>
62 137
       </el-form-item>
63 138
       <el-form-item class="specialFormItem" label="优惠金额:">
64
-        <div style="display:flex;">
65
-          <el-input style="color: black"  v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
139
+        <div style="display: flex">
140
+          <el-input
141
+            style="color: black"
142
+            v-model="form.preferential_price"
143
+            :disabled="form.discount_price != 0"
144
+            @change="changePreferentialPrice"
145
+          ></el-input>
66 146
         </div>
67 147
       </el-form-item>
68 148
       <el-form-item label="实收金额:">
69
-        <div style="display:flex;">
70
-          <el-input style="color: black"  v-model="form.reality_price" @change="realityPrice"></el-input>
149
+        <div style="display: flex">
150
+          <el-input
151
+            style="color: black"
152
+            v-model="form.reality_price"
153
+            @change="realityPrice"
154
+          ></el-input>
71 155
         </div>
72 156
       </el-form-item>
73 157
       <el-form-item label="找回金额:">
74
-        <div style="display:flex;">
75
-          <el-input style="color: black"  v-model.number="form.found_price"></el-input>
158
+        <div style="display: flex">
159
+          <el-input
160
+            style="color: black"
161
+            v-model.number="form.found_price"
162
+          ></el-input>
76 163
         </div>
77 164
       </el-form-item>
78 165
 
79 166
       <el-form-item label="发票编码:">
80
-        <div style="display:flex;">
167
+        <div style="display: flex">
81 168
           <el-input v-model.number="form.fapiao_code"></el-input>
82 169
         </div>
83 170
       </el-form-item>
84 171
 
85
-
86 172
       <el-form-item label="发票号码:">
87
-        <div style="display:flex;">
173
+        <div style="display: flex">
88 174
           <el-input v-model.number="form.fapiao_number"></el-input>
89 175
         </div>
90 176
       </el-form-item>
91
-
92 177
     </el-form>
93 178
 
94 179
     <span slot="footer" class="dialog-footer">
95
-    <el-button @click="cancel('formValue')">取 消</el-button>
96
-    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
97
-  </span>
180
+      <el-button @click="cancel('formValue')">取 消</el-button>
181
+      <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
182
+    </span>
98 183
   </el-dialog>
99
-
100 184
 </template>
101 185
 
102 186
 <script>
103
-  import { uParseTime } from '@/utils/tools'
104
-  const moment = require('moment')
105
-  export default {
106
-    name: 'chargeDialog',
107
-
108
-    data() {
109
-
110
-      return {
111
-        record_date:'',
112
-        form: {
113
-          medical_insurance_price:0,
114
-          private_price:'',
115
-          pay_way:'',
116
-          pay_price:'',
117
-          pay_card_no:'',
118
-          discount_price:'',
119
-          preferential_price:'',
120
-          reality_price:'',
121
-          found_price:'',
122
-          total:0,
123
-          fapiao_code:"",
124
-          fapiao_number:"",
125
-          order:null,
126
-          acct_pay:'',
127
-          psn_pay:'',
128
-
129
-
130
-        },
131
-        payWays: [
132
-          {value: 1, label: '现金'},
133
-          {value: 2, label: '银行卡'},
134
-          {value: 3, label: '微信'},
135
-          {value: 4, label: '支付宝'},
136
-          {value: 5, label: '医保卡'},
137
-
138
-        ],
139
-        total:"",
140
-
141
-        visibility: false,
142
-        labelPosition: 'right',
143
-        isClose: false,
144
-
145
-        resetForm: {
146
-          medical_insurance_price:'',
147
-          private_price:'',
148
-          pay_way:'',
149
-          pay_price:'',
150
-          pay_card_no:'',
151
-          discount_price:'',
152
-          preferential_price:'',
153
-          reality_price:'',
154
-          found_price:'',
155
-          fapiao_code:"",
156
-          fapiao_number:"",
157
-          acct_pay:"",
158
-          psn_pay:"",
159
-        },
160
-
161
-      }
162
-    },
163
-    props: {
164
-
165
-      titles: {
166
-        type: String,
167
-        default: ''
168
-      },
169
-      formValue: {
170
-        type: Object
187
+import { uParseTime } from "@/utils/tools";
188
+const moment = require("moment");
189
+export default {
190
+  name: "chargeDialog",
191
+
192
+  data() {
193
+    return {
194
+      record_date: "",
195
+      form: {
196
+        medical_insurance_price: 0,
197
+        private_price: "",
198
+        pay_way: "",
199
+        pay_price: "",
200
+        pay_card_no: "",
201
+        discount_price: "",
202
+        preferential_price: "",
203
+        reality_price: "",
204
+        found_price: "",
205
+        total: 0,
206
+        fapiao_code: "",
207
+        fapiao_number: "",
208
+        order: null,
209
+        acct_pay: "",
210
+        psn_pay: "",
171 211
       },
172
-      type: {
173
-        type: Number,
174
-        default: 1
175
-
212
+      pay_way_index: "",
213
+      payWays: [
214
+        { value: 1, label: "现金" },
215
+        { value: 2, label: "银行卡" },
216
+        { value: 3, label: "微信" },
217
+        { value: 4, label: "支付宝" },
218
+        { value: 5, label: "医保卡" },
219
+      ],
220
+      total: "",
221
+
222
+      visibility: false,
223
+      labelPosition: "right",
224
+      isClose: false,
225
+
226
+      resetForm: {
227
+        medical_insurance_price: "",
228
+        private_price: "",
229
+        pay_way: "",
230
+        pay_price: "",
231
+        pay_card_no: "",
232
+        discount_price: "",
233
+        preferential_price: "",
234
+        reality_price: "",
235
+        found_price: "",
236
+        fapiao_code: "",
237
+        fapiao_number: "",
238
+        acct_pay: "",
239
+        psn_pay: "",
176 240
       },
177
-      isCreated: {
178
-        type: Number,
179
-        default: 1
180
-
181
-      }
241
+    };
242
+  },
243
+  props: {
244
+    titles: {
245
+      type: String,
246
+      default: "",
182 247
     },
183
-    methods: {
184
-      show: function (total,order) {
185
-        this.record_date = moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm")
186
-        this.form.total = total
187
-        this.form.private_price = total
188
-        this.form.pay_price = total
189
-        this.form.total = total + this.form.medical_insurance_price
190
-        this.form.discount_price = 0.0
191
-        this.form.preferential_price = 0.0
192
-
193
-        this.form.fapiao_code =""
194
-        this.form.fapiao_number = ""
195
-        this.order = order
196
-
197
-        if(this.order && this.order.id > 0){
198
-          this.form.acct_pay = this.order.acct_pay
199
-          this.form.psn_pay = this.order.psn_cash_pay
200
-          this.form.total = this.order.medfee_sumamt
201
-          this.form.pay_price = this.order.medfee_sumamt
202
-          this.form.medical_insurance_price = this.order.fund_pay_sumamt
203
-          this.form.private_price =  this.order.psn_part_amt
204
-        }
205
-
206
-        this.visibility = true
248
+    formValue: {
249
+      type: Object,
250
+    },
251
+    type: {
252
+      type: Number,
253
+      default: 1,
254
+    },
255
+    isCreated: {
256
+      type: Number,
257
+      default: 1,
258
+    },
259
+  },
260
+  methods: {
261
+    show: function (total, order) {
262
+      this.record_date = moment(new Date())
263
+        .add("year", 0)
264
+        .format("YYYY-MM-DD HH:mm");
265
+      this.form.total = total;
266
+      this.form.private_price = total;
267
+      this.form.pay_price = total;
268
+      this.form.total = total + this.form.medical_insurance_price;
269
+      this.form.discount_price = 0.0;
270
+      this.form.preferential_price = 0.0;
271
+
272
+      this.form.fapiao_code = "";
273
+      this.form.fapiao_number = "";
274
+      this.order = order;
275
+
276
+      if (this.order && this.order.id > 0) {
277
+        this.form.acct_pay = this.order.acct_pay;
278
+        this.form.psn_pay = this.order.psn_cash_pay;
279
+        this.form.total = this.order.medfee_sumamt;
280
+        this.form.pay_price = this.order.medfee_sumamt;
281
+        this.form.medical_insurance_price = this.order.fund_pay_sumamt;
282
+        this.form.private_price = this.order.psn_part_amt;
283
+      }
207 284
 
208
-      }, hide: function () {
209
-        this.form = Object.assign({}, this.resetForm);
210
-        this.loadingtwo = false;
211
-        this.visibility = false
212
-      }, cancel: function (formName) {
213
-        this.$emit('cancel', this.getValue());
214
-        this.$refs['formValue'].resetFields()
215
-      },
216
-      confirm: function (formName) {
217
-        this.$refs['formValue'].validate((valid) => {
218
-          if (valid) {
219
-            let value = {};
220
-            value = this.getValue();
221
-            this.$emit('confirm', value);
222
-            this.loadingtwo = true
223
-          }
224
-        })
225
-      },
226
-      getValue: function () {
227
-        let form = {};
228
-        form = this.form;
229
-        return form
230
-      },
231
-      realityPrice(val){
232
-        if(val < (this.form.total - this.form.discount_price - this.form.preferential_price)){
233
-          this.$message.error('实收金额不能小于收费金额');
234
-          return
235
-        }
236
-        this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
237
-      },
238
-      changeDiscountPrice(val){
239
-        if(val > this.form.total){
240
-          this.$message.error('折扣金额不能超过费用总额');
241
-          return
242
-        }
243
-        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
244
-      },
245
-      changePreferentialPrice(val){
246
-        if(val > this.form.total){
247
-          this.$message.error('优惠金额不能超过费用总额');
248
-          return
285
+      this.visibility = true;
286
+    },
287
+    hide: function () {
288
+      this.form = Object.assign({}, this.resetForm);
289
+      this.loadingtwo = false;
290
+      this.visibility = false;
291
+    },
292
+    cancel: function (formName) {
293
+      this.$emit("cancel", this.getValue());
294
+      this.$refs["formValue"].resetFields();
295
+    },
296
+    confirm: function (formName) {
297
+      this.$refs["formValue"].validate((valid) => {
298
+        if (valid) {
299
+          let value = {};
300
+          value = this.getValue();
301
+          this.$emit("confirm", value);
302
+          this.loadingtwo = true;
249 303
         }
250
-        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
304
+      });
305
+    },
306
+    getValue: function () {
307
+      let form = {};
308
+      form = this.form;
309
+      return form;
310
+    },
311
+    realityPrice(val) {
312
+      if (
313
+        val <
314
+        this.form.total -
315
+          this.form.discount_price -
316
+          this.form.preferential_price
317
+      ) {
318
+        this.$message.error("实收金额不能小于收费金额");
319
+        return;
251 320
       }
252
-    },mounted() {
253
-      var nowDate = new Date();
254
-      var nowYear = nowDate.getFullYear();
255
-      var nowMonth = nowDate.getMonth() + 1;
256
-      var nowDay = nowDate.getDate();
257
-
258
-      var nowHours = nowDate.getHours();
259
-      var nowMin = nowDate.getMinutes();
260
-      var nowSecond = nowDate.getSeconds();
261
-
262
-      this.record_date =
263
-        nowYear +
264
-        '-' +
265
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
266
-        '-' +
267
-        (nowDay < 10 ? '0' + nowDay : nowDay)+" "+(nowHours < 10 ? '0' + nowHours : nowHours)+":"+(nowMin < 10 ? '0' + nowMin : nowMin)
268
-    }
269
-
270
-  }
321
+      this.form.found_price =
322
+        parseInt(val) -
323
+        parseInt(this.form.total) +
324
+        parseInt(this.form.discount_price) +
325
+        parseInt(this.form.preferential_price);
326
+    },
327
+    changeDiscountPrice(val) {
328
+      if (val > this.form.total) {
329
+        this.$message.error("折扣金额不能超过费用总额");
330
+        return;
331
+      }
332
+      this.form.reality_price =
333
+        parseInt(this.form.total) -
334
+        parseInt(val) -
335
+        parseInt(this.form.preferential_price);
336
+    },
337
+    changePreferentialPrice(val) {
338
+      if (val > this.form.total) {
339
+        this.$message.error("优惠金额不能超过费用总额");
340
+        return;
341
+      }
342
+      this.form.reality_price =
343
+        parseInt(this.form.total) -
344
+        parseInt(val) -
345
+        parseInt(this.form.discount_price);
346
+    },
347
+  },
348
+  mounted() {
349
+    var nowDate = new Date();
350
+    var nowYear = nowDate.getFullYear();
351
+    var nowMonth = nowDate.getMonth() + 1;
352
+    var nowDay = nowDate.getDate();
353
+
354
+    var nowHours = nowDate.getHours();
355
+    var nowMin = nowDate.getMinutes();
356
+    var nowSecond = nowDate.getSeconds();
357
+
358
+    this.record_date =
359
+      nowYear +
360
+      "-" +
361
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
362
+      "-" +
363
+      (nowDay < 10 ? "0" + nowDay : nowDay) +
364
+      " " +
365
+      (nowHours < 10 ? "0" + nowHours : nowHours) +
366
+      ":" +
367
+      (nowMin < 10 ? "0" + nowMin : nowMin);
368
+  },
369
+};
271 370
 </script>
272 371
 
273 372
 
@@ -277,17 +376,17 @@
277 376
   font-size: 15px;
278 377
 }
279 378
 
280
-   /deep/.el-input__inner {
281
-     background-color: transparent !important;
282
-     border: 1px solid red;
283
-   }
284
-.chargeDialog{
285
-  .el-form{
379
+/deep/.el-input__inner {
380
+  background-color: transparent !important;
381
+  border: 1px solid red;
382
+}
383
+.chargeDialog {
384
+  .el-form {
286 385
     display: flex;
287 386
     flex-wrap: wrap;
288 387
   }
289
-  .el-form-item{
290
-    width:50%;
388
+  .el-form-item {
389
+    width: 50%;
291 390
   }
292 391
 }
293 392
 </style>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 989 - 766
src/xt_pages/outpatientCharges/summary.vue


+ 22 - 19
src/xt_pages/outpatientTool/detailPrint.vue Ver fichero

@@ -29,36 +29,36 @@
29 29
       </div>
30 30
       <table class="listTable" border="1">
31 31
         <tr style="height:45px">
32
-          <td style="width: 5%; text-align: center">序号</td>
33
-          <td style="width: 13%; text-align: center">处方日期</td>
34
-          <td style="width: 20%; text-align: center">费用编码</td>
35
-          <td style="width: 17%; text-align: center">项目名称</td>
36
-          <td style="width: 10%; text-align: center">规格</td>
37
-          <td style="width: 13%; text-align: center">数量</td>
38
-          <td style="width: 13%; text-align: center">单位</td>
39
-          <td style="width: 11%; text-align: center">单价(元)</td>
40
-          <td style="width: 10%; text-align: center">金额</td>
32
+          <td width="100" style="text-align: center">序号</td>
33
+          <td width="200" style="text-align: center">处方日期</td>
34
+          <td width="300" style="text-align: center">费用编码</td>
35
+          <td width="300" style="text-align: center">项目名称</td>
36
+          <td width="180" style="text-align: center">规格</td>
37
+          <td width="100" style="text-align: center">数量</td>
38
+          <td width="100" style="text-align: center">单位</td>
39
+          <td width="100" style="text-align: center">单价(元)</td>
40
+          <td width="150" style="text-align: center">金额</td>
41 41
         </tr>
42 42
         <tr v-for="(item, index) in tableData" :key="index">
43
-          <td style="width: 19%; text-align: center">{{ index + 1 }}</td>
44
-          <td style="width: 10%; text-align: center">
43
+          <td style="text-align: center">{{ index + 1 }}</td>
44
+          <td style="text-align: center">
45 45
             <span v-if="item.record_date > 0">{{
46 46
               getTimes(item.record_date)
47 47
             }}</span>
48 48
           </td>
49
-          <td style="width: 31%; text-align: center">{{ item.number }}</td>
50
-          <td style="width: 14%; text-align: center">
49
+          <td width="80" style="text-align: center">{{ item.number }}</td>
50
+          <td style="text-align: center">
51 51
             <span v-if="item.advice_id > 0">{{ item.advice.advice_name }}</span>
52 52
             <span v-if="item.project_id > 0">
53 53
               <span v-if="item.project.type == 2">{{
54 54
                 item.project.project.project_name
55 55
               }}</span>
56 56
               <span v-if="item.project.type == 3"
57
-                >{item.project.good_info.good_name}}</span
57
+                >{{item.project.good_info.good_name}}</span
58 58
               >
59 59
             </span>
60 60
           </td>
61
-          <td style="width: 10%; text-align: center">
61
+          <td style="text-align: center">
62 62
             <span v-if="item.advice_id > 0"
63 63
               >{{ item.advice.drug.dose }}{{ item.advice.drug.dose_unit }}*{{
64 64
                 item.advice.drug.min_number
@@ -75,23 +75,24 @@
75 75
               }}</span>
76 76
             </span>
77 77
           </td>
78
-          <td style="width: 6%; text-align: center">
78
+          <td style="text-align: center">
79 79
             {{ item.cnt }}
80 80
           </td>
81
-           <td style="width: 6%; text-align: center">
81
+           <td style="text-align: center">
82 82
               <span v-if="item.advice_id > 0">{{item.advice.prescribing_number_unit}}</span>
83 83
               <span v-if="item.project_id > 0">
84 84
                 <span v-if="item.project.type == 2">{{item.project.project.unit}}</span>
85 85
                 <span v-if="item.project.type == 3">{{item.project.good_info.packing_unit}}</span>
86 86
               </span>
87 87
           </td>
88
-          <td style="width: 10%; text-align: center">
88
+          <td style="text-align: center">
89 89
             {{ item.pric }}
90 90
           </td>
91
-          <td style="width: 10%; text-align: center">
91
+          <td style="text-align: center">
92 92
             {{ item.total_price }}
93 93
           </td>
94 94
         </tr>
95
+
95 96
       </table>
96 97
     </div>
97 98
   </div>
@@ -198,6 +199,8 @@ export default {
198 199
           }
199 200
           obj.total_price = obj.total_price.toFixed(2);
200 201
           this.tableData.push(obj);
202
+
203
+
201 204
           if (this.$route.query.keyword != "") {
202 205
             for (let i = 0; i < this.tableData.length; i++) {
203 206
               if (this.tableData[i].index != "合计") {

+ 18 - 15
src/xt_pages/outpatientTool/gatherPrint.vue Ver fichero

@@ -4,7 +4,7 @@
4 4
       <el-button type="primary" @click="printtpage">打印</el-button>
5 5
     </div>
6 6
         <div id="list-print" class="list-print">
7
-        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
7
+        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用汇总</div>
8 8
          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 10px;">
9 9
             <div>医疗机构名称:{{$store.getters.xt_user.org.org_name}}</div>
10 10
         </div>
@@ -46,16 +46,16 @@
46 46
         </div>
47 47
         <table class="listTable" border="1">
48 48
             <tr>
49
-                <td style="width:14%;text-align:center" >费用分类</td>
50
-                <td style="width:22%;text-align:center">项目名称</td>
51
-                <td style="width:15%;text-align:center">规格</td>
52
-                <td style="width:9%;text-align:center">单价</td>
53
-                <td style="width:10%;text-align:center" >数量</td>
54
-                <td style="width:10%;text-align:center">金额</td>
55
-                <td style="width:20%;text-align:center" >医保类型</td>
49
+                <td style="text-align:center" >费用分类</td>
50
+                <td style="text-align:center">项目名称</td>
51
+                <td style="text-align:center">规格</td>
52
+                <td style="text-align:center">单价</td>
53
+                <td style="text-align:center" >数量</td>
54
+                <td style="text-align:center">金额</td>
55
+                <td style="text-align:center" >医保类型</td>
56 56
             </tr>
57 57
             <tr v-for="(item, index) in tableList" :key="index">
58
-                <td style="width:19%;text-align:center" >
58
+                <td style="text-align:center" >
59 59
                   <span v-if="item.type == 1">
60 60
                     {{getAdviceMedChrgintmType(item.advice_id)}}
61 61
                   </span>
@@ -66,23 +66,23 @@
66 66
                         {{getProjectMedChrgintmType(item.project_id)}}
67 67
                     </span>
68 68
                 </td>
69
-                <td style="width:10%;text-align:center" >
69
+                <td style="text-align:center" >
70 70
                   <span>{{item.name}}</span>  
71 71
                 </td>
72
-                <td style="width:31%;text-align:center" >
72
+                <td style="text-align:center" >
73 73
                   {{ item.spec }}
74 74
                 </td>
75
-                <td style="width:14%;text-align:center" >
75
+                <td style="text-align:center" >
76 76
                   {{item.price}}  
77 77
                 </td>
78
-                <td style="width:10%;text-align:center" >
78
+                <td style="text-align:center" >
79 79
                    {{item.count }}{{item.unit }}
80 80
                 </td>
81
-                <td style="width:6%;text-align:center" >
81
+                <td style="text-align:center" >
82 82
                    <span v-if="item.is_total == 1">{{ item.total }}</span>  
83 83
                    <span v-if="item.is_total == 2">{{ (item.price * item.count).toFixed(2) }}</span> 
84 84
                 </td>
85
-                <td style="width:20%;text-align:center" >
85
+                <td style="text-align:center" >
86 86
                      <span v-if="balanceAccountsType == 2">{{getChrgitmLv(item.chrgitm_lv)}}</span>
87 87
                       <span v-if="balanceAccountsType != 2">
88 88
                         <span v-if="item.type == 1">
@@ -1032,6 +1032,9 @@
1032 1032
     font-size: 16px;
1033 1033
     justify-content: space-between;
1034 1034
     margin: 10px 0;
1035
+    div{
1036
+      width: 200px;
1037
+    }
1035 1038
 }
1036 1039
 .listTable{
1037 1040
     width: 100%;