From 47f0a9532302b4bdab197ccab41887537169a99e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 1 Nov 2024 17:56:21 +0800
Subject: [PATCH] =?UTF-8?q?2024-11-01=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/projectInfo/projectInfo.vue       | 27 +++++++++++++++++--
 .../project/projectPart/searchProjectPart.vue | 27 +++++++++++++++++--
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 4d41485..225d7f6 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -1168,7 +1168,29 @@
             status: true,
             fixed: '',
             columnWidth: 100
-          }
+          },
+          {
+            columnProp: 'nodeName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '当前节点',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+          {
+            columnProp: 'createBy2',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '当前节点审批人',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
         ],
         ossColumns:[
           {
@@ -1507,7 +1529,8 @@
       getChangeRecordList () {
         let tempData = {
           site: this.$store.state.user.site,
-          projectId: this.currentRow.projectId
+          projectId: this.currentRow.projectId,
+          menuId: '108002'
         }
         getChangeRecordByPartNo(tempData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index 73d1839..21f1cb0 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -709,7 +709,29 @@
               status: true,
               fixed: '',
               columnWidth: 100
-            }
+            },
+            {
+              columnProp: 'nodeName',
+              headerAlign: 'center',
+              align: 'center',
+              columnLabel: '当前节点',
+              columnHidden: false,
+              columnImage: false,
+              status: true,
+              fixed: '',
+              columnWidth: 120
+            },
+            {
+              columnProp: 'createBy2',
+              headerAlign: 'center',
+              align: 'center',
+              columnLabel: '当前节点审批人',
+              columnHidden: false,
+              columnImage: false,
+              status: true,
+              fixed: '',
+              columnWidth: 100
+            },
           ],
         }
       },
@@ -969,7 +991,8 @@
           let tempData = {
             site: this.$store.state.user.site,
             projectId: this.currentRow.projectId,
-            finalPartNo: this.currentRow.finalPartNo
+            finalPartNo: this.currentRow.finalPartNo,
+            menuId: '108002'
           }
           getChangeRecordByPartNo2(tempData).then(({data}) => {
             if (data && data.code === 0) {