sale-client 3.6.466 → 3.6.467
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/revenue/Common/MeterMessage.vue +6 -2
- package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue +3 -1
- package/src/filiale/qianneng/MeterMessage.vue +6 -2
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
package/package.json
CHANGED
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
<label for="f_metertitles" class="font_normal_body">新表封号</label>
|
|
38
38
|
<input type="text" class="input_search" style="width:60%" class="input_search" v-model="metermessage.f_metertitles" placeholder='表封号'>
|
|
39
39
|
</div>
|
|
40
|
-
<div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
|
|
40
|
+
<div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
|
|
41
41
|
<label for="f_meter_base" class="font_normal_body">新表底数</label>
|
|
42
42
|
<input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
|
|
43
43
|
</div>
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
isdecimal: '否',
|
|
62
62
|
imgsrc: '/images/mainicon/biaopan.png',
|
|
63
63
|
imgmeter: '/images/mainicon/addmeter.png',
|
|
64
|
-
|
|
64
|
+
f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
|
|
65
65
|
meterType: this.$appdata.getParam('气表类型')
|
|
66
66
|
}
|
|
67
67
|
},
|
|
@@ -89,6 +89,10 @@
|
|
|
89
89
|
} else {
|
|
90
90
|
this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
|
|
91
91
|
}
|
|
92
|
+
if (this.metermessage.f_meter_base > this.f_meter_base_max) {
|
|
93
|
+
this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
|
|
94
|
+
this.metermessage.f_meter_base = ''
|
|
95
|
+
}
|
|
92
96
|
},
|
|
93
97
|
getMeterBrands (meterType) {
|
|
94
98
|
let res = []
|
|
@@ -651,7 +651,7 @@ export default {
|
|
|
651
651
|
if (this.model.metermessage.f_meter_type[0] !== '机表') {
|
|
652
652
|
if (!this.config.hasArrearsChange && this.books.data && this.books.data.length > 0) {
|
|
653
653
|
if (this.books.data[0].f_whether_pay === '否') {
|
|
654
|
-
this.$showAlert('
|
|
654
|
+
this.$showAlert('换表失败，该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
|
|
655
655
|
this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
|
|
656
656
|
} else {
|
|
657
657
|
this.confirm()
|
|
@@ -697,6 +697,7 @@ export default {
|
|
|
697
697
|
}
|
|
698
698
|
this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
|
|
699
699
|
console.log('成功')
|
|
700
|
+
this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
|
|
700
701
|
if (this.model.metermessage.f_meter_type[0] != '机表') {
|
|
701
702
|
this.$dispatch('refresh')
|
|
702
703
|
} else {
|
|
@@ -892,6 +893,7 @@ export default {
|
|
|
892
893
|
}
|
|
893
894
|
this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
|
|
894
895
|
console.log('成功')
|
|
896
|
+
this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
|
|
895
897
|
if (this.row.f_meter_type.includes('物联网表')) {
|
|
896
898
|
this.$dispatch('refresh')
|
|
897
899
|
} else {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<input type="text" class="input_search" style="width:60%" class="input_search"
|
|
9
9
|
@blur="meternumberValidate()" v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
|
|
10
10
|
</div>
|
|
11
|
-
<div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
|
|
11
|
+
<div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
|
|
12
12
|
<label for="f_meter_base" class="font_normal_body">新表底数</label>
|
|
13
13
|
<input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
|
|
14
14
|
</div>
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
isdecimal: '否',
|
|
70
70
|
imgsrc: '/images/mainicon/biaopan.png',
|
|
71
71
|
imgmeter: '/images/mainicon/addmeter.png',
|
|
72
|
-
|
|
72
|
+
f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
|
|
73
73
|
meterType: this.$appdata.getParam('气表类型')
|
|
74
74
|
}
|
|
75
75
|
},
|
|
@@ -97,6 +97,10 @@
|
|
|
97
97
|
} else {
|
|
98
98
|
this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
|
|
99
99
|
}
|
|
100
|
+
if (this.metermessage.f_meter_base > this.f_meter_base_max) {
|
|
101
|
+
this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
|
|
102
|
+
this.metermessage.f_meter_base = ''
|
|
103
|
+
}
|
|
100
104
|
},
|
|
101
105
|
getMeterBrands (meterType) {
|
|
102
106
|
let res = []
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|