diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue index f409ae2..1d31061 100644 --- a/frontend/src/views/plan/planList/components/planPopup.vue +++ b/frontend/src/views/plan/planList/components/planPopup.vue @@ -354,21 +354,10 @@ const open = async (sign: string, mode.value = currentMode titleType.value = sign isSelectDisabled.value = false - if (data.id) { - if(data.testState === 0){ - isSelectDisabled.value = false - }else{ - isSelectDisabled.value = true - } - - Object.assign(formContent,{ ...data }) - } else { - resetFormContent() - } - if(sign == 'add') { + resetFormContent() const [pqSource_Result, PqScript_Result, PqErrSys_Result,pqDevList_Result,pqReportName_Result] = await Promise.all([ getTestSourceList(data), getPqScriptList(data), @@ -378,8 +367,6 @@ const open = async (sign: string, ]); - - if (Array.isArray(pqReportName_Result.data)) { pqReportName.value = pqReportName_Result.data.map(item => ({ name: item })); } else { @@ -403,6 +390,15 @@ const open = async (sign: string, }else{//编辑时先给表单赋值(这会没接收被检设备),需要手动再给被检设备复制后整体表单赋值 + + if(data.testState === 0){ + isSelectDisabled.value = false + }else{ + isSelectDisabled.value = true + } + + Object.assign(formContent,{ ...data }) + const [pqSource_Result, PqScript_Result, PqErrSys_Result,boundPqDevList_Result, unboundPqDevList_Result,pqReportName_Result] = await Promise.all([ getTestSourceList(data), getPqScriptList(data),