diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 104d81a..b59ee2f 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -137,12 +137,7 @@ const tableConfig = reactive({
align: 'center',
// width: 200
},
- {
- prop: 'approveName',
- label: '审批人',
- align: 'center',
- // width: 100,
- },
+
{
prop: 'deadline',
label: '需求上报截止时间',
@@ -150,11 +145,25 @@ const tableConfig = reactive({
// width: 150,
},
{
- prop: 'taskNode',
- label: '当前节点',
+ prop: 'approveName',
+ label: '当前审批节点',
align: 'center',
- // width: 300
+ // width: 100,
+ currentRender: ({row, index}) => {
+ if(row.state=='1'){
+ return {row.approveName}
+ }else {
+ return {row.taskNode}
+ }
+ }
},
+ // {
+ // prop: 'taskNode',
+ // label: '当前审批节点',
+ // align: 'center',
+ // // width: 300
+ //
+ // },
{
prop: 'state',
label: '状态',
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index b74d541..4280731 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -167,11 +167,6 @@ const tableConfig = reactive({
label: '项目名称',
align: 'center'
},
- {
- prop: 'approveName',
- label: '审批人',
- align: 'center'
- },
{
prop: 'projectType',
label: '项目类型',
@@ -228,9 +223,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 {row.taskNode}
+ }else if(row.state=='1'){
+ return {row.approveName}
+ }else {
+ return --
+ }
+ }
},
{
prop: 'state',
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 7cfd10e..20f1969 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/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 {row.taskNode}
+ }else if(row.state=='1'){
+ return {row.approveName}
+ }else {
+ return --
+ }
+ }
},
{
prop: 'state',
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index ced95f4..c52659a 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -165,11 +165,6 @@ const tableConfig = reactive({
align: 'center'
},
- {
- prop: 'approveName',
- label: '审批人',
- align: 'center'
- },
{
prop: 'projectType',
label: '项目类型',
@@ -226,10 +221,24 @@ const tableConfig = reactive({
}
},
{
- prop: 'taskNode',
- label: '当前节点',
- align: 'center'
+ prop: 'approveName',
+ label: '当前审批节点',
+ align: 'center',
+ currentRender: ({row, index}) => {
+ if(row.state=='3'||row.state=='4'){
+ return {row.taskNode}
+ }else if(row.state=='1'){
+ return {row.approveName}
+ }else {
+ return --
+ }
+ }
},
+ // {
+ // prop: 'taskNode',
+ // label: '当前节点',
+ // align: 'center'
+ // },
{
prop: 'state',
label: '状态',