feat: 样式调整新增悬浮后判断审批条件若已审批则不展示操作

bak
刘释隆 1 year ago
parent 8940f6c554
commit 4b64a4c25f

@ -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,

@ -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'">

@ -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

@ -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>

@ -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>

Loading…
Cancel
Save