merge
This commit is contained in:
@@ -149,7 +149,6 @@ export const setMachineListByPhaseId = async (data: any) => {
|
|||||||
}
|
}
|
||||||
if (cbData.key === 'phaseId') {
|
if (cbData.key === 'phaseId') {
|
||||||
formData.phaseName = cbData.val.label;
|
formData.phaseName = cbData.val.label;
|
||||||
formData.simType = '';
|
|
||||||
formData.pMemberName = '';
|
formData.pMemberName = '';
|
||||||
formData.pMemberList = '';
|
formData.pMemberList = '';
|
||||||
}
|
}
|
||||||
@@ -160,6 +159,7 @@ export const setMachineListByPhaseId = async (data: any) => {
|
|||||||
if (current) {
|
if (current) {
|
||||||
formData.machineId = current.value;
|
formData.machineId = current.value;
|
||||||
}
|
}
|
||||||
|
setPMemberName({ formData });
|
||||||
};
|
};
|
||||||
|
|
||||||
// 根据机台设置工位
|
// 根据机台设置工位
|
||||||
@@ -234,6 +234,11 @@ export const setPMemberName = async (data: any) => {
|
|||||||
deptName: projectUndertaker,
|
deptName: projectUndertaker,
|
||||||
discipline: simType,
|
discipline: simType,
|
||||||
};
|
};
|
||||||
|
if (!(projectUndertaker && simType)) {
|
||||||
|
formData.pMemberName = '';
|
||||||
|
formData.pMemberList = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
const res = await queryByDeptAndDisciplineApi(params);
|
const res = await queryByDeptAndDisciplineApi(params);
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
let defaultIndex = -1;
|
let defaultIndex = -1;
|
||||||
|
|||||||
Reference in New Issue
Block a user