From 4a1e137707d937c96ef01fe9e3a2a78d777cba08 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 22:27:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BE=E5=AE=A1=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=8E=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/modal/PackageSettingsModal.vue    |  6 ++--
 src/views/worksheet/aside/Aside.vue           | 16 +++++-----
 src/views/worksheet/aside/WorkSheetList.vue   |  8 ++++-
 src/views/worksheet/content/Content.vue       |  5 ++--
 src/views/worksheet/index.vue                 | 30 ++++++++++++-------
 src/views/worksheet/modal/ApprovalModal.vue   |  5 ++--
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index bb22889..d817e38 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -84,11 +84,11 @@ function afterLeave() {
           <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
             <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
           </n-form-item>
-          <n-form-item path="mark" :style="formItemStyle">
-            <n-checkbox v-model:checked="model.mark">
+          <!-- <n-form-item path="mark" :style="formItemStyle">
+            <n-checkbox v-model:checked="model.mark" >
               是否给重复图片增加重复标识
             </n-checkbox>
-          </n-form-item>
+          </n-form-item> -->
         </n-form>
       </div>
       <template #footer>
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index cc9c9e6..525764d 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -14,12 +14,14 @@ onMounted,
 ref,
 unref,
 toRaw,
-watch
+watch,
+defineEmits
 } from "vue";
 import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
 import WorkSheetList from "./WorkSheetList.vue";
 
 defineOptions({ name: "AsideContent" });
+const emit = defineEmits(["ApprovalOver"]);
 
 const collapse = ref(false);
 const workStore = useWorkOrder();
@@ -151,6 +153,10 @@ const inputHandler = debounce((word) => {
   searchKeyword.value = word;
   (packageListRef.value as any).search(word);
 }, 500);
+
+const ApprovalOver = (packageId)=>{
+  emit('ApprovalOver',packageId)
+}
 </script>
 
 <template>
@@ -210,12 +216,9 @@ const inputHandler = debounce((word) => {
       class="work-sheet-list"
       :showFieldList="showFieldList"
       :dicts="dicts"
+      @ApprovalOver="ApprovalOver"
     />
-    <CustomFieldModalVue
-      ref="filterModalRef"
-      :review-type="1"
-      @onOk="getshowFieldList"
-    />
+    <CustomFieldModalVue ref="filterModalRef" :review-type="1" @onOk="getshowFieldList" />
   </div>
 </template>
 
@@ -279,5 +282,4 @@ const inputHandler = debounce((word) => {
     z-index: 10;
   }
 }
-
 </style>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 039b0a6..b9b5641 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -10,6 +10,8 @@ import ApprovalModal from "../modal/ApprovalModal.vue";
 import ListItem from "./ListItem.vue";
 import type { PackageListItem } from "/#/workorder";
 
+const emit = defineEmits(["ApprovalOver"]);
+
 defineProps({
   showFieldList: {
     type: Array,
@@ -136,13 +138,17 @@ function dismisClick(packageId: string) {
     }
   });
 }
+const ApprovalOver = (packageId) => {
+  emit("ApprovalOver",packageId);
+};
+
 defineExpose({
   search,
 });
 </script>
 
 <template>
-  <ApprovalModal ref="approvalModalRef" @not-pass="notPass" />
+  <ApprovalModal ref="approvalModalRef" @not-pass="notPass" @reject="ApprovalOver" />
   <NotPassed ref="notPassedRef" />
   <n-spin :show="isLoading">
     <div ref="el" class="list">
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 01b09d3..2a18667 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -188,8 +188,6 @@ watch(
   () => workStore.activeId,
   async (newValue, oldValue) => {
     const packageid = workStore.getActiveId;
-
-
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
@@ -381,6 +379,9 @@ function reloadList() {
   setBatch(false)
   refreshHandler()
 }
+defineExpose({
+  queryDetail
+})
 </script>
 
 <template>
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index 22109af..5c8c3c2 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -1,22 +1,30 @@
 <script lang="ts" setup>
-import DataHeader from '@/components/DataHeader/index.vue';
-import Aside from './aside/Aside.vue';
-import Content from './content/Content.vue';
+import DataHeader from "@/components/DataHeader/index.vue";
+import { ref } from "vue";
+import Aside from "./aside/Aside.vue";
+import Content from "./content/Content.vue";
+import { useWorkOrder } from "@/store/modules/workOrder";
+const workStore = useWorkOrder();
+const contentRef: any = ref(null);
+const ApprovalOver = (packageId) => {
+  const id: string = workStore.getActiveId;
+  contentRef.value.queryDetail(id);
+};
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%">
     <div class="header">
-      <DataHeader  v-show="false"/>
+      <DataHeader v-show="false" />
     </div>
-  <div class="main">
-    <!-- 侧边 -->
-    <Aside />
+    <div class="main">
+      <!-- 侧边 -->
+      <Aside @ApprovalOver="ApprovalOver" />
 
-    <!-- 内容 -->
-    <Content />
+      <!-- 内容 -->
+      <Content ref="contentRef" />
+    </div>
   </div>
-</div>
 </template>
 
 <style lang="less" scoped>
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 5aabc13..85324f5 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -8,7 +8,7 @@ import { getToolsCount } from "@/api/home/main";
 import { storage } from "@/utils/Storage";
 import { CURRENT_USER } from "@/store/mutation-types";
 const emit = defineEmits<{
-  (e: "reject", params: any);
+  (e: "reject", params?: any);
   (e: "notPass", params: any);
 }>();
 const message = useMessage()
@@ -62,6 +62,7 @@ const handleReject = async () => {
   }else{
     message.error(res.message)
   }
+  emit('reject',state.packageid)
   closeModal();
 };
 
@@ -139,7 +140,7 @@ defineExpose({
         <div class="item">
           <div class="imgwrapper" />
           <div class="content">
-            <div class="task_id">#AI任务包{{ detail.packageId }}</div>
+            <div class="task_id">{{ detail.packageName }}</div>
             <div class="tag_box">
               <div class="tag_item error">
                 <span style="color: red"><SvgIcon name="error_icon" size="14"/></span> 重复图片({{