diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue index ea39a9b..ed9ef84 100644 --- a/frontend/src/views/plan/planList/components/planPopup.vue +++ b/frontend/src/views/plan/planList/components/planPopup.vue @@ -461,8 +461,9 @@ const generateData = () => { } } i.checked = boundPqDevIds.length > 0 ? boundPqDevIds.includes(i.id) : false - i.disabled = i.checkState ? i.checkState != 0 : false - + if (i.checkState && i.checkState != 0) { + i.disabled = true + } if (allDisabled.value) { i.disabled = true } @@ -948,6 +949,13 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan: ...user, disabled: childrenMembers.includes(user.id) || formContent.leader === user.id })) + const subPlanIds = data.children.map((item: any) => item.id) + const subBoundDev_Result = await getBoundPqDevList({ planIdList: subPlanIds }) + const subBoundDevData = Array.isArray(subBoundDev_Result.data) ? subBoundDev_Result.data : [] + const subBoundDevIds = subBoundDevData.map((item: any) => item.id) + boundPqDevList.value.forEach((item: any) => { + item.disabled = subBoundDevIds.includes(item.id) + }) } } else if (planType.value === 1) { unboundPqDevList.value = boundData.filter((i: any) => !i.boundPlanName) as Device.ResPqDev[] diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue index 67e73c6..0ae6774 100644 --- a/frontend/src/views/plan/planList/index.vue +++ b/frontend/src/views/plan/planList/index.vue @@ -103,7 +103,7 @@ type="primary" v-auth.plan="'analysis'" link - :icon="List" + icon="DataLine" v-if="scope.row.testState == '2'" @click="statisticalAnalysis(scope.row)" > @@ -149,7 +149,7 @@