sale-client 3.5.268 → 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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.268",
3
+ "version": "3.5.270",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -140,7 +140,7 @@
140
140
  f_print: this.model.f_print[0],
141
141
  f_price_id: this.data.f_price_id,
142
142
 
143
- f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
143
+ f_total_fee: this.data.f_total_fee,
144
144
  f_stairprice_id: this.data.f_stairprice_id,
145
145
  operInfo: {
146
146
  f_operator: this.$login.f.name,
@@ -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']">