From ef1bfb679cb5cc21e0e8297e10d72d493970127c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 22:11:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=88=97=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BE=E5=AE=A1=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 12 ++++++--
 src/views/task/modal/CustomSettingModal.vue |  8 +++---
 src/views/worksheet/modal/ApprovalModal.vue | 31 ++++++++++++++-------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 95a4234..44574fa 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -257,7 +257,12 @@ const moveEnd = () => {
             <span style="font-size: 20px; color: #333333; font-weight: Medium">{{
               currentlySelectedAdvanced
             }}</span>
-            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" color="#999999"/>
+            <SvgIcon
+              :style="{ marginLeft: '5px' }"
+              name="down"
+              size="14"
+              color="#999999"
+            />
           </div>
         </template>
         <n-spin :show="loading">
@@ -265,7 +270,7 @@ const moveEnd = () => {
             <n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
               <n-form-item path="keyword">
                 <n-input
-                  :style="{ '--n-border': '0px' }"
+                  :style="{ '--n-border': '0px', '--n-display': 'block' }"
                   placeholder="请输入关键字"
                   @input="inputHandler"
                   :value="ruleForm.keyword"
@@ -429,4 +434,7 @@ const moveEnd = () => {
     align-items: center;
   }
 }
+::v-deep(.wrapper-left-popover .n-form-item){
+  display: block !important;
+}
 </style>
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 8fb0c1c..8f0e590 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -40,6 +40,9 @@ onMounted(async () => {
         Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
     };
     offList.value.push(item);
+    if(item.checked){
+      selectIds.value.push(item.id);
+    }
   });
 });
 
@@ -131,21 +134,18 @@ function onCheckAllChange(value) {
       ids.push(item.id);
     }
   }
-
   selectIds.value = value ? ids : [];
 }
 
 function onCheckChange(checked: any, item: any) {
   const index = selectIds.value.indexOf(item.id);
-
   item.checked = checked;
-
   if (index === -1 && checked) selectIds.value.push(item.id);
   else selectIds.value.splice(index, 1);
 }
 
 const indeterminate = computed(() => {
-  return offList.value.length > 0 && offList.value.length > selectIds.value.length;
+  return selectIds.value.length > 0 && offList.value.length > selectIds.value.length;
 });
 </script>
 
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 806ae27..28d04bb 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -11,6 +11,7 @@ const emit = defineEmits<{
   (e: "reject", params: any);
   (e: "notPass", params: any);
 }>();
+const message = useMessage()
 
 const dialog = useDialog();
 
@@ -33,25 +34,35 @@ function showModal(id) {
 }
 
 async function getDetail(id) {
-  console.log('getDetail',id)
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
   // id = "264626184091111068";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-    show.value = true;
+    if(Number(res.data.similarComplete) > 0){
+      show.value = true;
+    }
   }
 }
 
 const handleReject = async () => {
-  const res = await audit()
-  // const res = await setTF({
-  //   taskchildpictureids: state.detail.taskIdList.join(","),
-  //   packageid: state.packageid,
-  //   iztrueorfalse: 0,
-  // });
-  // console.log(res, "handleReject");
+  const param = {
+    result: false,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: state.detail.flowTaskInfoList,
+  }
+  const res = await audit(param)
+  if(res.code == 'OK'){
+    message.success(res.message)
+  }else{
+    message.error(res.message)
+  }
+  closeModal();
 };
 
 async function clearMark() {
@@ -138,7 +149,7 @@ defineExpose({
             </div>
             <div class="time_box">
               任务包生成时间：
-              {{ format(detail?.createtime || 0, "yyyy-MM-dd HH:mm:ss") }}
+              {{ format(detail?.createTime || 0, "yyyy-MM-dd HH:mm:ss") }}
             </div>
           </div>
         </div>