diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue index eb0781f..1c0047e 100644 --- a/src/views/projectdemand/demandcollection/detail.vue +++ b/src/views/projectdemand/demandcollection/detail.vue @@ -68,7 +68,7 @@ -
+
驳回 同意
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue index a4bfb44..aa63a86 100644 --- a/src/views/projectdemand/demandcollection/index.vue +++ b/src/views/projectdemand/demandcollection/index.vue @@ -71,7 +71,7 @@ const tableConfig = reactive({ prop: 'state', label: '状态', align: 'center', - width:200, + width: 200, showOverflowTooltip: false, currentRender: ({row, index}) => () }, @@ -81,12 +81,27 @@ const tableConfig = reactive({ align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { + let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}] + if (row.state === '3' || row.state === '2') { + btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'}) + btn.push({label: '删除', func: () => handleDel(row), type: 'danger'}) + }else if (row.state === '4'){ + btn.push({label: '上报', func: () => handleReport(row), type: 'primary'}) + } return ( -
- handleDetail(row)}>详情 - - handleEdit(row)}>编辑 - handleReport(row)}>上报 +
+ { + btn.map(item => ( + item.func()} + link + > + {item.label} + + )) + }
) } diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue index 36acd65..ef615b6 100644 --- a/src/views/workflow/process/nodes/Node.vue +++ b/src/views/workflow/process/nodes/Node.vue @@ -24,7 +24,7 @@