Merge pull request '排班bug' (#415) from projects/mes-zjl into projects/mes-test
Reviewed-on: #415
This commit is contained in:
commit
e9c2917c77
@ -125,13 +125,15 @@ export default {
|
|||||||
addButtonShow: '',
|
addButtonShow: '',
|
||||||
planArr: [], //排班计划数组
|
planArr: [], //排班计划数组
|
||||||
rules: {
|
rules: {
|
||||||
name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
|
|
||||||
startDay: [
|
startDay: [
|
||||||
{ required: true, message: '请选择排班开始时间', trigger: 'change' },
|
{ required: true, message: '请选择排班开始时间', trigger: 'change' },
|
||||||
],
|
],
|
||||||
endDay: [
|
endDay: [
|
||||||
{ required: true, message: '请选择排班结束时间', trigger: 'change' },
|
{ required: true, message: '请选择排班结束时间', trigger: 'change' },
|
||||||
],
|
],
|
||||||
|
planId:[
|
||||||
|
{ required: true, message: '请选择排班计划', trigger: 'change' },
|
||||||
|
]
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -231,6 +233,10 @@ export default {
|
|||||||
};
|
};
|
||||||
list.push(obj);
|
list.push(obj);
|
||||||
});
|
});
|
||||||
|
if (list.length === 0) {
|
||||||
|
this.$modal.msgError('班组上班顺序不能为空');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
this.form.list = list;
|
this.form.list = list;
|
||||||
updateGroupRule({ ...this.form }).then((res) => {
|
updateGroupRule({ ...this.form }).then((res) => {
|
||||||
this.$modal.msgSuccess('操作成功');
|
this.$modal.msgSuccess('操作成功');
|
||||||
@ -246,6 +252,10 @@ export default {
|
|||||||
};
|
};
|
||||||
list.push(obj);
|
list.push(obj);
|
||||||
});
|
});
|
||||||
|
if (list.length === 0) {
|
||||||
|
this.$modal.msgError('班组上班顺序不能为空');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
this.form.list = list;
|
this.form.list = list;
|
||||||
createGroupRule({ ...this.form }).then((res) => {
|
createGroupRule({ ...this.form }).then((res) => {
|
||||||
this.$modal.msgSuccess('操作成功');
|
this.$modal.msgSuccess('操作成功');
|
||||||
@ -268,13 +278,8 @@ export default {
|
|||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
.min-title::before {
|
.min-title::before {
|
||||||
content: '';
|
content: "*";
|
||||||
display: inline-block;
|
color: #ff5454;
|
||||||
vertical-align: middle;
|
margin-right: 4px;
|
||||||
width: 6px;
|
|
||||||
height: 6px;
|
|
||||||
border-radius: 50%;
|
|
||||||
margin: auto 5px;
|
|
||||||
background-color: #0b58ff;
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user