sale-client 4.2.59 → 4.2.60

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.
File without changes
@@ -0,0 +1,2 @@
1
+ #Tue Aug 20 11:56:06 CST 2024
2
+ gradle.version=5.2.1
File without changes
@@ -0,0 +1,2 @@
1
+ Manifest-Version: 1.0
2
+
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.59",
3
+ "version": "4.2.60",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -677,8 +677,9 @@ export default {
677
677
  console.log('1239999998', change)
678
678
  let hasUnhand = change && change.data && change.data.unhand && change.data.unhand.length > 0
679
679
  let hasOwe = change && change.data && change.data.owe && change.data.owe.length > 0
680
- if (hasUnhand || hasOwe) {
681
- let r = await this.$showMessage('存在相关异常/欠费记录,是否继续换表?', ['confirm', 'cancel'])
680
+ let hasCardUnread = change && change.data && change.data.cardunread && change.data.cardunread.length > 0
681
+ if (hasUnhand || hasOwe || hasCardUnread) {
682
+ let r = await this.$showMessage('存在抄表计划未执行,是否继续换表?', ['confirm', 'cancel'])
682
683
  if (r !== 'confirm') { return }
683
684
  }
684
685
  } catch (e) {
@@ -73,13 +73,13 @@
73
73
  <div class="col-sm-3 form-group" v-if="config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
74
74
  <label for="f_collection" class="font_normal_body">燃气收款</label>
75
75
  <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
76
- v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}' v-scale = "[data.f_collection, 2]"
76
+ v-validate:f_collection='{required: true, dctest: [0, ">=" ]}' v-scale = "[data.f_collection, 2]"
77
77
  @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
78
78
  </div>
79
79
  <div class="col-sm-4 form-group" v-if="!config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
80
80
  <label for="f_collection" class="font_normal_body">燃气收款</label>
81
81
  <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
82
- v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}' v-scale = "[data.f_collection, 2]"
82
+ v-validate:f_collection='{required: true, dctest: [0, ">=" ]}' v-scale = "[data.f_collection, 2]"
83
83
  @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
84
84
  </div>
85
85
  <div class="col-sm-1 form-group" v-if="config.hasfindaReail">