sale-client 3.6.166 → 3.6.167
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/common/userinfo_detail/UserBaseInfo.vue +14 -4
- package/src/components/common/userinfo_detail/UserBaseInfoNew.vue +14 -4
- package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue +1 -1
- package/src/components/webMeter/MeterManage/WebMeterBatchOperate.vue +14 -4
package/package.json
CHANGED
|
@@ -343,10 +343,20 @@
|
|
|
343
343
|
meternumberf: this.row.f_meternumber,
|
|
344
344
|
contentData: {isOpen: oper ? 1 : 0}
|
|
345
345
|
}
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
346
|
+
let _this = this
|
|
347
|
+
await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
|
|
348
|
+
{warnMsg: null, resolveMsg: null}).then(res => {
|
|
349
|
+
if (res.data.length === 0) {
|
|
350
|
+
_this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
|
|
351
|
+
{warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
|
|
352
|
+
_this.valve = false
|
|
353
|
+
_this.operateReason = ''
|
|
354
|
+
})
|
|
355
|
+
} else {
|
|
356
|
+
this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
|
|
357
|
+
_this.valve = false
|
|
358
|
+
_this.operateReason = ''
|
|
359
|
+
}
|
|
350
360
|
})
|
|
351
361
|
}
|
|
352
362
|
},
|
|
@@ -388,10 +388,20 @@
|
|
|
388
388
|
meternumberf: this.row.f_meternumber,
|
|
389
389
|
contentData: {isOpen: oper ? 1 : 0}
|
|
390
390
|
}
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
391
|
+
let _this = this
|
|
392
|
+
await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
|
|
393
|
+
{warnMsg: null, resolveMsg: null}).then(res => {
|
|
394
|
+
if (res.data.length === 0) {
|
|
395
|
+
_this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
|
|
396
|
+
{warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
|
|
397
|
+
_this.valve = false
|
|
398
|
+
_this.operateReason = ''
|
|
399
|
+
})
|
|
400
|
+
} else {
|
|
401
|
+
this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
|
|
402
|
+
_this.valve = false
|
|
403
|
+
_this.operateReason = ''
|
|
404
|
+
}
|
|
395
405
|
})
|
|
396
406
|
}
|
|
397
407
|
},
|
package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue
CHANGED
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
</div>
|
|
32
32
|
<div class="col-sm-8" :class="[$v.f_newidnumber.identityCardValid ? 'has-error' : '']" v-if="model.f_newcredentials[0] === '身份证'">
|
|
33
33
|
<label id="label" class="font_normal_body">*证件号码</label>
|
|
34
|
-
<input type="text" v-model="model.f_newidnumber" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
|
|
34
|
+
<input type="text" v-model="model.f_newidnumber" maxlength="18" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
|
|
35
35
|
</div>
|
|
36
36
|
<div class="col-sm-8" v-if="model.f_newcredentials[0] !== '身份证'">
|
|
37
37
|
<label class="font_normal_body"> 证件号码</label>
|
|
@@ -159,10 +159,20 @@ export default {
|
|
|
159
159
|
meternumberf: this.row.f_meternumber,
|
|
160
160
|
contentData: {isOpen: oper ? 1 : 0}
|
|
161
161
|
}
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
162
|
+
let _this = this
|
|
163
|
+
await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
|
|
164
|
+
{warnMsg: null, resolveMsg: null}).then(res => {
|
|
165
|
+
if (res.data.length === 0) {
|
|
166
|
+
_this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
|
|
167
|
+
{warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
|
|
168
|
+
_this.valve = false
|
|
169
|
+
_this.operateReason = ''
|
|
170
|
+
})
|
|
171
|
+
} else {
|
|
172
|
+
this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
|
|
173
|
+
_this.valve = false
|
|
174
|
+
_this.operateReason = ''
|
|
175
|
+
}
|
|
166
176
|
})
|
|
167
177
|
await this.$dispatch('research')
|
|
168
178
|
},
|