diff --git a/src/components/Form/src/jeecg/hooks/useTreeBiz.ts b/src/components/Form/src/jeecg/hooks/useTreeBiz.ts index ee8da4a..c51b076 100644 --- a/src/components/Form/src/jeecg/hooks/useTreeBiz.ts +++ b/src/components/Form/src/jeecg/hooks/useTreeBiz.ts @@ -77,8 +77,8 @@ export function useTreeBiz(treeRef, getList, props, realProps, emit) { * 树节点选择 */ function onSelect(keys, info) { - if (props.checkable == false) { - checkedKeys.value = props.checkStrictly ? keys.checked : keys; + if (props.checkable != true) { + checkedKeys.value = Array.isArray(keys) ? keys : [keys]; const { selectedNodes } = info; let rows = []; selectedNodes.forEach((item) => { diff --git a/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue b/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue index 242aa12..95266f7 100644 --- a/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue +++ b/src/components/semri/userComponent/DeptRoleUserSelectDropDown.vue @@ -62,9 +62,12 @@ onMounted(fetchUserList); watch( () => [props.deptId, props.roleId], - () => { - modelValue.value = ''; - fetchUserList(); + async () => { + await fetchUserList(); + const current = modelValue.value; + if (current && !userList.value.some((u) => u.username === current)) { + modelValue.value = ''; + } }, ); diff --git a/src/hooks/system/useMethods.ts b/src/hooks/system/useMethods.ts index d10879a..aedffff 100644 --- a/src/hooks/system/useMethods.ts +++ b/src/hooks/system/useMethods.ts @@ -22,7 +22,13 @@ export function useMethods() { */ async function exportXls(name, url, params, isXlsx = false) { //update-begin---author:wangshuai---date:2024-01-25---for:【QQYUN-8118】导出超时时间设置长点--- - const data = await defHttp.get({ url: url, params: params, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false }); + let data; + try { + data = await defHttp.get({ url: url, params: params, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false }); + } catch (error) { + createMessage.error('导出失败,请稍后重试'); + return; + } //update-end---author:wangshuai---date:2024-01-25---for:【QQYUN-8118】导出超时时间设置长点--- if (!data) { createMessage.warning('文件下载失败'); diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index ef42e23..da52c29 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -195,7 +195,7 @@ import FlowScheduleStartModalForBG from '/src/components/semri/process/FlowScheduleStartModalForBG.vue'; import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue'; import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data'; - import { list, statusStats, deleteOne, batchDelete, getImportUrl, getExportUrl, getImportExcelByEasyExcelUrl, getCheckExcelByEasyExcelUrl, getExportXlsHeadersUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api'; + import { list, statusStats, deleteOne, batchDelete, getImportUrl, getExportXlsByEasyExcelUrl, getImportExcelByEasyExcelUrl, getCheckExcelByEasyExcelUrl, getExportXlsHeadersUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api'; import { defHttp } from '/@/utils/http/axios'; import { showImportValidationErrors } from '/@/utils/helper/importError'; import { useMessage } from '/@/hooks/web/useMessage'; @@ -252,7 +252,7 @@ const registerModal = ref(); const flowScheduleModalRef = ref(); const businessProcessListModalRef = ref(); - const toggleSearchStatus = ref(false); + const toggleSearchStatus = ref(true); const queryParam = reactive({}); const expandedRowKeys = ref>([]); const feedbackTableData = reactive>({}); @@ -302,7 +302,7 @@ }, exportConfig: { name: props.meetingType === 'office' ? '所务会' : '党委会', - url: getExportUrl, + url: getExportXlsByEasyExcelUrl, params: getLedgerQueryParams, }, importConfig: { @@ -441,6 +441,7 @@ selectedRowKeys.value = []; resetFeedbackExpand(); reload({ page: 1 }); + fetchStatusStats(); } async function fetchStatusStats() { @@ -510,6 +511,7 @@ selectedRowKeys.value = []; resetFeedbackExpand(); reload(); + fetchStatusStats(); } /** @@ -793,6 +795,7 @@ resetFeedbackExpand(); //刷新数据 reload({ page: 1 }); + fetchStatusStats(); } diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue index fbc7622..de24492 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue @@ -1,6 +1,6 @@