From fb6796dc5b286d795f3ff7b5ebf7570aea05b651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhaobing=E2=80=99?= <zhao.bin@free-sun.com.cn>
Date: Fri, 15 Sep 2023 19:24:15 +0800
Subject: [PATCH] feat:fix bugs

---
 .../workOrder/containers/preserve.jsx         | 27 ++++++++-----------
 .../sections/workOrder/containers/receipt.jsx |  4 +--
 .../workOrder/containers/stayDoWorkOrder.jsx  |  4 +--
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/web/client/src/sections/workOrder/containers/preserve.jsx b/web/client/src/sections/workOrder/containers/preserve.jsx
index 8e0ea19..622d3c6 100644
--- a/web/client/src/sections/workOrder/containers/preserve.jsx
+++ b/web/client/src/sections/workOrder/containers/preserve.jsx
@@ -62,11 +62,18 @@ const Rest = (props) => {
       title: '序号',
       dataIndex: 'index',
       render: (text, record, index) => index + 1
-   }, {
+   }, 
+   {
+      title: '事项名称',
+      dataIndex: 'fsFormItemName',
+      render: (text, record, index) => {
+         return record?.name || ''
+      }
+   },{
       title: '项目名称',
       dataIndex: 'pomsProject',
       render: (text, record, index) => {
-         return  record.fsFormItemName==='运维中台售后问题处理工单'?
+         return  record.name==='运维中台售后问题处理工单'?
          pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || ''
 
       }
@@ -74,15 +81,9 @@ const Rest = (props) => {
       title: '申请内容描述',
       dataIndex: 'applyContent',
       render: (text, record, index) => {
-         return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
+         return record.name==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
          <Tooltip content={record?.pomsNeedData?.detail?.value}>{record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}</Tooltip>:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || ''
       }
-   }, {
-      title: '申请内容描述',
-      dataIndex: 'applyContent',
-      render: (text, record, index) => {
-         return record?.pomsNeedData?.applyContent?.value || ''
-      }
    },
    // {
    //    title: '关联项目',
@@ -129,13 +130,7 @@ const Rest = (props) => {
    //       return record?.pomsNeedData?.handlingResult?.value || ''
    //    }
    // },
-   {
-      title: '事项名称',
-      dataIndex: 'fsFormItemName',
-      render: (text, record, index) => {
-         return record?.name || ''
-      }
-   },
+  
    {
       title: '问题类型',
       dataIndex: 'issueType',
diff --git a/web/client/src/sections/workOrder/containers/receipt.jsx b/web/client/src/sections/workOrder/containers/receipt.jsx
index e611115..4170383 100644
--- a/web/client/src/sections/workOrder/containers/receipt.jsx
+++ b/web/client/src/sections/workOrder/containers/receipt.jsx
@@ -85,7 +85,7 @@ const Rest = (props) => {
       title: '项目名称',
       dataIndex: 'pomsProject',
       render: (text, record, index) => {
-         return  record.fsFormItemName==='运维中台售后问题处理工单'?
+         return  record.name==='运维中台售后问题处理工单'?
          pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || ''
 
       }
@@ -93,7 +93,7 @@ const Rest = (props) => {
       title: '申请内容描述',
       dataIndex: 'applyContent',
       render: (text, record, index) => {
-         return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
+         return record.name==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
          <Tooltip content={record?.pomsNeedData?.detail?.value}>{record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}</Tooltip>:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || ''
       }
    },
diff --git a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
index 9ed211e..ef8727f 100644
--- a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
+++ b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
@@ -72,7 +72,7 @@ const Rest = (props) => {
       title: '项目名称',
       dataIndex: 'pomsProject',
       render: (text, record, index) => {
-         return  record.fsFormItemName==='运维中台售后问题处理工单'?
+         return  record.name==='运维中台售后问题处理工单'?
          pomsProjectBasicAll?.find(item=>item.value==record?.pomsNeedData?.pomsProjectId?.value).label||'':record?.pomsNeedData?.projectName?.value || ''
 
       }
@@ -80,7 +80,7 @@ const Rest = (props) => {
       title: '申请内容描述',
       dataIndex: 'applyContent',
       render: (text, record, index) => {
-         return record.fsFormItemName==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
+         return record.name==='运维中台售后问题处理工单'?record?.pomsNeedData?.detail?.value.length>5?
          <Tooltip content={record?.pomsNeedData?.detail?.value}>{record?.pomsNeedData?.detail?.value.substring(0, 5) + '...'}</Tooltip>:record?.pomsNeedData?.detail?.value || '':record?.pomsNeedData?.applyContent?.value || ''
       }
    },