apply-clients 7.1.24 → 7.1.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
<h4 class="modal-title">收费明细</h4>
|
|
96
96
|
</header>
|
|
97
97
|
<article slot="modal-body" class="modal-body clearfix">
|
|
98
|
-
<div class="form-group col-sm-12" :class="chargeUseraddress ? '':'has-error'" v-if="selectdata.f_apply_type
|
|
98
|
+
<div class="form-group col-sm-12" :class="chargeUseraddress ? '':'has-error'" v-if="selectdata.f_apply_type == '报装'">
|
|
99
99
|
<label class="col-sm-2 control-label">缴费地址：</label>
|
|
100
100
|
<div class="col-sm-10">
|
|
101
101
|
<input-select
|
|
@@ -110,6 +110,17 @@
|
|
|
110
110
|
close-on-select ></input-select>
|
|
111
111
|
</div>
|
|
112
112
|
</div>
|
|
113
|
+
<div class="form-group col-sm-12" :class="charge.f_payer ? '':'has-error'">
|
|
114
|
+
<label class="col-sm-2 control-label">缴费单位：</label>
|
|
115
|
+
<div class="col-sm-10">
|
|
116
|
+
<input type="number"
|
|
117
|
+
class="form-control input_view"
|
|
118
|
+
style="width: 100%"
|
|
119
|
+
placeholder="0.00"
|
|
120
|
+
@keyup="handleInput"
|
|
121
|
+
v-model="charge.f_payer" />
|
|
122
|
+
</div>
|
|
123
|
+
</div>
|
|
113
124
|
<div class="form-group col-sm-12" :class="charge.f_charge_money ? '':'has-error'">
|
|
114
125
|
<label class="col-sm-2 control-label">收费金额：</label>
|
|
115
126
|
<div class="col-sm-10">
|
|
@@ -392,7 +403,7 @@ export default {
|
|
|
392
403
|
this.charge.f_amount_words = this.smalltoBIG(e.target.value)
|
|
393
404
|
},
|
|
394
405
|
async saveCharge() {
|
|
395
|
-
if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type
|
|
406
|
+
if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type == '报装') {
|
|
396
407
|
this.$showAlert('请选择缴费的地址信息！！！', 'warning', 3000)
|
|
397
408
|
return
|
|
398
409
|
}
|
|
@@ -400,19 +411,19 @@ export default {
|
|
|
400
411
|
this.$showAlert('单笔收费不能为0元！！！', 'warning', 3000)
|
|
401
412
|
return
|
|
402
413
|
}
|
|
403
|
-
if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_surplus_money)) {
|
|
414
|
+
if ((Number(this.charge.f_charge_money) > Number(this.selectdata.f_surplus_money)) && this.selectdata.f_apply_type === '开发商集体报装') {
|
|
404
415
|
this.$showAlert('单笔收费不能超过未交总金额！！！', 'warning', 3000)
|
|
405
416
|
return
|
|
406
417
|
}
|
|
407
418
|
if (this.selectdata.f_apply_type === '散户集体报装' || this.selectdata.f_apply_type === '煤改气报装') {
|
|
408
|
-
if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_price)) {
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
}
|
|
412
|
-
if (Number(this.charge.f_charge_money) > Number(this.outstandingAmount)) {
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
}
|
|
419
|
+
// if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_price)) {
|
|
420
|
+
// this.$showAlert('单笔收费不能超过单价！！！', 'warning', 3000)
|
|
421
|
+
// return
|
|
422
|
+
// }
|
|
423
|
+
// if (Number(this.charge.f_charge_money) > Number(this.outstandingAmount)) {
|
|
424
|
+
// this.$showAlert('单笔收费不能超过当前用户未结金额！！！', 'warning', 3000)
|
|
425
|
+
// return
|
|
426
|
+
// }
|
|
416
427
|
}
|
|
417
428
|
if (isEmpty(this.charge.f_payment_method)) {
|
|
418
429
|
this.$showAlert('请选择付款方式！！！', 'warning', 3000)
|