sale-client 3.5.269 → 3.5.270
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 +1 -1
- package/src/components/charge/business/refund_copy/IOTRefund.vue +2 -2
- package/src/filiale/qingtongxia/HandManager/HandManager.vue +4 -3
- package/src/filiale/yuansheng/CardMeterCenter.vue +3 -2
- package/src/filiale/yuansheng/IOTMeterCenter.vue +3 -2
- package/src/filiale/yuansheng/meterinfodetail.vue +2 -2
package/package.json
CHANGED
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
</div>
|
|
38
38
|
<div class="col-sm-4 form-group" v-if="data.f_collection_type === '按金额'">
|
|
39
39
|
<label class="font_normal_body">剩余金额</label>
|
|
40
|
-
<input class="input_search" style="width:60%" type="number" v-model="data.f_balance_amount" readonly>
|
|
40
|
+
<input class="input_search" style="width:60%" type="number" v-model="data.f_balance > 0 ? data.f_balance :data.f_balance_amount" readonly>
|
|
41
41
|
</div>
|
|
42
42
|
<div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按气量'"
|
|
43
43
|
:class="[$v.f_refund_gas.required || $v.f_refund_gas.dctest ? 'has-error' : 'has-success']">
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
:class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
|
|
70
70
|
<label class="font_normal_body">退费金额</label>
|
|
71
71
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
|
|
72
|
-
v-validate:f_refund_fee='{required: true, dctest: [data.f_balance_amount, "<=" ]}' placeholder="退费金额">
|
|
72
|
+
v-validate:f_refund_fee='{required: true, dctest: [data.f_balance > 0 ? data.f_balance :data.f_balance_amount", "<=" ]}' placeholder="退费金额">
|
|
73
73
|
</div>
|
|
74
74
|
<div class="col-sm-4 form-group" v-if="config.overBalance && data.f_collection_type === '按金额'"
|
|
75
75
|
:class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
|
|
@@ -886,7 +886,8 @@
|
|
|
886
886
|
}
|
|
887
887
|
await this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {
|
|
888
888
|
resolveMsg: null,
|
|
889
|
-
rejectMsg: null
|
|
889
|
+
rejectMsg: null,
|
|
890
|
+
newly: true
|
|
890
891
|
}).then((res) => {
|
|
891
892
|
this.$showAlert(`单户抄表成功!`, 'success', 2000)
|
|
892
893
|
this.danhuShow()
|
|
@@ -1249,7 +1250,7 @@
|
|
|
1249
1250
|
f_tablebase: row.f_tablebase,
|
|
1250
1251
|
f_userinfo_id: row.f_userinfo_id
|
|
1251
1252
|
}
|
|
1252
|
-
this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
1253
|
+
this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null, newly: true}).then((res) => {
|
|
1253
1254
|
row.f_meter_state = res.data.f_meter_state
|
|
1254
1255
|
row.f_whether_pay = res.data.f_whether_pay
|
|
1255
1256
|
row.f_oughtfee = res.data.f_oughtfee
|
|
@@ -1381,7 +1382,7 @@
|
|
|
1381
1382
|
}
|
|
1382
1383
|
}
|
|
1383
1384
|
let url = 'rs/logic/sale_commonEnterCancel'
|
|
1384
|
-
this.$resetpost(url, {data: param}, {warnMsg: '确定对这条记录进行撤销吗？'}).then(() => {
|
|
1385
|
+
this.$resetpost(url, {data: param}, {warnMsg: '确定对这条记录进行撤销吗？', newly: true}).then(() => {
|
|
1385
1386
|
this.search()
|
|
1386
1387
|
this.close()
|
|
1387
1388
|
})
|
|
@@ -14,11 +14,12 @@
|
|
|
14
14
|
:options='paytype' clear-button v-ref:payment></v-select>
|
|
15
15
|
</div>
|
|
16
16
|
|
|
17
|
-
<div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
|
|
17
|
+
<div class="col-sm-4" v-if="row.f_collection_type == '按气量'"
|
|
18
|
+
:class="[$v.f_pregas.dctest? 'has-error' : 'has-success']">
|
|
18
19
|
<label for="f_pregas" class=" font_normal_body">*预购气量</label>
|
|
19
20
|
<input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
|
|
20
21
|
@blur="pregas()" v-model="model.f_pregas" v-el:fpregas
|
|
21
|
-
placeholder="预购气量"
|
|
22
|
+
v-validate:f_pregas='{dctest: [maxgas, "<=" ]}' placeholder="预购气量"
|
|
22
23
|
v-next-el='fcollection'>
|
|
23
24
|
</div>
|
|
24
25
|
<div class="col-sm-4" v-if="row.f_collection_type == '按金额'">
|
|
@@ -14,11 +14,12 @@
|
|
|
14
14
|
:options='paytype' clear-button v-ref:payment></v-select>
|
|
15
15
|
</div>
|
|
16
16
|
|
|
17
|
-
<div class="col-sm-4 form-group"
|
|
17
|
+
<div class="col-sm-4 form-group"
|
|
18
|
+
:class="[$v.f_pregas.dctest? 'has-error' : 'has-success']">
|
|
18
19
|
<label for="f_pregas" class=" font_normal_body">预购气量</label>
|
|
19
20
|
<input class="input_search" style="width:60%" type="number" id="pregasFocue"
|
|
20
21
|
@blur="pregas()" v-model="model.f_pregas"
|
|
21
|
-
|
|
22
|
+
v-validate:f_pregas='{dctest: [maxgas, "<=" ]}' placeholder="预购气量"
|
|
22
23
|
v-next-el='sk' >
|
|
23
24
|
</div>
|
|
24
25
|
<!-- <div class="col-sm-4 form-group" v-if="row.f_collection_type == '按金额'">
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
<span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
|
|
59
59
|
</div>
|
|
60
60
|
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|
|
61
|
-
<label class = "col-sm-5 "
|
|
61
|
+
<label class = "col-sm-5 ">户累购气量</label>
|
|
62
62
|
<span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
|
|
63
63
|
</div>
|
|
64
64
|
<div class="row" v-if="(data.f_meter_brand.includes('物联网'))">
|
|
65
|
-
<label class = "col-sm-5 "
|
|
65
|
+
<label class = "col-sm-5 ">累购气量</label>
|
|
66
66
|
<span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
|
|
67
67
|
</div>
|
|
68
68
|
<div class="row" v-if="data.f_meter_type.includes('物联网')">
|