From 12f6f27b1a3808fd747ce22b6ba85c90951d770d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 17:36:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E4=B8=AD=E4=BA=BA=E5=91=98=E5=9B=9E=E6=98=BE,=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E6=9B=B4=E6=96=B0=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E6=9B=B4=E6=8D=A2=E4=BD=8D=E7=BD=AE,=E9=9C=80?=
=?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E9=80=89=E6=8B=A9=E6=A1=86=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project-demand/summary/index.vue | 15 +-
.../implementation/updateTable.vue | 4 +-
.../process/config/ApprovalNodeConfig.vue | 235 +++++++++---------
3 files changed, 132 insertions(+), 122 deletions(-)
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 62c0c39..d4a2fce 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -151,7 +151,10 @@ const tableConfig = reactive({
columns: [
{
type: 'selection',
- prop: 'selection'
+ prop: 'selection',
+ selectable: (row, index) => {
+ return row.state === '4';
+ }
},
{
prop: 'requirementName',
@@ -287,13 +290,17 @@ const headBtnClick = (key) => {
}
}
const selectionChange = (data) => {
- console.log('data', data)
+ console.log('data', data, tableIns.value.tableInstance)
+
+ data.forEach(item => {
+ // toggleRowSelection
+ })
projectSelectList.value = data
}
const handleExport = () => {
console.log('projectSelectList.value', projectSelectList.value)
- let projectIds=[]
- projectSelectList.value.map(item=>{
+ let projectIds = []
+ projectSelectList.value.map(item => {
projectIds.push(item.projectId)
})
if (projectSelectList.value.length > 0) {
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index eb4110a..b27a60e 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -9,10 +9,10 @@
- {{ tableForm.projectChargePersonName }}
-
+
{{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
+ {{ tableForm.projectChargePersonName }}
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 76b36cb..378e6e7 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -5,16 +5,17 @@
{{ item.name }}
-
-
-
+
+
+
-
+
选择人员
-
+
@@ -57,129 +58,130 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
高级设置
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+