From 4b64a4c25fed5847eb279b537cf615666841c464 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 15:05:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=AC=E6=B5=AE=E5=90=8E=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9D=A1=E4=BB=B6=E8=8B=A5=E5=B7=B2=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=99=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue      |  2 +-
 src/views/task/aside/ListItem.vue       |  2 +-
 src/views/task/content/Content.vue      |  5 +++++
 src/views/worksheet/aside/ListItem.vue  |  2 +-
 src/views/worksheet/content/Content.vue | 15 +++++++++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 2eac964..e9dce18 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -23,7 +23,7 @@ let _masonry: null | Masonry = null
 let _imagesload: any
 const masonryRef = ref<ComponentRef>(null)
 const el = ref<HTMLDivElement | null>(null)
-const viewMode = ref('masonry')
+const viewMode = ref('tile')
 const pagination = reactive({
   pageNo: 0,
   pageSize: 30,
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index bd0d1ee..309b87b 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -39,7 +39,7 @@ const svgName = computed(() => {
             任务ID:{{ listItem.fromtaskname }}
           </span>
         </div>
-        <SvgIcon v-show="selected" size="14" name="more-ver" />
+        <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
       <ul class="list-item-detail" v-else>
         <li v-if="item.id == 'statshisText'">
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index d4f690b..172647b 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -238,6 +238,7 @@ watch(
     if (isEmpty(taskId))
       return
     taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
+    console.log(taskDetailInfo.value,'taskDetailInfo')
     getTableData()
     // TODO mock备份 确认逻辑无误后删除
     // let showFieldData = taskDetailInfo.value.ocrPicture;
@@ -282,6 +283,10 @@ const currentTaskId = computed(() => {
 
 function overTaskHandle() {
   const item = taskDetailInfo.value
+  if(item?.userapprove?.statshis == 2 || item?.userapprove?.statshis == 3){
+    overTask.value = null;
+    return
+  }
 
   if (validate([item]) == null && batch.value === false)
     overTask.value = item
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index de8de02..4a6d623 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -39,7 +39,7 @@ const svgName = computed(() => {
           </span>
           <span class="list-item-header-selected">({{ listItem.pictureno }})</span>
         </div>
-        <SvgIcon v-show="selected" size="14" name="more-ver" />
+        <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
       <ul class="list-item-detail" v-else>
         <li>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 84ea06f..2856fa2 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -7,6 +7,7 @@ import imagesloaded from "imagesloaded";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { PictureSortParam, SetTFParam } from "/#/api";
 import { useWorkOrder } from "@/store/modules/workOrder";
+import { formatToDateHMS } from '@/utils/dateUtil'
 import {
   clearTF,
   getPackageTaskList,
@@ -453,6 +454,10 @@ function previewHandler(event: MouseEvent) {
                 name="zhen"
               />
             </div>
+            <div class="time">
+          <SvgIcon color="#FFF" size="16" name="time" />
+          <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
+        </div>
             <!-- 右下信息 -->
             <div class="info">
               <n-grid x-gap="16" y-gap="0" :cols="12">
@@ -916,4 +921,14 @@ function previewHandler(event: MouseEvent) {
   margin-top: 12px;
   margin-bottom: 12px;
 }
+
+.time {
+        position: absolute;
+        z-index: 3;
+        left: 2%;
+        bottom: 2%;
+        color: #fff;
+        display: flex;
+        align-items: center;
+      }
 </style>