yxk-20260601-所务会台账及发起流程

This commit is contained in:
ye1023
2026-06-01 10:33:22 +08:00
parent c22da8a67a
commit 1e1bb6de29
5 changed files with 68 additions and 20 deletions
@@ -0,0 +1,12 @@
<template>
<BgPartymatterList
meeting-type="office"
ledger-title="所务会"
flow-name="所务会决议事项"
permission-prefix="bgofficematter:bg_officematter"
/>
</template>
<script lang="ts" name="bgofficematter-bgOfficematter" setup>
import BgPartymatterList from './BgPartymatterList.vue';
</script>
@@ -43,9 +43,9 @@
<BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand"> <BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" v-auth="'bgpartymatter:bg_partymatter:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> <a-button type="primary" v-auth="actionAuth.add" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<!-- <a-button type="primary" v-auth="'bgpartymatter:bg_partymatter:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>--> <!-- <a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>-->
<!-- <j-upload-button type="primary" v-auth="'bgpartymatter:bg_partymatter:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>--> <!-- <j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> <!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <template #overlay>--> <!-- <template #overlay>-->
<!-- <a-menu>--> <!-- <a-menu>-->
@@ -55,7 +55,7 @@
<!-- </a-menu-item>--> <!-- </a-menu-item>-->
<!-- </a-menu>--> <!-- </a-menu>-->
<!-- </template>--> <!-- </template>-->
<!-- <a-button v-auth="'bgpartymatter:bg_partymatter:deleteBatch'">--> <!-- <a-button v-auth="actionAuth.deleteBatch">-->
<!-- 批量操作--> <!-- 批量操作-->
<!-- <Icon icon="mdi:chevron-down"></Icon>--> <!-- <Icon icon="mdi:chevron-down"></Icon>-->
<!-- </a-button>--> <!-- </a-button>-->
@@ -143,10 +143,32 @@
import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data'; import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, bgPartymatterFeedbackList, saveOrUpdate } from './BgPartymatter.api';
const props = withDefaults(
defineProps<{
meetingType?: string;
ledgerTitle?: string;
flowName?: string;
permissionPrefix?: string;
}>(),
{
meetingType: 'party',
ledgerTitle: '党委会',
flowName: '党委会决议事项督办',
permissionPrefix: 'bgpartymatter:bg_partymatter',
}
);
const FLOW_CODE = 'dev_task_task_001'; const FLOW_CODE = 'dev_task_task_001';
const FLOW_NAME = '党委会决议事项督办';
const BUSINESS_TABLE_NAME = 'bg_partymatter'; const BUSINESS_TABLE_NAME = 'bg_partymatter';
const FORM_URL = 'bg/bgpartymatter/components/BgPartymatterBPMForm'; const FORM_URL = 'bg/bgpartymatter/components/BgPartymatterBPMForm';
const actionAuth = {
add: `${props.permissionPrefix}:add`,
edit: `${props.permissionPrefix}:edit`,
delete: `${props.permissionPrefix}:delete`,
deleteBatch: `${props.permissionPrefix}:deleteBatch`,
exportXls: `${props.permissionPrefix}:exportXls`,
importExcel: `${props.permissionPrefix}:importExcel`,
};
const [registerBpmModal, { openModal: bpmPicModal }] = useModal(); const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
const formRef = ref(); const formRef = ref();
@@ -177,7 +199,7 @@
const { tableContext, onExportXls, onImportXls } = useListPage({ const { tableContext, onExportXls, onImportXls } = useListPage({
tableProps:{ tableProps:{
title: '党委会', title: props.ledgerTitle,
api: list, api: list,
columns, columns,
canResize:false, canResize:false,
@@ -190,7 +212,7 @@
fixed:'right' fixed:'right'
}, },
beforeFetch: async (params) => { beforeFetch: async (params) => {
return Object.assign(params, getQueryParams()); return Object.assign(params, getLedgerQueryParams());
}, },
pagination: { pagination: {
current: 1, current: 1,
@@ -199,9 +221,9 @@
}, },
}, },
exportConfig: { exportConfig: {
name:"党委会", name: props.ledgerTitle,
url: getExportUrl, url: getExportUrl,
params: getQueryParams, params: getLedgerQueryParams,
}, },
importConfig: { importConfig: {
url: getImportUrl, url: getImportUrl,
@@ -244,6 +266,16 @@
return params; return params;
} }
/**
* 台账入口固定追加会议类型,避免党委会和所务会共表后数据串台。
*/
function getLedgerQueryParams() {
return {
...getQueryParams(),
meetingType: props.meetingType,
};
}
/** /**
* 清空查询条件。 * 清空查询条件。
* 通过删除 reactive 对象中的字段,让查询表单和实际请求参数都恢复为空。 * 通过删除 reactive 对象中的字段,让查询表单和实际请求参数都恢复为空。
@@ -331,7 +363,7 @@
*/ */
function handleAdd() { function handleAdd() {
registerModal.value.disableSubmit = false; registerModal.value.disableSubmit = false;
registerModal.value.add(); registerModal.value.add({ meetingType: props.meetingType });
} }
/** /**
@@ -381,7 +413,7 @@
{ {
label: '编辑', label: '编辑',
onClick: handleEdit.bind(null, record), onClick: handleEdit.bind(null, record),
auth: 'bgpartymatter:bg_partymatter:edit' auth: actionAuth.edit
}, },
]; ];
} }
@@ -401,7 +433,7 @@
confirm: handleDelete.bind(null, record), confirm: handleDelete.bind(null, record),
placement: 'topLeft' placement: 'topLeft'
}, },
auth: 'bgpartymatter:bg_partymatter:delete' auth: actionAuth.delete
}, },
// { // {
// label: '审批进度', // label: '审批进度',
@@ -513,8 +545,10 @@
const selectedDeadline = options.deadline || record.deadline; const selectedDeadline = options.deadline || record.deadline;
const selectedUrgencyLevel = options.urgencyLevel ?? record.urgencyLevel ?? '0'; const selectedUrgencyLevel = options.urgencyLevel ?? record.urgencyLevel ?? '0';
const defaultDeptIds = getResponsibleDeptIds(record); const defaultDeptIds = getResponsibleDeptIds(record);
const currentMeetingType = record.meetingType || props.meetingType;
const flowJsonData = { const flowJsonData = {
...record, ...record,
meetingType: currentMeetingType,
isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '', isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '', supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
superviseCount: nextSuperviseCount, superviseCount: nextSuperviseCount,
@@ -533,7 +567,7 @@
//流程相关字段 //流程相关字段
flowCode: FLOW_CODE, flowCode: FLOW_CODE,
formUrl: FORM_URL, formUrl: FORM_URL,
flowName: FLOW_NAME, flowName: props.flowName,
jsonData: flowJsonData, jsonData: flowJsonData,
//台账相关字段 //台账相关字段
businessTablename: BUSINESS_TABLE_NAME, businessTablename: BUSINESS_TABLE_NAME,
@@ -549,7 +583,7 @@
}; };
await startProcessSchedules(params); await startProcessSchedules(params);
await saveOrUpdate({ id: record.id, bpmStatus: '2', superviseCount: nextSuperviseCount }, true); await saveOrUpdate({ id: record.id, bpmStatus: '2', superviseCount: nextSuperviseCount, meetingType: currentMeetingType }, true);
handleSuccess(); handleSuccess();
} }
@@ -272,6 +272,7 @@
startCount: '', startCount: '',
intervalType: '', intervalType: '',
intervalStartTime: '', intervalStartTime: '',
meetingType: 'party',
}); });
const feedbackBaseColumns = [ const feedbackBaseColumns = [
@@ -186,7 +186,8 @@
isNeedInterval:'', isNeedInterval:'',
startCount:'', startCount:'',
intervalType:'', intervalType:'',
intervalStartTime:'' intervalStartTime:'',
meetingType: 'party',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -316,8 +317,8 @@
/** /**
* 新增 * 新增
*/ */
function add() { function add(record: Record<string, any> = {}) {
edit({}); edit(record);
} }
/** /**
@@ -25,11 +25,11 @@
/** /**
* 新增 * 新增
*/ */
function add() { function add(record: Record<string, any> = {}) {
title.value = '新增'; title.value = '新增';
visible.value = true; visible.value = true;
nextTick(() => { nextTick(() => {
registerForm.value.add(); registerForm.value.add(record);
}); });
} }