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(null) const el = ref(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 }} - +
  • 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(() => { ({{ listItem.pictureno }}) - +
    • 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" /> +
      + + {{ formatToDateHMS(taskDetailInfo.createdate || 0) }} +
      @@ -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; + }