From 4beede5e22ecb7467f50660a834cb07af0404ac8 Mon Sep 17 00:00:00 2001 From: zhouxiaoan <13598091228@139.com> Date: Tue, 16 Apr 2024 10:56:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A4=84=E7=90=86xx=E9=94=AE=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/content/Content.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index dd03454..2ab37b5 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -225,7 +225,6 @@ const packageName = computed(() => { const index = workStore.getCurrentIndex return workStore.getOrderList[index]?.name || '' }) - async function queryDetail(checkDuplicateId: any) { taskDetailInfo.value = await getTaskDetailInfo(checkDuplicateId) const packageid = workStore.getActiveId @@ -288,7 +287,7 @@ function onEsc(event: KeyboardEvent) { return if (!keys.includes(event.code)) return - + // if (event.code === 'KeyC') { // 是否有弹窗存在 const modalClasss = [ @@ -313,6 +312,10 @@ function onEsc(event: KeyboardEvent) { // 审核通过、不通过 批量审核弹窗任意一个存在都不进行下面的操作 if (rejectDialog.value || passDialog.value) return + // 只有未审批的数据才可以执行以下操作 1 未审批 2 审核通过 3 审核不通过 + if (taskDetailInfo.value.historyStates !== 1) + return + // 双击p键审核通过 if (code === 'KeyP') { const currentTime = Date.now() @@ -543,7 +546,7 @@ function handleRejectdubiousfileyd(pictureid) { if (code === 'OK') message.success('加入成功') - refreshHandler() + // refreshHandler() const packageid = workStore.getActiveId if (isEmpty(packageid)) { listData.value.length = 0 From 78d5f11abe4b0dd703b594e80bd0ea2e349247f5 Mon Sep 17 00:00:00 2001 From: zhouxiaoan <13598091228@139.com> Date: Tue, 16 Apr 2024 11:03:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A4=84=E7=90=86xx=E9=94=AE=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/content/Content.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 2ab37b5..4d3f03d 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -287,7 +287,6 @@ function onEsc(event: KeyboardEvent) { return if (!keys.includes(event.code)) return - // if (event.code === 'KeyC') { // 是否有弹窗存在 const modalClasss = [ @@ -545,8 +544,6 @@ function handleRejectdubiousfileyd(pictureid) { dubiousfileyd({ pictureid }).then(({ code }) => { if (code === 'OK') message.success('加入成功') - - // refreshHandler() const packageid = workStore.getActiveId if (isEmpty(packageid)) { listData.value.length = 0