diff --git a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue index 2abf77187..b532d7a5d 100644 --- a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue +++ b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue @@ -71,7 +71,8 @@ export default { } else { const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); if (serviceNumberList.includes(value)) { - return callback(new Error('该服务号已存在')); + // new Error('该服务号已存在') + return callback(); } else { return callback(); } @@ -91,7 +92,8 @@ export default { this.formModel.serviceNumber = newValue; const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); if (serviceNumberList.includes(value)) { - return callback(new Error('该服务号已存在')); + // new Error('该服务号已存在') + return callback(); } else { return callback(); } diff --git a/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue b/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue index 4e287186f..3b790f25b 100644 --- a/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue +++ b/src/views/planMonitor/editTool/menus/gernaratePlanTrain.vue @@ -59,7 +59,8 @@ export default { rules: { serviceNumber:[ {required: true, validator: this.validateServiceNumber, trigger: 'blur'}, - {required: true, validator: this.validateServiceNumber, trigger: 'change'} + // {required: true, validator: this.validateServiceNumber, trigger: 'change'} + {required: true, validator: this.validateServiceNo, trigger: 'change'} ], beginTime: [ { required: true, message: '请填写开始时间', trigger: 'blur' } @@ -138,14 +139,17 @@ export default { if (typeof value == 'string' && value.trim().length == 0) { return callback(new Error('请填写服务号')); } else { - const newValue = parseInt(value); + let newValue = parseInt(value); if (newValue) { - if (newValue.toString() != value) { - this.formModel.serviceNumber = newValue; + if (newValue > 0 & newValue < 9) { + newValue = '00' + newValue; + } else if (newValue > 10 & newValue < 99) { + newValue = '0' + newValue; } + this.formModel.serviceNumber = newValue; const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); if (serviceNumberList.includes(value)) { - return callback(new Error('该服务号已存在,请重新填写')); + return callback(new Error('该服务号已存在')); } else { return callback(); } @@ -155,6 +159,18 @@ export default { } }, + validateServiceNo(rule, value, callback) { + if (typeof value == 'string' && value.trim().length == 0) { + return callback(new Error('请填写服务号')); + } else { + const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); + if (serviceNumberList.includes(value)) { + return callback(new Error('该服务号已存在')); + } else { + return callback(); + } + } + }, validateRunningRouting(rule, value, callback) { if (value.trim().length == 0) { return callback(new Error('请选择环路')); diff --git a/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue b/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue index 6c362121f..6c40c368e 100644 --- a/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue +++ b/src/views/planMonitor/newEditTool/menus/addPlanningTrain.vue @@ -77,7 +77,8 @@ export default { } else { const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); if (serviceNumberList.includes(value)) { - return callback(new Error('该服务号已存在')); + // new Error('该服务号已存在'); + return callback(); } else { return callback(); } @@ -97,7 +98,8 @@ export default { this.formModel.serviceNumber = newValue; const serviceNumberList = Object.keys(this.$store.state.runPlan.editData); if (serviceNumberList.includes(value)) { - return callback(new Error('该服务号已存在')); + // new Error('该服务号已存在') + return callback(); } else { return callback(); }