From 5d6432135c217115d94e755b7a53da19478e9689 Mon Sep 17 00:00:00 2001
From: weibl <weibaolin@chinasae.com>
Date: Thu, 26 Feb 2026 16:32:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simulationTask/components/demandTable.vue |   4 +-
 .../task/simulationTask/newDemand/index.vue   | 187 +++++++++---------
 2 files changed, 97 insertions(+), 94 deletions(-)

diff --git a/src/views/task/simulationTask/components/demandTable.vue b/src/views/task/simulationTask/components/demandTable.vue
index a5e0176f..aafbecbb 100644
--- a/src/views/task/simulationTask/components/demandTable.vue
+++ b/src/views/task/simulationTask/components/demandTable.vue
@@ -60,9 +60,9 @@
     <template #phaseId="{ row }">
       {{ row.phaseName }}
     </template>
-    <template #workspace="{ row }">
+    <!-- <template #workspace="{ row }">
       {{ row.workspaceName }}
-    </template>
+    </template> -->
     <template #pMemberList="{ row }">
       <!-- {{ row.pMemberList }} -->
       {{ disposeMemberList(row, 'pMemberList') }}
diff --git a/src/views/task/simulationTask/newDemand/index.vue b/src/views/task/simulationTask/newDemand/index.vue
index 7f547c9c..63103d11 100644
--- a/src/views/task/simulationTask/newDemand/index.vue
+++ b/src/views/task/simulationTask/newDemand/index.vue
@@ -249,7 +249,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
       });
     }
     let workspaceList = [];
-    if (row.workspace && row.phaseId) {
+    if (row.workspaceId && row.phaseId) {
       workspaceList = await getChildrenNodeList(NODE_TYPE.WORKSPACE, row.phaseId);
       workspaceList = workspaceList.map((item: any) => {
         return {
@@ -267,7 +267,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
 
     nextTick(async () => {
       tableFormRef.value.setOptionsFun('phaseId', phaseList);
-      tableFormRef.value.setOptionsFun('workspace', workspaceList);
+      tableFormRef.value.setOptionsFun('workspaceId', workspaceList);
       if (simList?.A) {
         tableFormRef.value.setOptionsFun('simType', simList.A);
       }
@@ -315,15 +315,15 @@ const deleteDemandFun = async (uuid: number) => {
 const confirmFun = async () => {
   if (await tableFormRef.value.validateFun()) {
     loadingInterface.value = true;
-    const fromData: any = tableFormRef.value.getFormDataFun();
-    if (fromData.planTime) {
-      fromData.beginTime = fromData.planTime[0];
-      fromData.endTime = fromData.planTime[1];
+    // const fromData: any = tableFormRef.value.getFormDataFun();
+    if (editFormInfo.value.planTime) {
+      editFormInfo.value.beginTime = editFormInfo.value.planTime[0];
+      editFormInfo.value.endTime = editFormInfo.value.planTime[1];
     }
     if (isCreateDialog.value) {
-      const demandId = await createDemandApiFun(fromData);
+      const demandId = await createDemandApiFun(editFormInfo.value);
       // 没有demandId就是创建需求失败
-      if (demandId && fromData.attachments?.length > 0) {
+      if (demandId && editFormInfo.value.attachments?.length > 0) {
         // for (let index = 0; index < fromData.attachments.length; index++) {
         // const form = new FormData();
         // form.append('fileType', String(FILE_TYPE.DEMAND_ATTACHMENTS));
@@ -334,12 +334,12 @@ const confirmFun = async () => {
         // upload(`${PREFIX}demand/uploadDemandFiles`, form);
         // }
       }
-      const files = fromData.attachments.filter((item: any) => item.raw);
+      const files = editFormInfo.value.attachments.filter((item: any) => item.raw);
       if (files.length > 0) {
         const params = {
           fileList: files, // 文件列表
           // dirId: demandId, // 文件目录id
-          projectId: fromData.projectId, // 项目id
+          projectId: editFormInfo.value.projectId, // 项目id
           callbackFlag: '/task/sponsor', // 回调标识
           uuid: demandId,
         };
@@ -348,7 +348,7 @@ const confirmFun = async () => {
       // batchUploadFile(fromData.attachments, fromData.projectId, demandId);
       formVisible.value = false;
     } else {
-      await editDemandApiFun(fromData);
+      await editDemandApiFun(editFormInfo.value);
     }
     loadingInterface.value = false;
     tableRef.value.tableRef.resetFun();
@@ -384,7 +384,7 @@ const createDemandApiFun = async (fromData: any) => {
     demandStatus: '0',
 
     machineId: fromData.machineId,
-    workspaceId: fromData.workspace,
+    workspaceId: fromData.workspaceId,
 
     // 待办所属类型
     demandType: simulationType.value,
@@ -424,7 +424,7 @@ const editDemandApiFun = async (fromData: any) => {
     pMemberList: getPMemberId(),
     eMemberList: '',
     machineId: fromData.machineId,
-    workspaceId: fromData.workspace,
+    workspaceId: fromData.workspaceId,
     // 待办所属类型
     demandType: simulationType.value,
   });
@@ -495,7 +495,7 @@ const changeSimulationType = (val: string) => {
 };
 
 const changeFun = async (val: any, type: string) => {
-  const formData = tableFormRef.value.getFormDataFun();
+  // const formData = tableFormRef.value.getFormDataFun();
   // editFormInfo.value = { ...formData };
   if (val.key === 'projectId') {
     let nodeType = '';
@@ -511,7 +511,7 @@ const changeFun = async (val: any, type: string) => {
           currentProjectUndertaker.value = val.val.extras[index].propertyValue;
         }
       }
-      if (formData.simType) {
+      if (editFormInfo.value.simType) {
         await disposeDeptMember();
         // formData.pMemberList = await disposeDeptMember();
       }
@@ -520,90 +520,93 @@ const changeFun = async (val: any, type: string) => {
       const optionList = await getPhaseList(nodeType, nodeId);
       tableFormRef.value.setOptionsFun(nextKey, optionList);
       if (nextKey === 'phaseId' && optionList.length > 0) {
-        formData.phaseId = optionList[0].value;
-        const workspaceInfo = await getWorkSpaceList(formData.phaseId);
-        formData.workspace = workspaceInfo.value;
-        formData.machineId = '';
-        if (formData.phaseId !== workspaceInfo.parentId) {
-          formData.machineId = workspaceInfo.parentId;
+        editFormInfo.value.phaseId = optionList[0].value;
+        const workspaceInfo = await getWorkSpaceList(editFormInfo.value.phaseId);
+        editFormInfo.value.workspaceId = workspaceInfo.value;
+        editFormInfo.value.machineId = '';
+        if (editFormInfo.value.phaseId !== workspaceInfo.parentId) {
+          editFormInfo.value.machineId = workspaceInfo.parentId;
         }
-        formData.workspaceName = workspaceInfo.label;
-        formData.extras = setWorkSpaceValue(
-          formData.extras,
-          formData.workspace,
-          formData.workspaceName
-        );
+        // formData.workspaceName = workspaceInfo.label;
+        // formData.extras = setWorkSpaceValue(
+        //   formData.extras,
+        //   formData.workspace,
+        //   formData.workspaceName
+        // );
       }
       if (optionList.length === 0) {
-        formData.phaseId = '';
+        editFormInfo.value.phaseId = '';
         // 清空工位数据
-        formData.extras = setWorkSpaceValue(formData.extras, '', '');
-        tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, []);
+        editFormInfo.value.machineId = '';
+        editFormInfo.value.workspaceId = '';
+        // formData.extras = setWorkSpaceValue(formData.extras, '', '');
+        tableFormRef.value.setOptionsFun('workspaceId', []);
       }
     } else {
       tableFormRef.value.setOptionsFun(nextKey, []);
-      formData.phaseId = '';
-      formData.workspace = '';
-      formData.workspaceName = '';
-      formData.extras = setWorkSpaceValue(formData.extras, '', '');
+      editFormInfo.value.phaseId = '';
+      editFormInfo.value.machineId = '';
+      editFormInfo.value.workspaceId = '';
+      // formData.workspaceName = '';
+      // formData.extras = setWorkSpaceValue(formData.extras, '', '');
     }
     // const formData = tableFormRef.value.getFormDataFun();
     // tableFormRef.value.setFormDataFun({ ...formData, phaseId: '' });
-    editFormInfo.value = { ...formData };
+    // editFormInfo.value = { ...formData };
   }
 
   if (val.key === 'phaseId') {
-    if (formData.phaseId) {
-      const workspaceInfo = await getWorkSpaceList(formData.phaseId);
-      formData.machineId = '';
-      if (formData.phaseId !== workspaceInfo.parentId) {
-        formData.machineId = workspaceInfo.parentId;
+    if (editFormInfo.value.phaseId) {
+      const workspaceInfo = await getWorkSpaceList(editFormInfo.value.phaseId);
+      editFormInfo.value.machineId = '';
+      if (editFormInfo.value.phaseId !== workspaceInfo.parentId) {
+        editFormInfo.value.machineId = workspaceInfo.parentId;
       }
-      formData.workspace = workspaceInfo.value;
-      formData.workspaceName = workspaceInfo.label;
-      formData.extras = setWorkSpaceValue(
-        formData.extras,
-        formData.workspace,
-        formData.workspaceName
-      );
+      editFormInfo.value.workspaceId = workspaceInfo.value;
+      // formData.workspaceName = workspaceInfo.label;
+      // formData.extras = setWorkSpaceValue(
+      //   formData.extras,
+      //   formData.workspace,
+      //   formData.workspaceName
+      // );
     } else {
-      formData.workspace = '';
-      formData.workspaceName = '';
-      formData.extras = setWorkSpaceValue(
-        formData.extras,
-        formData.workspace,
-        formData.workspaceName
-      );
+      editFormInfo.value.workspaceId = '';
+      // formData.workspaceName = '';
+      // formData.extras = setWorkSpaceValue(
+      //   formData.extras,
+      //   formData.workspace,
+      //   formData.workspaceName
+      // );
     }
-    editFormInfo.value = { ...formData };
+    // editFormInfo.value = { ...formData };
   }
-  if (val.key === 'workspace') {
-    if (formData.workspace) {
-      formData.machineId = '';
-      if (formData.phaseId !== val.val.parentId) {
-        formData.machineId = val.val.parentId;
+  if (val.key === 'workspaceId') {
+    if (editFormInfo.value.workspaceId) {
+      editFormInfo.value.machineId = '';
+      if (editFormInfo.value.phaseId !== val.val.parentId) {
+        editFormInfo.value.machineId = val.val.parentId;
       }
-      formData.workspace = val.val.value;
-      formData.workspaceName = val.val.label;
-      formData.extras = setWorkSpaceValue(
-        formData.extras,
-        formData.workspace,
-        formData.workspaceName
-      );
+      editFormInfo.value.workspaceId = val.val.value;
+      // formData.workspaceName = val.val.label;
+      // formData.extras = setWorkSpaceValue(
+      //   formData.extras,
+      //   formData.workspace,
+      //   formData.workspaceName
+      // );
     } else {
-      formData.machineId = '';
-      formData.workspace = '';
-      formData.workspaceName = '';
-      formData.extras = setWorkSpaceValue(
-        formData.extras,
-        formData.workspace,
-        formData.workspaceName
-      );
+      editFormInfo.value.machineId = '';
+      editFormInfo.value.workspaceId = '';
+      // formData.workspaceName = '';
+      // formData.extras = setWorkSpaceValue(
+      //   formData.extras,
+      //   formData.workspace,
+      //   formData.workspaceName
+      // );
     }
-    editFormInfo.value = { ...formData };
+    // editFormInfo.value = { ...formData };
   }
   if (val.key === 'simType') {
-    if (formData.projectId) {
+    if (editFormInfo.value.projectId) {
       await disposeDeptMember();
       // formData.pMemberList = await disposeDeptMember();
     }
@@ -648,19 +651,19 @@ const disposeDeptMember = async () => {
   return pMemberId;
 };
 
-const setWorkSpaceValue = (extras: any, workspace: string, workspaceName: string) => {
-  return extras.map((item: any) => {
-    if (item.propertyName === NODE_TYPE.WORKSPACE) {
-      item.propertyValue = workspace;
-    }
-    if (item.propertyName === NODE_TYPE.WORKSPACE + 'Name') {
-      item.propertyValue = workspaceName;
-    }
-    return {
-      ...item,
-    };
-  });
-};
+// const setWorkSpaceValue = (extras: any, workspace: string, workspaceName: string) => {
+//   return extras.map((item: any) => {
+//     if (item.propertyName === NODE_TYPE.WORKSPACE) {
+//       item.propertyValue = workspace;
+//     }
+//     if (item.propertyName === NODE_TYPE.WORKSPACE + 'Name') {
+//       item.propertyValue = workspaceName;
+//     }
+//     return {
+//       ...item,
+//     };
+//   });
+// };
 
 const getWorkSpaceList = async (phaseId: string) => {
   const res: any = await getChildrenNodeListApi({
@@ -673,7 +676,7 @@ const getWorkSpaceList = async (phaseId: string) => {
     if (res.data.length === 0) {
       ElMessage.warning('该阶段下没有工位，请先做仿真策划！');
       // 清空工位数据
-      tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, []);
+      tableFormRef.value.setOptionsFun('workspaceId', []);
     } else {
       const optionList = res.data.map((item: any) => {
         return {
@@ -682,7 +685,7 @@ const getWorkSpaceList = async (phaseId: string) => {
           parentId: item.parentId,
         };
       });
-      tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, optionList);
+      tableFormRef.value.setOptionsFun('workspaceId', optionList);
       if (optionList.length > 0) {
         return optionList[0];
       }

From 600db976b6d5b4b8fd07304012d58c2b3316c6c8 Mon Sep 17 00:00:00 2001
From: weibl <weibaolin@chinasae.com>
Date: Thu, 26 Feb 2026 16:33:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E7=AD=96=E5=88=92?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E4=BA=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/treeCaseTable/treeTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/treeCaseTable/treeTable.vue b/src/components/common/treeCaseTable/treeTable.vue
index 0737bc52..13e7a607 100644
--- a/src/components/common/treeCaseTable/treeTable.vue
+++ b/src/components/common/treeCaseTable/treeTable.vue
@@ -172,7 +172,7 @@
       <template #payAttentionMemberIds="{ row, icon }">
         <TreeEditItem
           v-if="[NODE_TYPE.TASK].includes(row.nodeType)"
-          :data="row.payAttentionMemberList"
+          :data="row.payAttentionMemberIds"
           :editMode="editMode"
           :icon="icon"
           hideTitle
@@ -188,7 +188,7 @@
             (data) => changeUserFun(row, data, 'payAttentionMemberList', 'payAttentionMemberIds')
           "
           :multiple="true"
-          v-model="row.payAttentionMemberList"
+          v-model="row.payAttentionMemberIds"
         ></userSelect>
       </template>
       <!-- 计划开始时间 -->