sale-client 3.5.197 → 3.5.198

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/charge/business/CardMeterCenter.vue +5 -0
  3. package/src/components/charge/business/ShowCardSellGas.vue +6 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.197",
3
+ "version": "3.5.198",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/business/CardMeterCenter.vue CHANGED
@@ -100,8 +100,13 @@
100
100
  <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
101
101
  <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
102
102
  v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
103
+ v-if="config.calculatePreByCollection"
103
104
  @blur="config.calculatePreByCollection && calculatePreByCollection()"
104
105
  v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
106
+ <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
107
+ v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
108
+ v-if="!config.calculatePreByCollection"
109
+ v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
105
110
  </div>
106
111
  <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
107
112
  :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
package/src/components/charge/business/ShowCardSellGas.vue CHANGED
@@ -88,7 +88,12 @@
88
88
  :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
89
89
  <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
90
90
  <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
91
- @blur="config.calculatePreByCollection && calculatePreByCollection()"
91
+ @blur="calculatePreByCollection()"
92
+ v-if="config.calculatePreByCollection"
93
+ v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
94
+ v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
95
+ <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
96
+ v-if="!config.calculatePreByCollection"
92
97
  v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
93
98
  v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
94
99
  </div>