Compare commits

..

No commits in common. 'b8658578d869f5aa65b68062c1cfe72954442af9' and '354e91e0f66090404a03746d16e0a5299015251b' have entirely different histories.

@ -31,7 +31,7 @@ async function handlerSearch(value) {
if (res.code === 'OK') { if (res.code === 'OK') {
state.resultList = [ state.resultList = [
{ {
title: '图检审批', title: '图审审批管理',
path: 'worksheet', path: 'worksheet',
data: res.data.ai, data: res.data.ai,
}, },

@ -38,7 +38,7 @@ const routes: Array<RouteRecordRaw> = [
path: 'final-detail', path: 'final-detail',
name: 'final-detail', name: 'final-detail',
meta: { meta: {
title: '任务详情', title: '任务终审详情',
}, },
component: () => import('@/views/task/content/Content.vue'), component: () => import('@/views/task/content/Content.vue'),
}, },

@ -34,7 +34,7 @@ export const useAsideConfigStore = defineStore({
return this.customConfig return this.customConfig
}, },
getAsideValue(): any { getAsideValue(): any {
return this.asideValue || {} return this.asideValue
}, },
getSearchValue(): any { getSearchValue(): any {
return this.searchValue return this.searchValue

@ -1,8 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, toRefs } from 'vue' import { reactive, ref, toRefs } from 'vue'
import listDark from 'naive-ui/lib/mention/styles/dark' import { repetitionTask } from '@/api/final/index'
import { getRepeatList, repetitionTask } from '@/api/final/index'
const emit = defineEmits<{ const emit = defineEmits<{
(e: 'reject', params: any) (e: 'reject', params: any)
@ -46,30 +45,17 @@ function closeModal() {
show.value = false show.value = false
} }
async function query() { async function reject() {
const result = await getRepeatList({ const list = []
sortorder: 'asc', state.detail.forEach((items) => {
pageSize: 300, items.repeatedTaskList.forEach((item) => {
pageNo: 1, list.push(item)
sortname: '', })
}) })
const { data } = result emit('reject', list)
// console.log(data)
// // const list = []
// // data.forEach((items) => {
// // items.repeatedTaskList.forEach((item) => {
// // list.push(item)
// // })
// // })
// console.log(data)
emit('reject', data)
closeModal() closeModal()
} }
async function reject() {
query()
}
async function viewRepeat(e: MouseEvent) { async function viewRepeat(e: MouseEvent) {
emit('viewrepeat') emit('viewrepeat')
e.preventDefault() e.preventDefault()

@ -64,13 +64,10 @@ const columns: DataTableColumns<RowData> = [
title: '任务ID', title: '任务ID',
key: 'id', key: 'id',
fixed: 'left', fixed: 'left',
width: 200, width: 180,
ellipsis: { ellipsis: {
tooltip: true, tooltip: true,
}, },
render(row: any) {
return row.fromtaskid
},
}, },
{ {
title: '任务名称', title: '任务名称',
@ -359,7 +356,6 @@ function showModal() {
function reload() { function reload() {
selectionIds.value = [] selectionIds.value = []
checkedRowKeys.value = [] checkedRowKeys.value = []
query(pagination.page, pagination.pageSize)
} }
function goDetail(row) { function goDetail(row) {

File diff suppressed because it is too large Load Diff

@ -5,10 +5,9 @@ import Content from './content/Content.vue'
import ListContent from './content/ListContent.vue' import ListContent from './content/ListContent.vue'
const showList = ref(false); const showList = ref(false);
const contentRef:any = ref(null); const contentRef = ref(null);
const inputChange = (keyword)=>{ const inputChange = (keyword)=>{
contentRef.value.filterTableData(keyword) contentRef.value.filterTableData(keyword)
} }
</script> </script>

@ -54,7 +54,6 @@ function selectHandler(item: SearchEntity) {
// //
const searchName = () => { const searchName = () => {
configStore.setSearchValue(searchKeyword.value); configStore.setSearchValue(searchKeyword.value);
emit('inputChange',searchKeyword.value);
} }
const close = () => { const close = () => {

@ -387,7 +387,7 @@ async function commitHandler(settingParam) {
modal.showModal(); modal.showModal();
createPackage(params).then((res) => { createPackage(params).then((res) => {
if (res.code === "OK") { if (res.code === "OK") {
message.success(res.message); message.success(res.data);
packageIdRef.value = res.data.id; packageIdRef.value = res.data.id;
modal.closeModal(); modal.closeModal();
finishModal.showModal(); finishModal.showModal();

@ -1,5 +1,5 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineOptions, onMounted, ref, onBeforeUnmount } from 'vue'; import { defineOptions, ref } from 'vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
defineOptions({ name: 'ShortcutModal' }) defineOptions({ name: 'ShortcutModal' })
@ -36,17 +36,7 @@ function cancel() {
closeModal() closeModal()
emit('cancel', true) emit('cancel', true)
} }
const time = ref();
onMounted(() => {
time.value = setInterval(() => {
// console.log("00000000-----------");
show.value && refresh();
}, 5000);
});
onBeforeUnmount(() => {
clearInterval(time.value);
time.value = null;
});
defineExpose({ defineExpose({
showModal, showModal,
closeModal closeModal
@ -55,8 +45,7 @@ defineExpose({
<template> <template>
<div class="removeMask"> <div class="removeMask">
<!-- <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;"> --> <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
<div v-if="show" style="position: fixed;right: 0;bottom: 0; float: left; z-index: 999;" >
<n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;"> <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;">
<div class="wrapper"> <div class="wrapper">
<div class="title">查重进度</div> <div class="title">查重进度</div>
@ -74,8 +63,7 @@ defineExpose({
</div> </div>
</div> </div>
</n-card> </n-card>
</div> </n-modal>
<!-- </n-modal> -->
</div> </div>
</template> </template>

@ -84,11 +84,11 @@ function afterLeave() {
<n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称"> <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
<n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent /> <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
</n-form-item> </n-form-item>
<!-- <n-form-item path="mark" :style="formItemStyle"> <n-form-item path="mark" :style="formItemStyle">
<n-checkbox v-model:checked="model.mark"> <n-checkbox v-model:checked="model.mark">
是否给重复图片增加重复标识 是否给重复图片增加重复标识
</n-checkbox> </n-checkbox>
</n-form-item> --> </n-form-item>
</n-form> </n-form>
</div> </div>
<template #footer> <template #footer>

@ -1,32 +1,32 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, toRefs } from 'vue' import { reactive, ref, toRefs } from "vue";
import { format } from 'date-fns' import { format } from "date-fns";
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from "vue-router";
import { getMessageList, readAllMsg, readMsg } from '@/api/message/message' import { getMessageList, readAllMsg, readMsg } from "@/api/message/message";
import iconApproveActive from '@/assets/images/message/approve-active.png' import iconApproveActive from "@/assets/images/message/approve-active.png";
import iconApprove from '@/assets/images/message/approve.png' import iconApprove from "@/assets/images/message/approve.png";
import iconSystemActive from '@/assets/images/message/system-active.png' import iconSystemActive from "@/assets/images/message/system-active.png";
import iconSystem from '@/assets/images/message/system.png' import iconSystem from "@/assets/images/message/system.png";
import iconArrowActive from '@/assets/images/message/arrow-active.png' import iconArrowActive from "@/assets/images/message/arrow-active.png";
import iconArrow from '@/assets/images/message/arrow.png' import iconArrow from "@/assets/images/message/arrow.png";
import iconClear from '@/assets/images/message/clear.png' import iconClear from "@/assets/images/message/clear.png";
import iconArrowDown from '@/assets/images/message/arrow-down.png' import iconArrowDown from "@/assets/images/message/arrow-down.png";
const emit = defineEmits(['goDetail']) const emit = defineEmits(["goDetail"]);
const router = useRouter() const router = useRouter();
const route = useRoute() const route = useRoute();
const hasNextPage = ref(false) const hasNextPage = ref(false);
const state = reactive({ const state = reactive({
tabList: [ tabList: [
{ {
name: '审批通知', name: "审批通知",
icon: iconApprove, icon: iconApprove,
activeIcon: iconApproveActive, activeIcon: iconApproveActive,
value: 1, value: 1,
}, },
{ {
name: '系统消息', name: "系统消息",
icon: iconSystem, icon: iconSystem,
activeIcon: iconSystemActive, activeIcon: iconSystemActive,
value: 2, value: 2,
@ -34,105 +34,102 @@ const state = reactive({
], ],
list: [] as any, list: [] as any,
pageNo: 1, pageNo: 1,
}) });
const { list, tabList } = toRefs(state) const { list, tabList } = toRefs(state);
const tab = ref(1) const tab = ref(1);
async function getList(type = '') { async function getList(type = "") {
let res = await getMessageList({ let res = await getMessageList({
pageNo: state.pageNo, pageNo: state.pageNo,
pageSize: '7', pageSize: "7",
msgCategory: tab.value, msgCategory: tab.value,
}) });
if (type == 'more') { if (type == "more") {
while (res.data.endRow > 0) { while (res.data.endRow > 0) {
if (res.code == 'OK') { if (res.code == "OK") {
if (tab.value === 1) { if (tab.value === 1) {
res.data.list.forEach((item) => { res.data.list.forEach((item) => {
item.tag = JSON.parse(item.busJson) item.tag = JSON.parse(item.busJson);
}) });
} }
state.list = state.list.concat(res.data.list) state.list = state.list.concat(res.data.list);
state.pageNo++ state.pageNo++;
res = await getMessageList({ res = await getMessageList({
pageNo: state.pageNo, pageNo: state.pageNo,
pageSize: '7', pageSize: "7",
msgCategory: tab.value, msgCategory: tab.value,
}) });
} }
} }
hasNextPage.value = res.data.hasNextPage hasNextPage.value = res.data.hasNextPage;
} } else {
else { if (res.code === "OK") {
if (res.code === 'OK') { hasNextPage.value = res.data.hasNextPage;
hasNextPage.value = res.data.hasNextPage
if (tab.value === 1) { if (tab.value === 1) {
res.data.list.forEach((item) => { res.data.list.forEach((item) => {
item.tag = JSON.parse(item.busJson) item.tag = JSON.parse(item.busJson);
}) });
} }
state.list = state.list.concat(res.data.list) state.list = state.list.concat(res.data.list);
} }
} }
} }
getList() getList();
async function clearMsg() { async function clearMsg() {
const res = await readAllMsg({ msgCategory: tab.value }) const res = await readAllMsg({ msgCategory: tab.value });
if (res.code === 'OK') { if (res.code === "OK") {
state.list = [] state.list = [];
state.pageNo = 1 state.pageNo = 1;
getList() getList();
} }
} }
function switchTab(type: number) { function switchTab(type: number) {
tab.value = type tab.value = type;
state.list = [] state.list = [];
state.pageNo = 1 state.pageNo = 1;
getList() getList();
} }
function goFinalDetail(row) { function goFinalDetail(row) {
console.log(row) console.log(row);
router.push({ router.push({
name: 'final-detail', name: "final-detail",
query: { id: row.tag.fromId, packageid: row.packageid }, query: { id: row.tag.taskId, packageid: row.packageid },
}) });
} }
function goDetail(item) { function goDetail(item) {
if (tab.value === 1) { if (tab.value === 1) {
clearMsgOne(item.id) clearMsgOne(item.id);
goFinalDetail(item) goFinalDetail(item);
} }
// emit('goDetail', item.id) // emit('goDetail', item.id)
else { else {
router.push({ name: 'message-detail', query: { id: item.id } }) router.push({ name: "message-detail", query: { id: item.id } });
} }
} }
async function clearMsgOne(id) { async function clearMsgOne(id) {
const res = await readMsg({ msgid: id }) const res = await readMsg({ msgid: id });
} }
function getMore() { function getMore() {
state.pageNo += 1 state.pageNo += 1;
getList('more') getList("more");
} }
</script> </script>
<template> <template>
<div class="wrapper-message"> <div class="wrapper-message">
<div class="flex justify-between header"> <div class="flex justify-between header">
<div class="header-title"> <div class="header-title">消息通知</div>
消息通知
</div>
<div class="clear" @click="clearMsg"> <div class="clear" @click="clearMsg">
<img class="icon-clear" :src="iconClear" alt=""> <img class="icon-clear" :src="iconClear" alt="" />
清除未读 清除未读
</div> </div>
</div> </div>
@ -150,7 +147,7 @@ function getMore() {
class="icon" class="icon"
:src="tab === item.value ? item.activeIcon : item.icon" :src="tab === item.value ? item.activeIcon : item.icon"
alt="" alt=""
> />
<div :class="{ 'text-active': tab === item.value }" class="text"> <div :class="{ 'text-active': tab === item.value }" class="text">
{{ item.name }} {{ item.name }}
</div> </div>
@ -159,7 +156,7 @@ function getMore() {
class="icon-arrow" class="icon-arrow"
:src="tab === item.value ? iconArrowActive : iconArrow" :src="tab === item.value ? iconArrowActive : iconArrow"
alt="" alt=""
> />
<div v-if="tab === item.value" class="line" /> <div v-if="tab === item.value" class="line" />
</div> </div>
</div> </div>
@ -167,7 +164,7 @@ function getMore() {
<div <div
v-for="(item, index) in list" v-for="(item, index) in list"
:key="item.id" :key="item.id"
:class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }" :class="{ pt0: index === 0, 'item-disabled': item.readFlag }"
class="item" class="item"
@click="goDetail(item)" @click="goDetail(item)"
> >
@ -188,9 +185,7 @@ function getMore() {
{{ item.titile }} {{ item.titile }}
</div> </div>
<div v-if="tab === 1" class="status"> <div v-if="tab === 1" class="status">
<div class="tag tag-blue"> <div class="tag tag-blue">审批节点{{ item.tag.nodeName }}</div>
审批节点{{ item.tag.nodeName }}
</div>
<div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag"> <div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag">
审批状态{{ item.tag.states }} 审批状态{{ item.tag.states }}
</div> </div>
@ -204,13 +199,11 @@ function getMore() {
<span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span> <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
</div> </div>
</div> </div>
<div class="look"> <div class="look">查看</div>
查看
</div>
</div> </div>
<div v-if="hasNextPage" class="more" @click="getMore"> <div v-if="hasNextPage" class="more" @click="getMore">
查看更多<img class="icon-more" :src="iconArrowDown" alt=""> 查看更多<img class="icon-more" :src="iconArrowDown" alt="" />
</div> </div>
</div> </div>
</div> </div>

@ -581,7 +581,7 @@ function switchBatch() {
<div <div
draggable="true" draggable="true"
class="img-wrapper" class="img-wrapper"
:style="{ 'background-image': `url(${item.serverThumbnailUrl})` }" :style="{ 'background-image': `url(${item.imgUrl})` }"
@dragend=" @dragend="
(event) => { (event) => {
handleDragEnd(event, item); handleDragEnd(event, item);

@ -5,10 +5,8 @@ import { useInfiniteScroll } from '@vueuse/core'
import { debounce } from 'lodash-es' import { debounce } from 'lodash-es'
import imagesloaded from 'imagesloaded' import imagesloaded from 'imagesloaded'
import { useMessage } from 'naive-ui' import { useMessage } from 'naive-ui'
import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
import { getViewportOffset, off, on } from '@/utils/domUtils'
import { timeOptions, viewOptions } from '@/config/home' import { timeOptions, viewOptions } from '@/config/home'
import { off, on } from '@/utils/domUtils'
import { useTask } from '@/store/modules/task' import { useTask } from '@/store/modules/task'
import { TASK_STATUS_OBJ } from '@/enums/index' import { TASK_STATUS_OBJ } from '@/enums/index'
import { formatToDateHMS } from '@/utils/dateUtil' import { formatToDateHMS } from '@/utils/dateUtil'
@ -45,7 +43,6 @@ const viewLabel = computed(() => {
return item?.label return item?.label
}) })
const deviceHeight = ref(600)
const taskStore = useTask() const taskStore = useTask()
const masonryRef = ref<ComponentRef>(null) const masonryRef = ref<ComponentRef>(null)
@ -67,14 +64,6 @@ const sortBy: any = {
const batch = ref(false) const batch = ref(false)
let _imagesload: any let _imagesload: any
const message = useMessage() const message = useMessage()
async function computeListHeight() {
const headEl = document.querySelector('.wrapper-content')!
const { bottomIncludeBody } = getViewportOffset(headEl)
const height = bottomIncludeBody
deviceHeight.value = height - 40 - 16 - 24
}
useWindowSizeFn(computeListHeight)
const layout = debounce(() => { const layout = debounce(() => {
if (!show.value) if (!show.value)
@ -85,7 +74,6 @@ const layout = debounce(() => {
_masonry = new Masonry(masonryRef.value as any, { _masonry = new Masonry(masonryRef.value as any, {
itemSelector: '.grid-item', itemSelector: '.grid-item',
gutter: 17,
columnWidth: 214, columnWidth: 214,
percentPosition: true, percentPosition: true,
stagger: 10, stagger: 10,
@ -220,9 +208,9 @@ function upHandler(event: MouseEvent) {
start = null start = null
} }
// const gridHeight = computed(() => { const gridHeight = computed(() => {
// return viewMode.value !== 'masonry' ? '157px' : '' return viewMode.value !== 'masonry' ? '157px' : ''
// }) })
function addListeners() { function addListeners() {
selectionBox = document.querySelector('.selection-box') as HTMLDivElement selectionBox = document.querySelector('.selection-box') as HTMLDivElement
@ -358,12 +346,6 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
refreshHandler() refreshHandler()
}) })
const listStyle = computed(() => {
return {
height: `${deviceHeight.value}px`,
}
})
function switchBatch() { function switchBatch() {
setBatch(!batch.value) setBatch(!batch.value)
} }
@ -381,19 +363,19 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
refreshHandler() refreshHandler()
} }
const gridHeight = computed(() => { // const gridHeight = computed(() => {
let height = '' // let height = ''
if (viewMode.value === 'masonry') // if (viewMode.value === 'masonry')
height = '' // height = ''
else if (viewMode.value === 'horizontalVersion') // else if (viewMode.value === 'horizontalVersion')
height = '122px' // height = '145px'
else if (viewMode.value === 'verticalVersion') // else if (viewMode.value === 'verticalVersion')
height = '300px' // height = '300px'
else if (viewMode.value === '3:4') // else if (viewMode.value === '3:4')
height = '240px' // height = '240px'
return height // return height
}) // })
defineExpose({ defineExpose({
showModal, showModal,
@ -523,27 +505,22 @@ defineExpose({
</div> </div>
</div> </div>
<n-spin :show="loading"> <div ref="el" class="scroll">
<div ref="el" class="scroll" :style="listStyle">
<!-- <n-scrollbar :on-scroll="scrollHandler"> --> <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
<div ref="masonryRef" class="grid"> <div ref="masonryRef" class="grid">
<div <div
v-for="(item, index) in listData" v-for="(item, index) in listData" :key="index" :data-id="item.id" :style="{ height: gridHeight }"
:key="index"
:style="{ height: gridHeight }"
class="grid-item" class="grid-item"
> >
<div> <div class="img-wrap">
<!-- <img
class="wrapper-content-item-img"
:class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
> -->
<n-image <n-image
ref="imageRef" ref="imageRef"
class="img" class="img"
:class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" :src="item.serverThumbnailUrl || item.imgUrl"
:class="{
'img-fit': viewMode === 'horizontalVersion',
'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
}"
:src="item.serverThumbnailUrl"
/> />
<div class="small-mark" /> <div class="small-mark" />
<div class="time"> <div class="time">
@ -573,7 +550,6 @@ defineExpose({
</div> </div>
<!-- </n-scrollbar> --> <!-- </n-scrollbar> -->
</div> </div>
</n-spin>
</div> </div>
<div class="close" @pointerdown="closeModal"> <div class="close" @pointerdown="closeModal">
@ -752,7 +728,7 @@ defineExpose({
} }
&-m32 { &-m32 {
// margin-left: 19px; margin-left: 19px;
} }
&-content { &-content {
@ -802,20 +778,17 @@ defineExpose({
display: block; display: block;
height: 100%; height: 100%;
} }
}
.img-fit { &-img-fit {
width: 100%; width: 100%;
object-fit: cover; object-fit: cover;
overflow: hidden; }
} }
.img { .img {
border-radius: 7px; border-radius: 7px;
display: block; display: block;
// height: calc(100% - 25px); height: calc(100% - 25px);
height: 100%;
width: 100%;
} }
.img-full { .img-full {
@ -831,11 +804,8 @@ defineExpose({
.grid-item { .grid-item {
width: 214px; width: 214px;
// padding: 16px; padding: 16px;
// width: 182px;
position: relative; position: relative;
margin-bottom: 32px;
transition: 0.5s;
.check{ .check{
position: absolute; position: absolute;
@ -881,7 +851,4 @@ defineExpose({
} }
} }
} }
::v-deep(.n-image img) {
width: 100%!important;
}
</style> </style>

@ -14,14 +14,12 @@ onMounted,
ref, ref,
unref, unref,
toRaw, toRaw,
watch, watch
defineEmits
} from "vue"; } from "vue";
import CustomFieldModalVue from "../modal/CustomFieldModal.vue"; import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
import WorkSheetList from "./WorkSheetList.vue"; import WorkSheetList from "./WorkSheetList.vue";
defineOptions({ name: "AsideContent" }); defineOptions({ name: "AsideContent" });
const emit = defineEmits(["ApprovalOver"]);
const collapse = ref(false); const collapse = ref(false);
const workStore = useWorkOrder(); const workStore = useWorkOrder();
@ -153,10 +151,6 @@ const inputHandler = debounce((word) => {
searchKeyword.value = word; searchKeyword.value = word;
(packageListRef.value as any).search(word); (packageListRef.value as any).search(word);
}, 500); }, 500);
const ApprovalOver = (packageId)=>{
emit('ApprovalOver',packageId)
}
</script> </script>
<template> <template>
@ -216,9 +210,12 @@ const ApprovalOver = (packageId)=>{
class="work-sheet-list" class="work-sheet-list"
:showFieldList="showFieldList" :showFieldList="showFieldList"
:dicts="dicts" :dicts="dicts"
@ApprovalOver="ApprovalOver"
/> />
<CustomFieldModalVue ref="filterModalRef" :review-type="1" @onOk="getshowFieldList" /> <CustomFieldModalVue
ref="filterModalRef"
:review-type="1"
@onOk="getshowFieldList"
/>
</div> </div>
</template> </template>
@ -282,4 +279,5 @@ const ApprovalOver = (packageId)=>{
z-index: 10; z-index: 10;
} }
} }
</style> </style>

@ -10,8 +10,6 @@ import ApprovalModal from "../modal/ApprovalModal.vue";
import ListItem from "./ListItem.vue"; import ListItem from "./ListItem.vue";
import type { PackageListItem } from "/#/workorder"; import type { PackageListItem } from "/#/workorder";
const emit = defineEmits(["ApprovalOver"]);
defineProps({ defineProps({
showFieldList: { showFieldList: {
type: Array, type: Array,
@ -138,17 +136,13 @@ function dismisClick(packageId: string) {
} }
}); });
} }
const ApprovalOver = (packageId) => {
emit("ApprovalOver",packageId);
};
defineExpose({ defineExpose({
search, search,
}); });
</script> </script>
<template> <template>
<ApprovalModal ref="approvalModalRef" @not-pass="notPass" @reject="ApprovalOver" /> <ApprovalModal ref="approvalModalRef" @not-pass="notPass" />
<NotPassed ref="notPassedRef" /> <NotPassed ref="notPassedRef" />
<n-spin :show="isLoading"> <n-spin :show="isLoading">
<div ref="el" class="list"> <div ref="el" class="list">

@ -189,6 +189,8 @@ watch(
() => workStore.activeId, () => workStore.activeId,
async (newValue, oldValue) => { async (newValue, oldValue) => {
const packageid = workStore.getActiveId; const packageid = workStore.getActiveId;
if (isEmpty(packageid)) { if (isEmpty(packageid)) {
listData.value.length = 0; listData.value.length = 0;
totalCount.value = 0; totalCount.value = 0;
@ -442,9 +444,6 @@ function reloadList() {
setBatch(false) setBatch(false)
refreshHandler() refreshHandler()
} }
defineExpose({
queryDetail
})
</script> </script>
<template> <template>

@ -1,28 +1,20 @@
<script lang="ts" setup> <script lang="ts" setup>
import DataHeader from "@/components/DataHeader/index.vue"; import DataHeader from '@/components/DataHeader/index.vue';
import { ref } from "vue"; import Aside from './aside/Aside.vue';
import Aside from "./aside/Aside.vue"; import Content from './content/Content.vue';
import Content from "./content/Content.vue";
import { useWorkOrder } from "@/store/modules/workOrder";
const workStore = useWorkOrder();
const contentRef: any = ref(null);
const ApprovalOver = (packageId) => {
const id: string = workStore.getActiveId;
contentRef.value.queryDetail(id);
};
</script> </script>
<template> <template>
<div style="width: 100%"> <div style="width: 100%;">
<div class="header"> <div class="header">
<DataHeader v-show="false"/> <DataHeader v-show="false"/>
</div> </div>
<div class="main"> <div class="main">
<!-- 侧边 --> <!-- 侧边 -->
<Aside @ApprovalOver="ApprovalOver" /> <Aside />
<!-- 内容 --> <!-- 内容 -->
<Content ref="contentRef" /> <Content />
</div> </div>
</div> </div>
</template> </template>

@ -8,7 +8,7 @@ import { getToolsCount } from "@/api/home/main";
import { storage } from "@/utils/Storage"; import { storage } from "@/utils/Storage";
import { CURRENT_USER } from "@/store/mutation-types"; import { CURRENT_USER } from "@/store/mutation-types";
const emit = defineEmits<{ const emit = defineEmits<{
(e: "reject", params?: any); (e: "reject", params: any);
(e: "notPass", params: any); (e: "notPass", params: any);
}>(); }>();
const message = useMessage() const message = useMessage()
@ -62,7 +62,6 @@ const handleReject = async () => {
}else{ }else{
message.error(res.message) message.error(res.message)
} }
emit('reject',state.packageid)
closeModal(); closeModal();
}; };
@ -140,7 +139,7 @@ defineExpose({
<div class="item"> <div class="item">
<div class="imgwrapper" /> <div class="imgwrapper" />
<div class="content"> <div class="content">
<div class="task_id">{{ detail.packageName }}</div> <div class="task_id">#AI任务包{{ detail.packageId }}</div>
<div class="tag_box"> <div class="tag_box">
<div class="tag_item error"> <div class="tag_item error">
<span style="color: red"><SvgIcon name="error_icon" size="14"/></span> 重复图片({{ <span style="color: red"><SvgIcon name="error_icon" size="14"/></span> 重复图片({{

Loading…
Cancel
Save