Merge pull request 'fix:通过不通过快捷键问题修改' (#146) from fix/changeimgback into test

Reviewed-on: #146

src/components/Approval/NotPassed.vue

@@ -4,7 +4,7 @@ import { useMessage } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { audit } from '@/api/task/task'
 
-const emit = defineEmits(['success'])
+const emit = defineEmits(['success','close'])
 const message = useMessage()
 const loading = ref(false)
 
@@ -42,6 +42,7 @@ function showModal(value) {
 
 function closeModal() {
   show.value = false
+     emit('close')
 }
 
 defineExpose({

src/views/task/content/Content.vue

@@ -157,9 +157,17 @@ function handleKeydown(event) {
 
     // 如果两次按键时间间隔小于我们设定的双击间隔，则认为是双击
     if (now - lastKeyPressTime < doubleClickInterval) {
-      // 清除已经设置的定时器（如果有的话）
-      clearTimeout(keyPressTimer);
+       const item = taskDetailInfo.value;
+      if (
+        item?.userapprove?.statshis === 2 ||
+        item?.userapprove?.statshis == 3
+      ) {
+        overTask.value = null;
+        return;
+      }
 
+      if (validate([item]) == null && batch.value === false)
+        overTask.value = item;
       // 执行想要的操作
       const modal = unref(notPassModalRef)! as any;
       modal.showModal([taskDetailInfo.value]);
@@ -270,8 +278,9 @@ function approvalHandler(items?: any) {
     negativeText: "取消",
     onPositiveClick: () => {
       doAudit(param);
+       overTask.value = null;
     },
-    onNegativeClick: () => {},
+    onNegativeClick: () => {overTask.value = null;},
   });
 }
 
@@ -334,7 +343,7 @@ async function addSuspicious() {
     const res = await dubiousfileyd({
       pictureid: taskDetailInfo.value.ocrPicture.id,
     });
- console.log(res)
+
   if (res.code === "OK") {
       message.success("加入成功");
       setBatch(false);
@@ -461,6 +470,7 @@ async function getDetail() {
 function notPassSuccess(param) {
   batchModalRef.value.reload();
   reloadList(param, "不通过");
+  overTask.value=null
 }
 
 function reloadList(param, text) {
@@ -507,6 +517,9 @@ function overTaskHandelr(item: any) {
   if (validate([item]) == null && batchtwo.value === false)
     overTasktwo.value = item;
 }
+function closePassno(){
+    overTask.value=null
+}
 </script>
 
 <template>
@@ -1092,7 +1105,7 @@ function overTaskHandelr(item: any) {
         </div>
       </div>
     </div>
-    <NotPassed ref="notPassModalRef" @success="notPassSuccess" />
+    <NotPassed ref="notPassModalRef" @success="notPassSuccess"  @close="closePassno"/>
     <BatchModal
       ref="batchModalRef"
       @reject="rejectHandler"