From 7c65bf55c877fbf359176bfda5f719e11cf37b51 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 3 Jul 2023 09:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workOrder/containers/preserve.jsx         | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/web/client/src/sections/workOrder/containers/preserve.jsx b/web/client/src/sections/workOrder/containers/preserve.jsx
index 9437b18..ca3c23f 100644
--- a/web/client/src/sections/workOrder/containers/preserve.jsx
+++ b/web/client/src/sections/workOrder/containers/preserve.jsx
@@ -65,19 +65,28 @@ const Rest = (props) => {
       render: (text, record, index) => {
          return record?.pomsNeedData?.title?.value || ''
       }
-   }, {
-      title: '关联项目',
+   },
+   // {
+   //    title: '关联项目',
+   //    dataIndex: 'pomsProject',
+   //    render: (text, record, index) => {
+   //       const pomsProjectId = record?.pomsNeedData?.pomsProjectId?.value
+   //       if (pomsProjectId) {
+   //          const corProject = pomsProjectBasicAll.find(p => p.value == pomsProjectId)
+   //          return corProject?.label || ''
+   //       } else {
+   //          return ''
+   //       }
+   //    }
+   // },
+   {
+      title: '项目名称',
       dataIndex: 'pomsProject',
       render: (text, record, index) => {
-         const pomsProjectId = record?.pomsNeedData?.pomsProjectId?.value
-         if (pomsProjectId) {
-            const corProject = pomsProjectBasicAll.find(p => p.value == pomsProjectId)
-            return corProject?.label || ''
-         } else {
-            return ''
-         }
+         return record?.pomsNeedData?.projectName?.value || ''
       }
-   }, {
+   },
+   {
       title: '申请人',
       dataIndex: 'applyerName',
       render: (text, record, index) => user?.name