From 643c6d5b50151e820b28572272941b13507e7315 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Sun, 28 Apr 2024 23:23:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E8=AF=95=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataHeader/index.vue           | 11 ++++++-
 src/views/final/comp/RepeatTaskTableModal.vue |  5 +--
 src/views/final/content/ListContent.vue       | 33 ++++++++++++++-----
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index bb1994a..00cf6c8 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { defineProps, onMounted, ref,watch } from "vue";
+import { defineProps, onMounted, ref,watch,onBeforeMount } from "vue";
 import { gettaskToolsCount } from "@/api/home/main";
 import { useDataHeaderStore } from '@/store/modules/DataHeader'
 defineProps({
@@ -55,9 +55,17 @@ function initRem() {
   const scale = window.innerWidth / designWidth;
   document.documentElement.style.fontSize = `${scale * rempPx}px`;
 }
+
+
 onMounted(() => {
+ 
   initRem();
   getData();
+  setTimeout(() => {
+    headerstore.setDataConfig(false)
+   // alert(headerstore.DataConfig)
+  }, 500);
+ // headerstore.setDataConfig(false)
 });
 
 async function getData() {
@@ -117,6 +125,7 @@ async function getData() {
 watch(
   () => headerstore.DataConfig,
   (newval) => {
+ 
     if(headerstore.DataConfig){
     getData();
   headerstore.setDataConfig(false)
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index ac3e9e1..b47f1d7 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -330,10 +330,11 @@ function doAudit(param: any) {
       audit(param).then((res) => {
         const { code } = res
         if (code === 'OK') {
-          haeaderstore.setDataConfig(true)
+   
           message.success(res.message)
           reload()
-        }
+          haeaderstore.setDataConfig(true)
+   }
         else { message.error(res.message) }
       })
     },
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index d54205e..fb2ed67 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -11,8 +11,9 @@ import { getFinalList } from '@/api/final'
 import { useFinal } from '@/store/modules/final'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { audit } from '@/api/task/task'
-import { useDataHeaderStore } from '@/store/modules/DataHeader'
+import DataHeader from '@/components/DataHeader/index.vue'
 import NotPassed from '@/components/Approval/NotPassed.vue'
+import { useDataHeaderStore } from '@/store/modules/DataHeader'
 
 const props = defineProps({
 
@@ -22,6 +23,8 @@ const props = defineProps({
   },
 })
 const emit = defineEmits(['changeShow'])
+const aa=ref(true)
+const haeaderstore=useDataHeaderStore()
 const dialog = useDialog()
 const message = useMessage()
 const router = useRouter()
@@ -45,8 +48,8 @@ const selectionIds = ref([])
 const showActions = computed(() => {
   return selectionIds.value.length
 })
-const haeaderstore=useDataHeaderStore()
 
+console.log(haeaderstore)
 function handleCheck(row: any, showcheck: any) {
   if (showcheck == false) {
     console.log(tableData.value)
@@ -300,31 +303,41 @@ function actionHandler(action: any, row: any) {
 }
 // 审核通过
 function doAudit(param: any, row: any) {
+
   dialog.info({
     title: '确认提示',
     content: '确认给该任务审批为【通过】吗?',
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {
-      audit(param).then((res) => {
+
+audit(param).then((res) => {
+ aa.value=false        
         const { code } = res
         if (code === 'OK') {
           message.success(res.message)
           // changecardstatus(3, row);
           initData(1, 20, {}, props.taskvalue)
           num = 1
-          reload()
+     
+      reload()
+      aa.value=true
           selectionIds.value = []
-           haeaderstore.setDataConfig(true)
+       
         }
         else {
           message.error(res.message)
           selectionIds.value = []
         }
       })
+         // alert("X")
+
+
+          //  haeaderstore.setDataConfig(true)
     },
     onNegativeClick: () => {},
   })
+
 }
 // 单个审批通过
 function singleApproval(row) {
@@ -473,9 +486,13 @@ function changesort(sortnamex) {
   num = 1
 }
 function notpass() {
+aa.value=false
   initData(1, 20, {}, props.taskvalue)
-  selectionIds.value = []
-   haeaderstore.setDataConfig(true)
+
+selectionIds.value = []
+  // haeaderstore.setDataConfig(true)
+
+aa.value=true
 }
 watch(
   () => finalStore.asideValue,
@@ -578,7 +595,7 @@ defineExpose({
     </div>
 
     <div class="header_data">
-      <DataHeader :has-color="true" />
+      <DataHeader :has-color="true" v-if="aa"/>
     </div>
     <div class="wrapper-settings">
       <div>
-- 
2.39.3