fix : 审批人和当前节点合并

src/views/project-management/implementation/index.vue

@@ -170,11 +170,6 @@ const tableConfig = reactive({
       label: '项目名称',
       align: 'center'
     },
-    {
-      prop: 'approveName',
-      label: '审批人',
-      align: 'center'
-    },
     {
       prop: 'projectType',
       label: '项目类型',
@@ -244,9 +239,18 @@ const tableConfig = reactive({
       }
     },
     {
-      prop: 'taskNode',
-      label: '当前节点',
-      align: 'center'
+      prop: 'approveName',
+      label: '当前审批节点',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        if(row.state=='3'||row.state=='4'){
+          return <span>{row.taskNode}</span>
+        }else  if(row.state=='1'){
+          return <span>{row.approveName}</span>
+        }else {
+          return <span>--</span>
+        }
+      }
     },
     {
       prop: 'state',