Merge pull request 'feat: 图审弹窗操作后刷新数据功能添加，去掉选框' (#85) from feat/changeTitle into test

Reviewed-on: #85

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-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>

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
+    <CustomFieldModalVue ref="filterModalRef" :review-type="1" @onOk="getshowFieldList" />
-      ref="filterModalRef"
-      :review-type="1"
-      @onOk="getshowFieldList"
-    />
   </div>
 </template>
 
@@ -279,5 +282,4 @@ const inputHandler = debounce((word) => {
     z-index: 10;
   }
 }
-
 </style>

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">

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;
@@ -439,6 +437,9 @@ function reloadList() {
   setBatch(false)
   refreshHandler()
 }
+defineExpose({
+  queryDetail
+})
 </script>
 
 <template>

src/views/worksheet/index.vue

@@ -1,20 +1,28 @@
 <script lang="ts" setup>
-import DataHeader from '@/components/DataHeader/index.vue';
+import DataHeader from "@/components/DataHeader/index.vue";
-import Aside from './aside/Aside.vue';
+import { ref } from "vue";
-import Content from './content/Content.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" />
     </div>
     <div class="main">
       <!-- 侧边 -->
-    <Aside />
+      <Aside @ApprovalOver="ApprovalOver" />
 
       <!-- 内容 -->
-    <Content />
+      <Content ref="contentRef" />
     </div>
   </div>
 </template>

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> 重复图片({{