From af916f42c64181440eead95c8c90cf27e68d4763 Mon Sep 17 00:00:00 2001 From: dengbf Date: Tue, 16 Apr 2024 16:32:15 +0800 Subject: [PATCH] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=20#[1121760542425088]?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=8A=E6=8A=A5-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E8=81=94=E5=8A=A8=E5=A4=B1=E6=95=88?= =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947?= =?UTF-8?q?543040/939050947543057/1121760542425088?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processdetail/workorder/CenterDetail.vue | 17 ++++++++++++++--- .../processdispatch/workorder/form-setting.vue | 14 +++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue index c456afd7..3139ab0f 100644 --- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue +++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue @@ -1263,9 +1263,20 @@ export default { if (data.changePriority.includes(item.name)) { list.push(item); } - } - if (Array.isArray(data.changePriority)) { - if (data.changePriority.join('/').includes(item.name)) { + } else if (Array.isArray(data.changePriority)) { + let changePriority = []; + data.changePriority.forEach(c => { + if (typeof c === 'string') { + changePriority.push(c); + } else if (typeof c === 'object' && !this.$utils.isEmpty(c.value)) { + changePriority.push(c.value); + } + }); + if (changePriority.includes(item.name)) { + list.push(item); + } + } else if (typeof data.changePriority === 'object') { + if (!this.$utils.isEmpty(data.changePriority.value) && data.changePriority.value.includes(item.name)) { list.push(item); } } diff --git a/src/views/pages/process/task/processdispatch/workorder/form-setting.vue b/src/views/pages/process/task/processdispatch/workorder/form-setting.vue index c58555d2..edbd2f65 100644 --- a/src/views/pages/process/task/processdispatch/workorder/form-setting.vue +++ b/src/views/pages/process/task/processdispatch/workorder/form-setting.vue @@ -196,7 +196,19 @@ export default { list.push(item); } } if (Array.isArray(data.changePriority)) { - if (data.changePriority.join('/').includes(item.name)) { + let changePriority = []; + data.changePriority.forEach(c => { + if (typeof c === 'string') { + changePriority.push(c); + } else if (typeof c === 'object' && !this.$utils.isEmpty(c.value)) { + changePriority.push(c.value); + } + }); + if (changePriority.includes(item.name)) { + list.push(item); + } + } else if (typeof data.changePriority === 'object') { + if (!this.$utils.isEmpty(data.changePriority.value) && data.changePriority.value.includes(item.name)) { list.push(item); } } -- Gitee