建需求立马建任务功能开发

src/views/task/simulationTask/newDemand/index.vue

@@ -170,6 +170,9 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
   isCreateDialog.value = isCreate;
   loadingInterface.value = true;
   if (isCreate) {
+    nextTick(() => {
+      tableFormRef.value.resetFun();
+    });
     formHideKeys.value = ['materialNo'];
   }
   if (!isCreateDialog.value) {
@@ -205,6 +208,7 @@ const visibleDialog = async (isCreate: boolean, row?: any) => {
         return {
           label: item.nodeName,
           value: item.uuid,
+          parentId: item.parentId,
         };
       });
     }
@@ -280,14 +284,17 @@ const confirmFun = async () => {
         // upload(`${PREFIX}demand/uploadDemandFiles`, form);
         // }
       }
+      const files = fromData.attachments.filter((item: any) => item.raw);
+      if (files.length > 0) {
         const params = {
-        fileList: fromData.attachments.filter((item: any) => item.raw), // 文件列表
+          fileList: files, // 文件列表
           // dirId: demandId, // 文件目录id
           projectId: fromData.projectId, // 项目id
           callbackFlag: '/task/sponsor', // 回调标识
           uuid: demandId,
         };
         await uploadBigFile(params, batchAddFileInfoApi);
+      }
       // batchUploadFile(fromData.attachments, fromData.projectId, demandId);
       formVisible.value = false;
     } else {
@@ -351,9 +358,15 @@ const createDemandApiFun = async (fromData: any) => {
     ...fromData,
 
     demandStatus: '0',
+
+    machineId: fromData.machineId,
+    workspaceId: fromData.workspace,
+
     // 是否走利元亨创建需求直接创建任务逻辑
     isLyric: enableConfigByTenant([TENANT_ENUM.LYRIC]),
   };
+  // console.log('params', params, editFormInfo.value);
+  // return;
   const res: any = await addDemandApi(params);
   if (res.code === 200) {
     formVisible.value = false;
@@ -384,6 +397,8 @@ const editDemandApiFun = async (fromData: any) => {
     ...fromData,
     pMemberList: fromData.pMemberList,
     eMemberList: '',
+    machineId: fromData.machineId,
+    workspaceId: fromData.workspace,
   });
   if (res.code === 200) {
     ElMessage.success('修改成功');
@@ -469,6 +484,7 @@ const changeFun = async (val: any, type: string) => {
         formData.phaseId = optionList[0].value;
         const workspaceInfo = await getWorkSpaceList(formData.phaseId);
         formData.workspace = workspaceInfo.value;
+        formData.machineId = workspaceInfo.parentId;
         formData.workspaceName = workspaceInfo.label;
         formData.extras = setWorkSpaceValue(
           formData.extras,
@@ -497,6 +513,7 @@ const changeFun = async (val: any, type: string) => {
   if (val.key === 'phaseId') {
     if (formData.phaseId) {
       const workspaceInfo = await getWorkSpaceList(formData.phaseId);
+      formData.machineId = workspaceInfo.parentId;
       formData.workspace = workspaceInfo.value;
       formData.workspaceName = workspaceInfo.label;
       formData.extras = setWorkSpaceValue(
@@ -517,6 +534,7 @@ const changeFun = async (val: any, type: string) => {
   }
   if (val.key === 'workspace') {
     if (formData.workspace) {
+      formData.machineId = val.val.parentId;
       formData.workspace = val.val.value;
       formData.workspaceName = val.val.label;
       formData.extras = setWorkSpaceValue(
@@ -525,6 +543,7 @@ const changeFun = async (val: any, type: string) => {
         formData.workspaceName
       );
     } else {
+      formData.machineId = '';
       formData.workspace = '';
       formData.workspaceName = '';
       formData.extras = setWorkSpaceValue(
@@ -603,10 +622,11 @@ const getWorkSpaceList = async (phaseId: string) => {
       // 清空工位数据
       tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, []);
     } else {
-      const optionList = res.data.map((item: { nodeName: string; uuid: string }) => {
+      const optionList = res.data.map((item: any) => {
         return {
           label: item.nodeName,
           value: item.uuid,
+          parentId: item.parentId,
         };
       });
       tableFormRef.value.setOptionsFun(NODE_TYPE.WORKSPACE, optionList);
@@ -618,6 +638,7 @@ const getWorkSpaceList = async (phaseId: string) => {
   return {
     label: '',
     value: '',
+    parentId: '',
   };
 };