From 184c22de7ec15109e832b91218dc2a3b623aa12a Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Sun, 28 Apr 2024 21:13:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A8=E5=B1=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/comp/RepeatTaskTableModal.vue | 4 ++++ src/views/final/content/Content.vue | 8 ++++++-- src/views/final/content/ListContent.vue | 6 +++++- src/views/worksheet/content/Content.vue | 5 +++++ src/views/worksheet/modal/ApprovalModal.vue | 5 ++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index 9362f7f..ac3e9e1 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -26,6 +26,7 @@ import { getRepeatList } from '@/api/final' import { formatToDateHMS } from '@/utils/dateUtil' import { audit } from '@/api/task/task' import NotPassed from '@/components/Approval/NotPassed.vue' +import { useDataHeaderStore } from '@/store/modules/DataHeader' const emit = defineEmits<{ (e: 'commit', columns: any[]) @@ -37,6 +38,7 @@ const izstatusList = ref([]) const dialog = useDialog() const checkedRowKeys = ref([]) const router = useRouter() +const haeaderstore=useDataHeaderStore() onBeforeMount(() => { dicStore.fetchizstatusListt() @@ -328,6 +330,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { + haeaderstore.setDataConfig(true) message.success(res.message) reload() } @@ -360,6 +363,7 @@ function reload() { selectionIds.value = [] checkedRowKeys.value = [] query(pagination.page, pagination.pageSize) + haeaderstore.setDataConfig(true) } function goDetail(row) { diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 3f345f4..292bedd 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -48,6 +48,7 @@ import emitter from '@/utils/mitt' import { formatToDateHMS } from '@/utils/dateUtil' import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter' import DataHeader from '@/components/DataHeader/index.vue' +import { useDataHeaderStore } from '@/store/modules/DataHeader' const props = defineProps({ @@ -86,7 +87,7 @@ const actionsColumns = { }, } const columnsRef = ref>([]) - +const haeaderstore=useDataHeaderStore() async function getColumns() { columnsRef.value = [ @@ -727,6 +728,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { + haeaderstore.setDataConfig(true) message.success(res.message) reload() } @@ -752,6 +754,8 @@ function reload() { tableRef.value?.pagination, ) as PaginationProps query(page!, pageSize!, {}, props.taskvalue) + + haeaderstore.setDataConfig(true) } watch( @@ -1029,7 +1033,7 @@ defineExpose({ flex-direction: column; box-sizing: border-box; margin-left: 16px; - + margin-right:16px ; width: 100%; background: #fff; padding: 0px 24px 24px 24px; diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue index d306354..d54205e 100644 --- a/src/views/final/content/ListContent.vue +++ b/src/views/final/content/ListContent.vue @@ -11,7 +11,7 @@ import { getFinalList } from '@/api/final' import { useFinal } from '@/store/modules/final' import { formatToDateHMS } from '@/utils/dateUtil' import { audit } from '@/api/task/task' - +import { useDataHeaderStore } from '@/store/modules/DataHeader' import NotPassed from '@/components/Approval/NotPassed.vue' const props = defineProps({ @@ -45,6 +45,8 @@ const selectionIds = ref([]) const showActions = computed(() => { return selectionIds.value.length }) +const haeaderstore=useDataHeaderStore() + function handleCheck(row: any, showcheck: any) { if (showcheck == false) { console.log(tableData.value) @@ -313,6 +315,7 @@ function doAudit(param: any, row: any) { num = 1 reload() selectionIds.value = [] + haeaderstore.setDataConfig(true) } else { message.error(res.message) @@ -472,6 +475,7 @@ function changesort(sortnamex) { function notpass() { initData(1, 20, {}, props.taskvalue) selectionIds.value = [] + haeaderstore.setDataConfig(true) } watch( () => finalStore.asideValue, diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 13acb73..5eda487 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -29,6 +29,7 @@ import emitter from '@/utils/mitt' import type { ApprovalParam, SimilarityPictureSortParam } from '/#/api' import bgLoading from '@/assets/images/bg-loading.png' import { useKeydown } from '@/hooks/event/useKeydown' +import { useDataHeaderStore } from '@/store/modules/DataHeader' const batch = ref(false) // 批量审批状态 const selectItems = ref([]) @@ -39,6 +40,7 @@ let _imagesload: any const bgLoadingImg = ref(bgLoading) const imgbigshow = ref(true) const isInitLoading = ref(0) +const haeaderstore=useDataHeaderStore() function changeimgbigshow() { imgbigshow.value = !imgbigshow.value @@ -439,6 +441,7 @@ function handleRejectMainImage() { async function reloadDetailInfo() { const packageid = workStore.getActiveId taskDetailInfo.value = await getTaskDetailInfo(packageid) + haeaderstore.setDataConfig(true) } function handleApproveMainImage(items?: any) { const currentValue = overTask.value || taskDetailInfo.value @@ -485,6 +488,7 @@ function handleApproveMainImage(items?: any) { audit(param).then(async (res) => { const { code } = res if (code === 'OK') { + haeaderstore.setDataConfig(true) message.info(res.message) const packageid = workStore.getActiveId taskDetailInfo.value = await getTaskDetailInfo(packageid) @@ -568,6 +572,7 @@ function doAudit(param: any) { function reloadList() { setBatch(false) refreshHandler() + haeaderstore.setDataConfig(true) } function handleRejectdubiousfileyd(pictureid) { dialog.info({ diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue index 85324f5..f2ff33c 100644 --- a/src/views/worksheet/modal/ApprovalModal.vue +++ b/src/views/worksheet/modal/ApprovalModal.vue @@ -7,12 +7,14 @@ import { audit } from "@/api/task/task"; import { getToolsCount } from "@/api/home/main"; import { storage } from "@/utils/Storage"; import { CURRENT_USER } from "@/store/mutation-types"; +import { useDataHeaderStore } from '@/store/modules/DataHeader' + const emit = defineEmits<{ (e: "reject", params?: any); (e: "notPass", params: any); }>(); const message = useMessage() - +const haeaderstore=useDataHeaderStore() const dialog = useDialog(); const state: any = reactive({ @@ -58,6 +60,7 @@ const handleReject = async () => { } const res = await audit(param) if(res.code == 'OK'){ + haeaderstore.setDataConfig(true) message.success(res.message) }else{ message.error(res.message)