陈少旭 2 years ago
parent
commit
acb5c407b1

+ 31 - 9
src/xt_pages/outpatientCharges/components/chargeDialog.vue View File

80
 
80
 
81
       <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 0">
81
       <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 0">
82
 
82
 
83
-        <el-checkbox-group v-model="form.pay_ways">
83
+        <el-checkbox-group v-model="form.pay_wayss">
84
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
84
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
85
         </el-checkbox-group>
85
         </el-checkbox-group>
86
       </el-form-item>
86
       </el-form-item>
87
 
87
 
88
+      <el-form-item label="现金支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
89
+        <el-input class="number_style" v-model="form.cash_pay" ></el-input>
90
+      </el-form-item>
88
 
91
 
89
-      <el-form-item label="其他说明:">
92
+      <el-form-item label="微信支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
93
+        <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
94
+      </el-form-item>
95
+      <el-form-item label="银行卡支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
96
+        <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
97
+      </el-form-item>
98
+      <el-form-item label="支付宝支付金额:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
99
+        <el-input class="number_style" v-model="form.ali_pay" ></el-input>
100
+      </el-form-item>
101
+      <el-form-item label="积分支付:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
102
+        <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
103
+      </el-form-item>
104
+      <el-form-item label="其他说明:" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
90
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
105
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
91
       </el-form-item>
106
       </el-form-item>
92
 
107
 
171
           medical_insurance_price:0,
186
           medical_insurance_price:0,
172
           private_price:'',//自费12
187
           private_price:'',//自费12
173
           pay_way:"",
188
           pay_way:"",
174
-          pay_ways:[],
189
+          pay_wayss:[],
175
           dec_way:'false',//是否使用押金支付
190
           dec_way:'false',//是否使用押金支付
176
           tmp_decimal:"",//本次使用的押金
191
           tmp_decimal:"",//本次使用的押金
177
           pay_price:'',
192
           pay_price:'',
191
           acct_mulaid_pay:'',
206
           acct_mulaid_pay:'',
192
           fulamt_ownpay_amt:'',
207
           fulamt_ownpay_amt:'',
193
           acct_used_flag:0,
208
           acct_used_flag:0,
209
+          cash_pay:"",
210
+          band_card_pay:"",
211
+          wechat_pay:"",
212
+          ali_pay:"",
213
+          jifen_pay:"",
194
         },
214
         },
195
         payWays: [
215
         payWays: [
196
           {value: "1", label: '现金'},
216
           {value: "1", label: '现金'},
200
           {value: "7", label: '积分'},
220
           {value: "7", label: '积分'},
201
           {value: "4", label: '医保卡'},
221
           {value: "4", label: '医保卡'},
202
           {value: "8", label: '其他'},
222
           {value: "8", label: '其他'},
203
-
204
-
205
         ],
223
         ],
206
         total:"",
224
         total:"",
207
 
225
 
226
           overlmt_self_pay:"",
244
           overlmt_self_pay:"",
227
           acct_mulaid_pay:"",
245
           acct_mulaid_pay:"",
228
           fulamt_ownpay_amt:"",
246
           fulamt_ownpay_amt:"",
247
+          pay_wayss: [],
248
+          acct_used_flag:0,
249
+          cash_pay:"",
250
+          band_card_pay:"",
251
+          wechat_pay:"",
252
+          ali_pay:"",
253
+          jifen_pay:"",
229
         },
254
         },
230
 
255
 
231
       }
256
       }
333
         this.form.total = total + this.form.medical_insurance_price
358
         this.form.total = total + this.form.medical_insurance_price
334
         this.form.discount_price = 0.0
359
         this.form.discount_price = 0.0
335
         this.form.preferential_price = 0.0
360
         this.form.preferential_price = 0.0
336
-        this.form.pay_ways = []
337
         this.form.acct_used_flag = 0
361
         this.form.acct_used_flag = 0
338
-
339
-
340
-
341
         this.form.fapiao_code =""
362
         this.form.fapiao_code =""
342
         this.form.fapiao_number = ""
363
         this.form.fapiao_number = ""
343
         this.order = order
364
         this.order = order
379
             value = this.getValue()
400
             value = this.getValue()
380
             console.log(value)
401
             console.log(value)
381
             this.$emit('confirm', value)
402
             this.$emit('confirm', value)
403
+
382
             this.loadingtwo = true
404
             this.loadingtwo = true
383
           }
405
           }
384
         })
406
         })

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

1506
     },
1506
     },
1507
     chargeConfirm(form) {
1507
     chargeConfirm(form) {
1508
       this.newLoading = true
1508
       this.newLoading = true
1509
-      form.pay_ways = form.pay_ways.join(",")
1509
+      form['pay_ways'] = form.pay_wayss.join(",")
1510
       form['id'] = this.patientInfo.id
1510
       form['id'] = this.patientInfo.id
1511
       form['his_patient_id'] = this.hisPatientInfo.id
1511
       form['his_patient_id'] = this.hisPatientInfo.id
1512
       form['record_time'] = this.record_date
1512
       form['record_time'] = this.record_date

+ 22 - 0
src/xt_pages/outpatientTool/components/settle.vue View File

129
               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
129
               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
130
           </el-table-column>
130
           </el-table-column>
131
 
131
 
132
+        <el-table-column align="center" prop="item_name" label="微信支付">
133
+          <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
134
+        </el-table-column>
135
+
136
+        <el-table-column align="center" prop="item_name" label="支付宝支付">
137
+          <template slot-scope="scope">{{scope.row.ali_pay}}</template>
138
+        </el-table-column>
139
+
140
+        <el-table-column align="center" prop="item_name" label="银行卡支付">
141
+          <template slot-scope="scope">{{scope.row.band_card_pay}}</template>
142
+        </el-table-column>
132
 
143
 
144
+        <el-table-column align="center" prop="item_name" label="积分支付">
145
+          <template slot-scope="scope">{{scope.row.jifen_pay}}</template>
146
+        </el-table-column>
147
+
148
+        <el-table-column align="center" prop="item_name" label="现金支付">
149
+          <template slot-scope="scope">{{scope.row.cash_pay}}</template>
150
+        </el-table-column>
151
+
152
+        <el-table-column align="center" prop="item_name" label="其他说明">
153
+          <template slot-scope="scope">{{scope.row.oth_desc}}</template>
154
+        </el-table-column>
133
 
155
 
134
           <el-table-column align="center" prop="total" label="费用总额">
156
           <el-table-column align="center" prop="total" label="费用总额">
135
               <template slot-scope="scope">
157
               <template slot-scope="scope">