Sfoglia il codice sorgente

修复盲板拆除调用接口存储字段给后端

pm 3 mesi fa
parent
commit
0d716d4f4f

+ 10 - 0
src/api/mytask/index.ts

@@ -64,12 +64,22 @@ export interface MyTaskNodeDetailVO {
   [key: string]: any;
 }
 
+// 盲板/拆除时的附件项(前端组数据用)
+export interface AttachmentItem {
+  name?: string;
+  url?: string;
+}
+
 // 更新节点审批状态参数
 export interface UpdateNodeApprovalParam {
   nodeId: number; // 节点ID
   approvalStatus: 'approved' | 'rejected'; // 节点状态:approved(通过)、rejected(驳回)
   approvalOpinion?: string; // 审批意见
   formData?: string; // 表单内容(JSON字符串)
+  /** 盲板/拆除时的设备编号,与 formData 同级 */
+  deviceNumber?: string;
+  /** 盲板/拆除时的附件,与 formData 同级(后端要求传字符串,如 JSON 字符串) */
+  attachments?: string;
 }
 
 // 我的任务 API

+ 2 - 2
src/components/Dashboard.tsx

@@ -2556,11 +2556,11 @@ export default function Dashboard() {
                                     const url = typeof f.response === 'string' ? f.response : (f.response?.url ?? '');
                                     return { name: f.name, url };
                                   });
-                                  const payload = { deviceNumber: isolationDeviceNumber, attachments: attachmentUrls };
                                   await taskManagementApi.updateNodeApproval({
                                     nodeId: typeof nodeId === 'number' ? nodeId : Number(nodeId),
                                     approvalStatus: 'approved',
-                                    formData: JSON.stringify(payload),
+                                    deviceNumber: isolationDeviceNumber,
+                                    attachments: JSON.stringify(attachmentUrls),
                                   });
                                   message.success(t('common.submit') + t('common.success'));
                                   setTaskDetailVisible(false);

+ 2 - 2
src/components/ExecutorDashboard.tsx

@@ -1887,11 +1887,11 @@ export default function ExecutorDashboard() {
                                     const url = typeof f.response === 'string' ? f.response : (f.response?.url ?? '');
                                     return { name: f.name, url };
                                   });
-                                  const payload = { deviceNumber: isolationDeviceNumber, attachments: attachmentUrls };
                                   await myTaskApi.updateNodeApproval({
                                     nodeId: typeof nodeId === 'number' ? nodeId : Number(nodeId),
                                     approvalStatus: 'approved',
-                                    formData: JSON.stringify(payload),
+                                    deviceNumber: isolationDeviceNumber,
+                                    attachments: JSON.stringify(attachmentUrls),
                                   });
                                   message.success(t('common.submit') + t('common.success'));
                                   setTaskDetailVisible(false);

+ 2 - 6
src/components/MyTask.tsx

@@ -2118,15 +2118,11 @@ export default function MyTask() {
                                     const url = typeof f.response === 'string' ? f.response : (f.response?.url ?? '');
                                     return { name: f.name, url };
                                   });
-                                  const payload = {
-                                    deviceNumber: isolationDeviceNumber,
-                                    attachments: attachmentUrls,
-                                  };
-                                  const formDataString = JSON.stringify(payload);
                                   await myTaskApi.updateNodeApproval({
                                     nodeId: typeof nodeId === 'number' ? nodeId : Number(nodeId),
                                     approvalStatus: 'approved',
-                                    formData: formDataString,
+                                    deviceNumber: isolationDeviceNumber,
+                                    attachments: JSON.stringify(attachmentUrls),
                                   });
                                   message.success(t('common.submit') + t('common.success'));
                                   setDetailVisible(false);

+ 2 - 6
src/components/TaskManagement.tsx

@@ -2131,15 +2131,11 @@ export default function TaskManagement() {
                                     const url = typeof f.response === 'string' ? f.response : (f.response?.url ?? '');
                                     return { name: f.name, url };
                                   });
-                                  const payload = {
-                                    deviceNumber: isolationDeviceNumber,
-                                    attachments: attachmentUrls,
-                                  };
-                                  const formDataString = JSON.stringify(payload);
                                   await taskManagementApi.updateNodeApproval({
                                     nodeId: typeof nodeId === 'number' ? nodeId : Number(nodeId),
                                     approvalStatus: 'approved',
-                                    formData: formDataString,
+                                    deviceNumber: isolationDeviceNumber,
+                                    attachments: JSON.stringify(attachmentUrls),
                                   });
                                   message.success(t('common.submit') + t('common.success'));
                                   setDetailVisible(false);