From dc3ddb6ca1eeb0a165d4a820f79c0d8952674b16 Mon Sep 17 00:00:00 2001 From: weibl Date: Sat, 14 Mar 2026 11:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tenants/lyric/views/task/demand.vue | 32 +++++++++---------- src/tenants/lyric/views/task/lyricTask.ts | 3 ++ .../task/simulationTask/mySend/sendTask.vue | 16 +++++----- .../task/simulationTask/newDemand/index.vue | 16 ++++++++-- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/tenants/lyric/views/task/demand.vue b/src/tenants/lyric/views/task/demand.vue index ff0649e7..60bf6b64 100644 --- a/src/tenants/lyric/views/task/demand.vue +++ b/src/tenants/lyric/views/task/demand.vue @@ -129,22 +129,22 @@ const changeFun = async (val: any) => { // } // } }; -const setHideKeys = (key: string) => { - if (key === 'DEMAND_TYPE1') { - hideKeys.value = [ - 'downAttachments', - 'simulationPurpose', - 'animationPurpose', - 'simulationDemand', - ]; - } else if (key === 'DEMAND_TYPE2') { - hideKeys.value = ['downAttachments', 'animationPurpose', 'simulationDemand']; - } else if (key === 'DEMAND_TYPE3') { - hideKeys.value = ['downAttachments', 'simulationPurpose', 'simulationDemand']; - } else if (key === 'DEMAND_TYPE4') { - hideKeys.value = ['downAttachments', 'simulationPurpose', 'animationPurpose']; - } -}; +// const setHideKeys = (key: string) => { +// if (key === 'DEMAND_TYPE1') { +// hideKeys.value = [ +// 'downAttachments', +// 'simulationPurpose', +// 'animationPurpose', +// 'simulationDemand', +// ]; +// } else if (key === 'DEMAND_TYPE2') { +// hideKeys.value = ['downAttachments', 'animationPurpose', 'simulationDemand']; +// } else if (key === 'DEMAND_TYPE3') { +// hideKeys.value = ['downAttachments', 'simulationPurpose', 'simulationDemand']; +// } else if (key === 'DEMAND_TYPE4') { +// hideKeys.value = ['downAttachments', 'simulationPurpose', 'animationPurpose']; +// } +// }; const deptOptions = ref([]); diff --git a/src/tenants/lyric/views/task/lyricTask.ts b/src/tenants/lyric/views/task/lyricTask.ts index 3fe34e66..b8a731b0 100644 --- a/src/tenants/lyric/views/task/lyricTask.ts +++ b/src/tenants/lyric/views/task/lyricTask.ts @@ -52,6 +52,9 @@ export const getDemandHideKeys = (key: string) => { } else if (key.indexOf('公差') !== -1) { const toleranceKeys = ['']; keys = allKeys.filter((item) => !toleranceKeys.includes(item)); + } else if (key.indexOf('物流') !== -1) { + const logistics = ['robotBrand', 'axis', 'robotNum', 'robotNum6']; + keys = allKeys.filter((item) => !logistics.includes(item)); } return keys; }; diff --git a/src/views/task/simulationTask/mySend/sendTask.vue b/src/views/task/simulationTask/mySend/sendTask.vue index 68d80b1d..07baf92e 100644 --- a/src/views/task/simulationTask/mySend/sendTask.vue +++ b/src/views/task/simulationTask/mySend/sendTask.vue @@ -436,14 +436,14 @@ const getLoadcaseList = async (flag?: string) => { const sendFormRef = ref(); -const sendFormRules = reactive({ - insertIndex: [{ required: true, message: '请选择上层节点', trigger: 'change' }], - currentLoadcaseLib: [{ required: true, message: '请选择工况库', trigger: 'change' }], - currentLoadcaseLibVersion: [{ required: true, message: '请选择工况库版本', trigger: 'change' }], - chooseTaskList: [{ required: true, message: '请选择分发的任务', trigger: 'change' }], - eMemberList: [{ required: true, message: '请选择仿真执行人', trigger: 'change' }], - taskName: [{ required: true, message: '请填写任务名称', trigger: 'blur' }], -}); +// const sendFormRules = reactive({ +// insertIndex: [{ required: true, message: '请选择上层节点', trigger: 'change' }], +// currentLoadcaseLib: [{ required: true, message: '请选择工况库', trigger: 'change' }], +// currentLoadcaseLibVersion: [{ required: true, message: '请选择工况库版本', trigger: 'change' }], +// chooseTaskList: [{ required: true, message: '请选择分发的任务', trigger: 'change' }], +// eMemberList: [{ required: true, message: '请选择仿真执行人', trigger: 'change' }], +// taskName: [{ required: true, message: '请填写任务名称', trigger: 'blur' }], +// }); const taskTreeRef = ref(); diff --git a/src/views/task/simulationTask/newDemand/index.vue b/src/views/task/simulationTask/newDemand/index.vue index 62e442a0..d9ef02cf 100644 --- a/src/views/task/simulationTask/newDemand/index.vue +++ b/src/views/task/simulationTask/newDemand/index.vue @@ -72,11 +72,14 @@ workspaceCode: { filterable: true, }, + attachments: { + remark: attachmentRemark, + }, }" :colNum="2" :hideKeys="hideKeys.concat(formHideKeys)" v-model:data="editFormInfo" - @change="changeFun($event, 'form')" + @change="changeFun($event)" @load="loadTableForm" >