diff --git a/src/tenants/lyric/views/task/demand.vue b/src/tenants/lyric/views/task/demand.vue index 3679b898..1762f84d 100644 --- a/src/tenants/lyric/views/task/demand.vue +++ b/src/tenants/lyric/views/task/demand.vue @@ -33,14 +33,26 @@ const visibleDialog = ({ isCreate, row }: any) => { hideKeys.value.push('materialNo'); } else { if (row.isMoldMaking === 'Y') { - hideKeys.value = hideKeys.value.filter((item) => { - return item !== 'materialNo'; - }); + deleteHideKey('materialNo'); } else { hideKeys.value.push('materialNo'); } } + if (isCreate) { + hideKeys.value.push('urgencyDesc'); + } else { + if (row.urgencyDesc) { + deleteHideKey('urgencyDesc'); + } + } }; + +const deleteHideKey = (key: string) => { + hideKeys.value = hideKeys.value.filter((item) => { + return item !== key; + }); +}; + const loadTableForm = () => {}; const hideKeys = ref(['downAttachments']); @@ -75,13 +87,15 @@ const changeFun = async (val: any) => { demandRef.value.editFormInfo.simulationPurpose = ''; } } - if (val.val.key === 'isMoldMaking') { - if (val.val.val.value === 'Y') { - hideKeys.value = hideKeys.value.filter((item) => { - return item !== 'materialNo'; - }); - } else { - hideKeys.value.push('materialNo'); + if (demandRef.value.simulationType === '有限元仿真') { + if (val.val.key === 'isMoldMaking') { + if (val.val.val.value === 'Y') { + hideKeys.value = hideKeys.value.filter((item) => { + return item !== 'materialNo'; + }); + } else { + hideKeys.value.push('materialNo'); + } } } // } diff --git a/src/tenants/lyric/views/task/lyricTask.ts b/src/tenants/lyric/views/task/lyricTask.ts index 10815dde..30bcca02 100644 --- a/src/tenants/lyric/views/task/lyricTask.ts +++ b/src/tenants/lyric/views/task/lyricTask.ts @@ -16,10 +16,12 @@ export const getDemandHideKeys = (key: string) => { 'materialAndCraftsmanship', 'robotNum', 'colorRequirements', + 'isMoldMaking', + 'materialNo', ]; let keys: string[] = []; if (key.indexOf('有限元') !== -1 || key.indexOf('DISCIPLINE_TYPE') !== -1) { - const finiteElementKeys = ['simulationPurpose']; + const finiteElementKeys = ['simulationPurpose', 'isMoldMaking', 'materialNo']; keys = allKeys.filter((item) => !finiteElementKeys.includes(item)); } else if (key.indexOf('动画') !== -1) { const animationKeys = ['animationPurpose', 'robotBrand', 'axis', 'beatDemand']; diff --git a/src/views/task/simulationTask/newDemand/index.vue b/src/views/task/simulationTask/newDemand/index.vue index bd2b7bec..fc02681e 100644 --- a/src/views/task/simulationTask/newDemand/index.vue +++ b/src/views/task/simulationTask/newDemand/index.vue @@ -735,5 +735,6 @@ const loadTableForm = () => { defineExpose({ tableFormRef, editFormInfo, + simulationType, });