sale-client 3.6.116 → 3.6.117
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
|
@@ -319,6 +319,24 @@ export default {
|
|
|
319
319
|
this.$dispatch('success', '换表', this.row)
|
|
320
320
|
},
|
|
321
321
|
async confirmbefore () {
|
|
322
|
+
if (this.model.metermessage.f_meter_type[0] === '物联网表') {
|
|
323
|
+
let param = {
|
|
324
|
+
f_userfiles_id: this.row.f_userfiles_id,
|
|
325
|
+
f_meternumber: this.model.metermessage.f_meternumber,
|
|
326
|
+
f_gasbrand_id: this.model.metermessage.gasbrand[0].id
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
|
|
330
|
+
resolveMsg: null,
|
|
331
|
+
rejectMsg: '表号验证失败！！'
|
|
332
|
+
})
|
|
333
|
+
console.log('标号验证返回：', res)
|
|
334
|
+
if (res.data) {
|
|
335
|
+
this.metermessage.f_meternumber = ''
|
|
336
|
+
this.$showAlert('表号已存在！！', 'warning', 3000)
|
|
337
|
+
return
|
|
338
|
+
}
|
|
339
|
+
}
|
|
322
340
|
if (this.model.metermessage.f_meter_type[0] != '机表') {
|
|
323
341
|
console.log('进来了')
|
|
324
342
|
if (this.books.data.length > 0) {
|
|
@@ -97,6 +97,9 @@
|
|
|
97
97
|
<th>
|
|
98
98
|
<nobr>气价编号</nobr>
|
|
99
99
|
</th>
|
|
100
|
+
<th>
|
|
101
|
+
<nobr>气价ID</nobr>
|
|
102
|
+
</th>
|
|
100
103
|
<th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
|
|
101
104
|
<nobr>气价名称</nobr>
|
|
102
105
|
</th>
|
|
@@ -139,6 +142,7 @@
|
|
|
139
142
|
<tr>
|
|
140
143
|
<td style="text-align:center">{{$index + 1}}</td>
|
|
141
144
|
<td style="text-align:center">{{row.f_price_id}}</td>
|
|
145
|
+
<td style="text-align:center">{{row.id}}</td>
|
|
142
146
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
|
|
143
147
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
|
|
144
148
|
<td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>
|