From 1e1bb6de2952c920ebe163efa231b60ef77ec909 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260601-=E6=89=80=E5=8A=A1=E4=BC=9A?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=8F=8A=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgOfficematterList.vue   | 12 ++++
 .../bg/bgpartymatter/BgPartymatterList.vue    | 62 ++++++++++++++-----
 .../components/BgPartymatterBPMForm.vue       |  1 +
 .../components/BgPartymatterForm.vue          |  7 ++-
 .../components/BgPartymatterModal.vue         |  6 +-
 5 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 src/views/bg/bgpartymatter/BgOfficematterList.vue

diff --git a/src/views/bg/bgpartymatter/BgOfficematterList.vue b/src/views/bg/bgpartymatter/BgOfficematterList.vue
new file mode 100644
index 0000000..e4efb6c
--- /dev/null
+++ b/src/views/bg/bgpartymatter/BgOfficematterList.vue
@@ -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>
diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index 1e5066f..1fe01f3 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -43,9 +43,9 @@
       <BasicTable @register="registerTable" :expandedRowKeys="expandedRowKeys" @expand="handleExpand">
         <!--插槽:table标题-->
         <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="'bgpartymatter:bg_partymatter: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>-->
+          <a-button type="primary" v-auth="actionAuth.add"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</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="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
 <!--          <a-dropdown v-if="selectedRowKeys.length > 0">-->
 <!--            <template #overlay>-->
 <!--              <a-menu>-->
@@ -55,7 +55,7 @@
 <!--                </a-menu-item>-->
 <!--              </a-menu>-->
 <!--            </template>-->
-<!--            <a-button v-auth="'bgpartymatter:bg_partymatter:deleteBatch'">-->
+<!--            <a-button v-auth="actionAuth.deleteBatch">-->
 <!--              批量操作-->
 <!--              <Icon icon="mdi:chevron-down"></Icon>-->
 <!--            </a-button>-->
@@ -143,10 +143,32 @@
   import { columns, superQuerySchema, bgPartymatterFeedbackColumns } from './BgPartymatter.data';
   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_NAME = '党委会决议事项督办';
   const BUSINESS_TABLE_NAME = 'bg_partymatter';
   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 formRef = ref();
@@ -177,7 +199,7 @@
 
   const { tableContext, onExportXls, onImportXls } = useListPage({
     tableProps:{
-      title: '党委会',
+      title: props.ledgerTitle,
       api: list,
       columns,
       canResize:false,
@@ -190,7 +212,7 @@
         fixed:'right'
       },
       beforeFetch: async (params) => {
-        return Object.assign(params, getQueryParams());
+        return Object.assign(params, getLedgerQueryParams());
       },
       pagination: {
         current: 1,
@@ -199,9 +221,9 @@
       },
     },
     exportConfig: {
-      name:"党委会",
+      name: props.ledgerTitle,
       url: getExportUrl,
-      params: getQueryParams,
+      params: getLedgerQueryParams,
     },
     importConfig: {
       url: getImportUrl,
@@ -244,6 +266,16 @@
     return params;
   }
 
+  /**
+   * 台账入口固定追加会议类型，避免党委会和所务会共表后数据串台。
+   */
+  function getLedgerQueryParams() {
+    return {
+      ...getQueryParams(),
+      meetingType: props.meetingType,
+    };
+  }
+
   /**
    * 清空查询条件。
    * 通过删除 reactive 对象中的字段，让查询表单和实际请求参数都恢复为空。
@@ -331,7 +363,7 @@
    */
   function handleAdd() {
     registerModal.value.disableSubmit = false;
-    registerModal.value.add();
+    registerModal.value.add({ meetingType: props.meetingType });
   }
 
   /**
@@ -381,7 +413,7 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'bgpartymatter:bg_partymatter:edit'
+        auth: actionAuth.edit
       },
     ];
   }
@@ -401,7 +433,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft'
         },
-        auth: 'bgpartymatter:bg_partymatter:delete'
+        auth: actionAuth.delete
       },
       // {
       //   label: '审批进度',
@@ -513,8 +545,10 @@
     const selectedDeadline = options.deadline || record.deadline;
     const selectedUrgencyLevel = options.urgencyLevel ?? record.urgencyLevel ?? '0';
     const defaultDeptIds = getResponsibleDeptIds(record);
+    const currentMeetingType = record.meetingType || props.meetingType;
     const flowJsonData = {
       ...record,
+      meetingType: currentMeetingType,
       isNeedAppro: options.isNeedAppro ?? record.isNeedAppro ?? '',
       supDeptleaderid: options.supDeptleaderid ?? record.supDeptleaderid ?? '',
       superviseCount: nextSuperviseCount,
@@ -533,7 +567,7 @@
         //流程相关字段
         flowCode: FLOW_CODE,
         formUrl: FORM_URL,
-        flowName: FLOW_NAME,
+        flowName: props.flowName,
         jsonData: flowJsonData,
         //台账相关字段
         businessTablename: BUSINESS_TABLE_NAME,
@@ -549,7 +583,7 @@
     };
 
     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();
   }
 
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 51a32b6..d3b331b 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -272,6 +272,7 @@
     startCount: '',
     intervalType: '',
     intervalStartTime: '',
+    meetingType: 'party',
   });
 
   const feedbackBaseColumns = [
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
index cb51c04..6fceb58 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
@@ -186,7 +186,8 @@
     isNeedInterval:'',
     startCount:'',
     intervalType:'',
-    intervalStartTime:''
+    intervalStartTime:'',
+    meetingType: 'party',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -316,8 +317,8 @@
   /**
    * 新增
    */
-  function add() {
-    edit({});
+  function add(record: Record<string, any> = {}) {
+    edit(record);
   }
 
   /**
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
index 55bd08e..96a66d9 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterModal.vue
@@ -25,11 +25,11 @@
   /**
    * 新增
    */
-  function add() {
+  function add(record: Record<string, any> = {}) {
     title.value = '新增';
     visible.value = true;
     nextTick(() => {
-      registerForm.value.add();
+      registerForm.value.add(record);
     });
   }
   
@@ -81,4 +81,4 @@
     display: none !important;
   }
 </style>
-<style lang="less" scoped></style>
\ No newline at end of file
+<style lang="less" scoped></style>