diff --git a/src/views/bg/xispeak/BgXiSpeakList.vue b/src/views/bg/xispeak/BgXiSpeakList.vue index 33ea599..068c44a 100644 --- a/src/views/bg/xispeak/BgXiSpeakList.vue +++ b/src/views/bg/xispeak/BgXiSpeakList.vue @@ -1,5 +1,34 @@ @@ -42,6 +68,7 @@ + @@ -63,6 +90,8 @@ import { startProcessSchedules } from '/@/api/common/api'; import { dateUtil } from '/@/utils/dateUtil'; + import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import JInput from '/@/components/Form/src/jeecg/components/JInput.vue'; import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue'; import BgXiSpeakModal from './components/BgXiSpeakModal.vue'; @@ -83,7 +112,6 @@ updateLaunchType, saveOrUpdateDict, withDrawXiSpeak, - getRootListWithDept, bgXiSpeakFeedbackList, } from './BgXiSpeak.api'; @@ -95,9 +123,9 @@ const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); const { createMessage } = useMessage(); + const formRef = ref(); const expandedRowKeys = ref([]); - const queryParams = ref({}); - const toggleSearchStatus = ref(false); + const queryParam = ref({}); const registerModal = ref(); const flowScheduleModalRef = ref(); const feedbackViewModalRef = ref(); @@ -144,35 +172,17 @@ const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : '')); provide('mainId', mainId); - const searchDeptIds = ref([]); - const isDeptSearching = ref(false); - - async function handleDeptSearch(value) { - if (!value || (Array.isArray(value) && value.length === 0)) { - isDeptSearching.value = false; - reload(); - return; - } - const deptIds = Array.isArray(value) ? value.join(',') : value; - try { - const res = await getRootListWithDept(deptIds); - isDeptSearching.value = true; - const records = res?.records || res || []; - setTableData(records); - } catch (e) { - createMessage.error('按部门查询失败'); - } - } - const labelCol = reactive({ xs: 24, - sm: 4, - xl: 6, - xxl: 4, + sm: 8, + xl: 10, + xxl: 8, }); const wrapperCol = reactive({ xs: 24, - sm: 20, + sm: 16, + xl: 14, + xxl: 16, }); // 高级查询配置 @@ -717,20 +727,27 @@ feedbackViewModalRef.value.open(record); } + function clearQueryParams() { + Object.keys(queryParam.value).forEach((key) => { + delete queryParam.value[key]; + }); + } + /** * 查询 */ function searchQuery() { - reload(); + reload({ page: 1 }); } /** * 重置 */ function searchReset() { - queryParam.value = {}; + formRef.value?.resetFields(); + clearQueryParams(); selectedRowKeys.value = []; - reload(); + reload({ page: 1 }); } /** @@ -744,10 +761,39 @@ diff --git a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS.md b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS.md index 87f6443..b5658d7 100644 --- a/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS.md +++ b/src/views/dq/inspectTask/BPM_NODE_PERMISSIONS.md @@ -68,7 +68,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头） * **showEditFeedback** `0` —— 编辑/删除操作列 * **showDeptFeedback** `0` —— 按部门过滤反馈 * **showJiJianFields** `0` —— 纪检字段列 -* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 +* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 --- ### 节点: <党群经办人审查> @@ -82,7 +82,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头） * **showEditFeedback** `0` —— 编辑/删除操作列 * **showDeptFeedback** `0` —— 按部门过滤反馈 * **showJiJianFields** `0` —— 纪检字段列 -* dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1 +* dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showFeedbackInfo=1 * 可驳回 --- @@ -98,7 +98,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头） * **showEditFeedback** `0` —— 编辑/删除操作列 * **showDeptFeedback** `0` —— 按部门过滤反馈 * **showJiJianFields** `0` —— 纪检字段列 - * dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showIsNeedLeaderApprove=1&showSelnextUser=1 + * dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1&showIsNeedLeaderApprove=1&showSelnextUser=1 --- ### 节点: <分管所领导审批> @@ -112,7 +112,7 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头） * **showEditFeedback** `0` —— 编辑/删除操作列 * **showDeptFeedback** `0` —— 按部门过滤反馈 * **showJiJianFields** `0` —— 纪检字段列 - * dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 + * dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 --- ### 节点: <所党委书记审批> @@ -126,5 +126,5 @@ showFeedbackInfo → 反馈信息区域（表格 + 表头） * **showEditFeedback** `0` —— 编辑/删除操作列 * **showDeptFeedback** `0` —— 按部门过滤反馈 * **showJiJianFields** `0` —— 纪检字段列 - * dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 + * dq/inspecttask/components/DqInspectTaskBPMForm?showProcessHandle=1 --- diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts index 9a437ae..8645e92 100644 --- a/src/views/dq/inspectTask/DqInspectTask.data.ts +++ b/src/views/dq/inspectTask/DqInspectTask.data.ts @@ -290,29 +290,9 @@ export const ledgerColumns: BasicColumn[] = [ align:"center", dataIndex: 'supervisoryOpinion' }, - { - title: '措施数量', - align:"center", - dataIndex: 'measureCount' - }, - { - title: '流程状态', - align:"center", - dataIndex: 'bpmStatus_dictText' - }, { title: '整改状态', align:"center", dataIndex: 'taskStatus' }, - { - title: '督办次数', - align:"center", - dataIndex: 'superviseCount' - }, - { - title: '排序', - align:"center", - dataIndex: 'sortNo' - }, ]; diff --git a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue index 2d263c3..c6d0c56 100644 --- a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue +++ b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue @@ -29,7 +29,7 @@ - + - + @@ -109,36 +109,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue index 3dc3ad5..b28cf53 100644 --- a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue +++ b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue @@ -40,6 +40,21 @@ + + + + + + + + + + + + + + + @@ -75,57 +90,12 @@ - + - - - 状态与统计 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -336,8 +306,19 @@ async function submitForm() { const mainData = await getFormData(); - // 工作进展子表当前未渲染时 ref 为空，提交主表即可；后续恢复子表时仍走原校验取数逻辑。 - const subData = dqInspectProgressTableRef.value ? await getSubFormAndTableData() : {}; + // 工作进展子表当前未渲染时 ref 为空，此时需回查已有子表数据一并提交， + // 否则后端 updateMain 的 deleteByMainId + re-insert 模式会清空全部反馈记录及附件。 + let subData: Record = {}; + if (dqInspectProgressTableRef.value) { + subData = await getSubFormAndTableData(); + } else if (formData.id) { + try { + const existingList = await queryDqInspectProgressListByMainId(formData.id); + if (existingList && existingList.length > 0) { + subData = { dqInspectProgressList: existingList }; + } + } catch {} + } const values = Object.assign({}, dbData, mainData, subData); console.log('表单提交数据', values) const isUpdate = values.id ? true : false