From abf3e57d627c194a175189e4222c53caf3ee2a20 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 18:19:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workOrder/containers/initiated.jsx        | 20 +++++++++++--------
 .../workOrder/containers/stayDoWorkOrder.jsx  | 20 ++++++++++---------
 web/client/src/utils/parseProcessData.js      |  4 ++++
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/web/client/src/sections/workOrder/containers/initiated.jsx b/web/client/src/sections/workOrder/containers/initiated.jsx
index 335ec38..a2b993f 100644
--- a/web/client/src/sections/workOrder/containers/initiated.jsx
+++ b/web/client/src/sections/workOrder/containers/initiated.jsx
@@ -37,6 +37,7 @@ const Rest = (props) => {
          })
          .then(res => {
             let nextTableData = (res?.data || []).map(r => {
+               console.log('11111112222',res?.data)
                let pomsNeedData = {}
                if (r?.formData?.submitFormData && r?.formData?.workflowProcessVersion?.workflowProcessForm?.formSchema) {
                   pomsNeedData = parseProcessData({
@@ -62,10 +63,19 @@ 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) => {
+         console.log('record1111',record)
          return record?.pomsNeedData?.projectName?.value || ''
       }
    }, {
@@ -118,13 +128,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/stayDoWorkOrder.jsx b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
index a2c5ba8..8717817 100644
--- a/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
+++ b/web/client/src/sections/workOrder/containers/stayDoWorkOrder.jsx
@@ -58,16 +58,24 @@ const Rest = (props) => {
             setLoading(false)
          });
    }
-
+console.log('nextTableData',tableData)
    let columns = [{
       title: '序号',
       dataIndex: 'index',
       render: (text, record, index) => index + 1
+   },{
+      title: '事项名称',
+      dataIndex: 'fsFormItemName',
+      render: (text, record, index) => {
+         
+         return record?.fsFormItemName || ''
+      }
    }, {
       title: '项目名称',
       dataIndex: 'pomsProject',
       render: (text, record, index) => {
-         return record?.pomsNeedData?.projectName?.value || ''
+         console.log('recordstay',record)
+         return record?.pomsNeedData?.pomsProjectId?.value || ''
       }
    }, {
       title: '申请内容描述',
@@ -113,13 +121,7 @@ const Rest = (props) => {
    //       return record?.pomsNeedData?.handlingResult?.value || ''
    //    }
    // },
-   {
-      title: '事项名称',
-      dataIndex: 'fsFormItemName',
-      render: (text, record, index) => {
-         return record?.fsFormItemName || ''
-      }
-   },
+   
    {
       title: '问题类型',
       dataIndex: 'issueType',
diff --git a/web/client/src/utils/parseProcessData.js b/web/client/src/utils/parseProcessData.js
index c5b7097..bdf5e26 100644
--- a/web/client/src/utils/parseProcessData.js
+++ b/web/client/src/utils/parseProcessData.js
@@ -86,6 +86,10 @@ export const parseProcessData = (applyDetail, pomsNeedData = {
    title: {
       keyWord: '标题',
    },
+   detail:{
+      keyWord: '问题详情'
+   },
+   
    pomsProjectId: {
       keyWord: '关联项目',
       fromDataSource: true