From 4a3fba0b13a6863a6b1c6e976e3349abe23653bc Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Thu, 18 Apr 2024 21:59:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=89=E4=B8=AD=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=90=8E=E5=8A=A8=E6=80=81=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/Content.vue     | 19 +++++++++--
 src/views/final/content/ListContent.vue | 45 ++++++++++++++++++++-----
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 99c2ec3..8118947 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -555,7 +555,7 @@ async function handlePageChange(currentPage) {
     return
   const { pageSize } = pagination
   pagination.page = currentPage
-  await query(currentPage, pageSize)
+  await query(currentPage, pageSize,{},props.taskvalue)
 }
 async function handlePageSizeChange(currentPageSize) {
   if (loading.value)
@@ -564,7 +564,7 @@ async function handlePageSizeChange(currentPageSize) {
   const { page } = pagination
   pagination.pageSize = currentPageSize
 
-  await query(page, currentPageSize)
+  await query(page, currentPageSize,{},props.taskvalue)
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
@@ -864,7 +864,7 @@ function reload() {
   const { page, pageSize } = unref(
     tableRef.value?.pagination,
   ) as PaginationProps
-  query(page!, pageSize!)
+  query(page!, pageSize!,{},props.taskvalue)
 }
 
 watch(
@@ -909,6 +909,19 @@ function filterTableData(keyword) {
 async function initData(pageSize, page,  filterId?: any,
   taskName?: string) {
   const asideParmas = unref(finalStore.getAsideValue)
+   if (asideParmas.izyear) {
+    asideParmas.izuptime = cloneDeep(asideParmas.izyear)
+    if (typeof asideParmas.izuptime == 'object') {
+      asideParmas.izuptime[0] = dayjs(asideParmas.izuptime[0]).format(
+        'YYYY/MM/DD',
+      )
+      asideParmas.izuptime[1] = dayjs(asideParmas.izuptime[1]).format(
+        'YYYY/MM/DD',
+      )
+      asideParmas.izuptime = asideParmas.izuptime.join('-')
+      delete asideParmas.izyear
+    }
+  }
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index b1d295b..3261ece 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -10,6 +10,8 @@ import { getFinalList } from '@/api/final'
 import { useFinal } from '@/store/modules/final'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { audit } from '@/api/task/task'
+import dayjs from 'dayjs'
+import { cloneDeep } from 'lodash-es'
 import NotPassed from '@/components/Approval/NotPassed.vue'
 
 const emit = defineEmits(['changeShow'])
@@ -97,6 +99,20 @@ async function initData(
   taskName?: string,
 ) {
   const asideParmas = unref(finalStore.getAsideValue)
+  if(asideParmas.izyear){
+   // console.log(asideParmas.izyear)
+    // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
+    // asideParmas.izuptime = asideParmas.izyear.split(",");
+     let ontime = dayjs(asideParmas.izyear[0]).format(
+        'YYYY/MM/DD',
+      )
+     let twotime = dayjs(asideParmas.izyear[1]).format(
+        'YYYY/MM/DD',
+      )
+      asideParmas.izuptime =ontime+"-"+twotime
+     // delete asideParmas.izyear
+    
+  }
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
@@ -115,10 +131,10 @@ async function initData(
     ...params,
   })
   const { data, pageCount, totalCount } = result
-  console.log(data, pageCount, totalCount)
+  //console.log(data, pageCount, totalCount)
   // tableData.value =  tableData.value.concat(data);
   tableData.value = data
-  console.log(tableData.value)
+ // console.log(tableData.value)
   total.value = totalCount
   pagination.page = page
   pagination.pageCount = Math.ceil(totalCount / pageSize)
@@ -142,7 +158,20 @@ async function query(
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
-
+  if(asideParmas.izyear){
+   // console.log(asideParmas.izyear)
+    // asideParmas.izuptime = cloneDeep(asideParmas.izyear)
+    // asideParmas.izuptime = asideParmas.izyear.split(",");
+     let ontime = dayjs(asideParmas.izyear[0]).format(
+        'YYYY/MM/DD',
+      )
+     let twotime = dayjs(asideParmas.izyear[1]).format(
+        'YYYY/MM/DD',
+      )
+      asideParmas.izuptime =ontime+"-"+twotime
+     // delete asideParmas.izyear
+    
+  }
 let params = asideParmas;
   if(params?.izshowall==false){
     params.isFail=false
@@ -282,7 +311,7 @@ function doAudit(param: any, row: any) {
         if (code === 'OK') {
           message.success(res.message)
           // changecardstatus(3, row);
-          initData(1, 20)
+    initData(1, 20,{},props.taskvalue)
           num = 1
           reload()
         }
@@ -405,7 +434,7 @@ function checkBottom() {
     if (scrollTop + clientHeight >= scrollHeight - 10) {
       num = num + 1
       console.log(num)
-      query(num, 20)
+      query(num, 20,{},props.taskvalue)
       //  fetchData(); // 接近底部时加载更多数据
     }
   }, 500)
@@ -435,13 +464,13 @@ function changesort(sortnamex) {
     sortorder.value = 'asc'
     sortname.value = 'field1'
   }
-  initData(1, 20)
+    initData(1, 20,{},props.taskvalue)
   num = 1
 }
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    initData(1, 20)
+    initData(1, 20,{},props.taskvalue)
       num=1
   },
   { deep: true },
@@ -685,7 +714,7 @@ defineExpose({
         </div>
       </div>
     </div>
-    <NotPassed ref="notPassModalRef" @success="initData(1, 20)" />
+    <NotPassed ref="notPassModalRef" @success="    initData(1, 20,{},props.taskvalue)" />
     <RepeatModal
       ref="repeatModalRef"
       @reject="repeatBatchReject"