fix: update

src/views/final/comp/Action.vue

@@ -20,6 +20,7 @@ const actionConfig = {
   3: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }],
   4: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }],
   2: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }],
+  5: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }],
 }
 
 const actions = computed(() => {

src/views/task/content/Content.vue

@@ -1,12 +1,4 @@
 <script lang="ts" setup>
-import { getAllfieldList } from '@/api/home/filter'
-import { audit } from '@/api/task/task'
-import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
-import { useTask } from '@/store/modules/task'
-import { useUser } from '@/store/modules/user'
-import { isEmpty } from '@/utils'
-import { hideDownload } from '@/utils/image'
-import emitter from '@/utils/mitt'
 import { chunk, clone } from 'lodash-es'
 import { useDialog, useMessage } from 'naive-ui'
 import { computed, onUnmounted, reactive, ref, unref, watch } from 'vue'
@@ -15,7 +7,16 @@ import ConfrimModal from '../modal/ConfrimModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
 import TaskTable from './TaskTable.vue'
+import { getAllfieldList } from '@/api/home/filter'
+import { audit } from '@/api/task/task'
+import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
+import { useTask } from '@/store/modules/task'
+import { useUser } from '@/store/modules/user'
+import { isEmpty } from '@/utils'
+import { hideDownload } from '@/utils/image'
+import emitter from '@/utils/mitt'
 import type { ApprovalParam, PictureSortParam } from '/#/api'
+import { formatToDateHMS } from '@/utils/dateUtil'
 
 const batch = ref(false)
 const selectItems = ref<any[]>([])
@@ -349,6 +350,18 @@ function getPercent(pictureid: string) {
             @click.stop="rejectHandler"
           />
         </div>
+        <div class="check">
+          <n-checkbox
+            v-show="batch"
+            v-model:checked="taskDetailInfo.checked"
+            @click.stop
+            @update:checked="onCheckChange($event, taskDetailInfo)"
+          />
+        </div>
+        <div class="status">
+          <SvgIcon v-show="taskDetailInfo?.states === 4" width="134" height="129" name="p1" />
+          <SvgIcon v-show="taskDetailInfo?.states === 3" width="134" height="129" name="p2" />
+        </div>
         <div class="mark">
           <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
         </div>
@@ -379,7 +392,7 @@ function getPercent(pictureid: string) {
         </div>
         <div class="time">
           <SvgIcon color="#FFF" size="16" name="time" />
-          <span>2023-09-17 13:09:10</span>
+          <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
         </div>
         <div style="display: none;">
           <n-image ref="imageRef" :img-props="{ onClick: hideDownload }" :src="taskDetailInfo?.ocrPicture?.imgurl" />
@@ -589,6 +602,20 @@ function getPercent(pictureid: string) {
         flex-direction: column;
         justify-content: center
       }
+
+      .check{
+        position: absolute;
+        z-index: 3;
+        left: 2%;
+        top: 2%;
+      }
+
+      .status{
+        position: absolute;
+        z-index: 3;
+        left: 3%;
+        top: 3%;
+      }
     }
 
     .right {

src/views/task/modal/BatchModal.vue

@@ -1,9 +1,10 @@
 <script lang="ts" setup>
-import { computed, onMounted, onUpdated, reactive, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, onUpdated, reactive, ref, watch } from 'vue'
 import Masonry from 'masonry-layout'
 import { useInfiniteScroll } from '@vueuse/core'
 import { debounce } from 'lodash-es'
 import imagesloaded from 'imagesloaded'
+import { useMessage } from 'naive-ui'
 import { timeOptions, viewOptions } from '@/config/home'
 import { off, on } from '@/utils/domUtils'
 import { useTask } from '@/store/modules/task'
@@ -46,10 +47,10 @@ const el = ref<HTMLDivElement | null>(null)
 const listData = ref<any[]>([])
 const taskDetailInfo = ref<any>({})
 const pagination = reactive({
-  pageNo: 1,
+  pageNo: 0,
   pageSize: 30,
 })
-let loading = false
+const loading = ref(false)
 let _masonry: null | Masonry = null
 const show = ref(false)
 const sortBy: PictureSortParam = {
@@ -57,6 +58,8 @@ const sortBy: PictureSortParam = {
   orderbyvalue: 'fromuptime',
 }
 const batch = ref(false)
+let _imagesload: any
+const message = useMessage()
 
 const layout = debounce(() => {
   if (!show.value)
@@ -72,13 +75,18 @@ const layout = debounce(() => {
     stagger: 10,
   })
 
-  imagesloaded('.grid-item', () => {
+  _imagesload = imagesloaded('.grid-item')
+
+  _imagesload.on('done', (instance) => {
     (_masonry as any).layout()
-    const scrollHeight = el.value!.scrollHeight
-    const clientHeight = el.value!.clientHeight
-    const top = scrollHeight - clientHeight - 20
-    el.value!.scrollTo({ top, behavior: 'instant' })
-    loading = false
+    if (!el.value)
+      return
+    loading.value = false
+  })
+
+  _imagesload.on('fail', (instance) => {
+    message.error('图片错误')
+    loading.value = false
   })
 }, 300)
 
@@ -96,27 +104,8 @@ useInfiniteScroll(
   { distance: 10, canLoadMore: () => canloadMore },
 )
 
-async function featchList() {
-  loading = true
-  try {
-    const packageid = taskStore.getPackageid
-    const taskId = taskStore.getActiveId
-
-    const res = await getTaskDetailPictureList(packageid, taskId, { ...pagination, ...sortBy })
-
-    const { data, pageCount } = res
-    pagination.pageNo += 1
-    canloadMore = pageCount >= pagination.pageNo
-
-    return data
-  }
-  catch (error) {
-    return []
-  }
-}
-
 async function loadMore() {
-  if (loading || el.value == null)
+  if (loading.value || el.value == null)
     return
 
   const packageid = taskStore.getPackageid
@@ -127,11 +116,28 @@ async function loadMore() {
 
   const more = await featchList()
   listData.value.push(...more)
+  nextTick(() => {
+    layout()
+  })
 }
 
-onUpdated(() => {
-  layout()
-})
+async function featchList() {
+  loading.value = true
+  try {
+    const packageid = taskStore.getPackageid
+    const taskId = taskStore.getActiveId
+
+    pagination.pageNo += 1
+    const { data, pageCount } = await getTaskDetailPictureList(packageid, taskId, { ...pagination, ...sortBy })
+    canloadMore = pageCount >= pagination.pageNo && pageCount > 0
+
+    return data
+  }
+  catch (error) {
+    canloadMore = false
+    return []
+  }
+}
 
 let start: { x: number, y: number } | null = null
 let selectionBox: HTMLDivElement | null
@@ -292,7 +298,17 @@ function getSelectItems() {
   return listData.value.filter(item => selectIds.value.includes(item.id))
 }
 
+function reset() {
+  pagination.pageNo = 0
+  pagination.pageSize = 30
+  listData.value.length = 0
+  loading.value = false
+  canloadMore = true
+  layout()
+}
+
 async function refreshHandler() {
+  reset()
   const packageid = taskStore.getPackageid
   const taskId = taskStore.getActiveId
 
@@ -301,13 +317,15 @@ async function refreshHandler() {
 
   taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
 
-  pagination.pageNo = 1
-  pagination.pageSize = 30
-  listData.value.length = 0
-
-  const list = await featchList()
-  listData.value = list
-  layout()
+  nextTick(() => {
+    useInfiniteScroll(
+      el as any,
+      () => {
+        loadMore()
+      },
+      { distance: 10, canLoadMore: () => canloadMore },
+    )
+  })
 }
 
 watch(() => taskStore.activeId, async (newValue, oldValue) => {
@@ -418,7 +436,7 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
                 >
                   <img
                     class="wrapper-content-item-img"
-                    :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgurl"
+                    :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.thumburl"
                   >
                   <div class="top">
                     <n-checkbox
@@ -614,7 +632,7 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
 
     .scroll {
       overflow-y: scroll;
-      height: calc(100vh - 320px);
+      height: calc(100vh - 420px);
     }
   }
 }

src/views/worksheet/content/Content.vue

@@ -248,10 +248,6 @@ const layout = debounce(() => {
   _imagesload.on('done', (instance) => {
     if (!el.value)
       return
-    // const scrollHeight = el.value!.scrollHeight
-    // const clientHeight = el.value!.clientHeight
-    // const top = scrollHeight - clientHeight - 100
-    // el.value!.scrollTo({ top, behavior: 'instant' })
     loading.value = false
   })