From 5e02e5e71854abee7f897b5576eb61ef75204520 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Fri, 24 Jul 2026 16:45:40 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260724=20feat(=E6=94=B9=E5=96=84=E6=8F=90?=
 =?UTF-8?q?=E6=A1=88):=20=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=8F=8A=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增改善提案专用流程发起接口，直接以 improvement_proposal.id 作为业务ID发起 dev_improvement_proposal_001，不再创建 task_task
- 发起时加行锁并校验草稿状态及流程实例，防止重复发起；成功后回写 process_instance_id
- 收紧已发起提案的编辑、单删和批量删除限制，避免流程中的业务数据被篡改
- 前端列表接入业务发起接口，仅草稿且未绑定流程实例时显示发起、编辑、删除入口
- 新增 ImprovementProposalBPMForm，只读展示提案信息并复用通用任务办理能力
- 兼容发起接口从 POST 请求体或 URL 参数中接收 id，修复前端参数未绑定导致的缺少 id 异常
- 明确流程变量使用业务表物理列名：proposal_dept_id，用于按提案部门匹配精益专员初审人员
---
 .../ImprovementProposal.api.ts                |  3 +
 .../ImprovementProposalList.vue               | 47 ++++++-----
 .../components/ImprovementProposalBPMForm.vue | 84 +++++++++++++++++++
 3 files changed, 111 insertions(+), 23 deletions(-)
 create mode 100644 src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue

diff --git a/src/views/gh/improvementProposal/ImprovementProposal.api.ts b/src/views/gh/improvementProposal/ImprovementProposal.api.ts
index 33bfb6b..83e937b 100644
--- a/src/views/gh/improvementProposal/ImprovementProposal.api.ts
+++ b/src/views/gh/improvementProposal/ImprovementProposal.api.ts
@@ -14,6 +14,7 @@ enum Api {
   queryDataById = '/improvementproposal/improvementProposal/queryById',
   improvementDeptScoreList = '/improvementproposal/improvementProposal/queryImprovementDeptScoreByMainId',
   improvementInstituteVoteList = '/improvementproposal/improvementProposal/queryImprovementInstituteVoteByMainId',
+  startProcess = '/improvementproposal/improvementProposal/startProcess',
 }
 /**
  * 导出api
@@ -85,3 +86,5 @@ export const saveOrUpdate = (params, isUpdate) => {
 */
 export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
 
+/** 发起改善提案审批流程。 */
+export const startProposalProcess = (id: string) => defHttp.post({ url: Api.startProcess, params: { id } });
diff --git a/src/views/gh/improvementProposal/ImprovementProposalList.vue b/src/views/gh/improvementProposal/ImprovementProposalList.vue
index 18fc112..29d5b46 100644
--- a/src/views/gh/improvementProposal/ImprovementProposalList.vue
+++ b/src/views/gh/improvementProposal/ImprovementProposalList.vue
@@ -70,27 +70,22 @@
 </template>
 
 <script lang="ts" name="improvementproposal-improvementProposal" setup>
-  import {ref, reactive, computed, unref} from 'vue';
+  import {ref, reactive} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
   import ImprovementProposalModal from './components/ImprovementProposalModal.vue'
   import {columns, superQuerySchema} from './ImprovementProposal.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ImprovementProposal.api';
+  import {list, deleteOne, batchDelete, getImportUrl, getExportUrl, startProposalProcess} from './ImprovementProposal.api';
   import {downloadFile} from '/@/utils/common/renderUtils';
-  import { useMessage } from '/@/hooks/web/useMessage';
   import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
-  import { startProcess } from '/@/api/common/api';
 
   const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
-  import { useUserStore } from '/@/store/modules/user';
   const formRef = ref();
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
-  const userStore = useUserStore();
-  const { createMessage } = useMessage();
    //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
@@ -184,37 +179,44 @@
       * 操作栏
       */
   function getTableAction(record){
-       return [
+       const actions = [
          {
            label: '编辑',
            onClick: handleEdit.bind(null, record),
-           auth: 'improvementproposal:improvement_proposal:edit'
+           auth: 'improvementproposal:improvement_proposal:edit',
+           ifShow: isDraft(record),
          }
-       ]
+       ];
+       return actions;
    }
      /**
         * 下拉操作栏
         */
   function getDropDownAction(record){
-       let dropDownAction = [
+       const dropDownAction: any[] = [
          {
            label: '详情',
            onClick: handleDetail.bind(null, record),
-         }, {
+         }
+       ];
+       if (isDraft(record)) {
+         dropDownAction.push({
            label: '删除',
            popConfirm: {
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record)
            },
            auth: 'improvementproposal:improvement_proposal:delete'
-         },
+         });
+       }
+       dropDownAction.push(
            {
              label: '审批进度',
              onClick: handlePreviewPic.bind(null, record),
              ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
            }
-       ];
-       if(record.bpmStatus == '1' || !record.bpmStatus){
+       );
+       if(isDraft(record)){
          dropDownAction.push({
            label: '发起流程',
            popConfirm: {
@@ -231,16 +233,15 @@
    * 提交流程
    */
   async function handleProcess(record) {
-    let params = {
-      flowCode: 'dev_improvement_proposal_001',
-      id: record.id,
-      formUrl: 'improvementproposal/components/ImprovementProposalForm',
-      formUrlMobile: ''
-    }
-    await startProcess(params);
+    await startProposalProcess(record.id);
     handleSuccess();
   }
 
+  /** 只有未绑定流程实例的草稿可以继续维护或发起。 */
+  function isDraft(record) {
+    return String(record?.bpmStatus || '') === '1' && !record?.processInstanceId;
+  }
+
   /**
    * 审批进度
    */
@@ -300,4 +301,4 @@
       width: 100%;
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue
new file mode 100644
index 0000000..512bf23
--- /dev/null
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-spin :spinning="loading">
+    <section class="improvement-proposal-bpm-form">
+      <a-descriptions title="改善提案" bordered size="small" :column="2">
+        <a-descriptions-item label="提案编号">{{ proposal.proposalNo || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="提案名称">{{ proposal.proposalName || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="提出日期">{{ proposal.proposalDate || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="提案类别">{{ proposal.proposalCategory || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="提案部门">{{ proposal.proposalDeptName || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="申请人">{{ proposal.applicantName || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="团队名称">{{ proposal.teamName || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="最终奖项">{{ proposal.finalAward || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="问题描述" :span="2">{{ proposal.problemDesc || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="改善方法及措施" :span="2">{{ proposal.improvementMethod || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="改善前情况描述" :span="2">{{ proposal.beforeDesc || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="改善后情况描述" :span="2">{{ proposal.afterDesc || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="改善效果" :span="2">{{ proposal.improvementEffect || '-' }}</a-descriptions-item>
+      </a-descriptions>
+
+      <a-divider />
+      <TaskHandleInnerContent
+        :formData="formData"
+        :claim="claim"
+        @success="handleSuccess"
+        @claimSuccess="handleClaimSuccess"
+      />
+    </section>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { computed, defineComponent, ref, watch } from 'vue';
+  import { queryDataById } from '../ImprovementProposal.api';
+  import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
+
+  export default defineComponent({
+    name: 'ImprovementProposalBPMForm',
+    components: { TaskHandleInnerContent },
+    props: {
+      formData: { type: Object, default: () => ({}) },
+      claim: { type: Boolean, default: false },
+    },
+    emits: ['success', 'claimSuccess'],
+    setup(props, { emit }) {
+      const loading = ref(false);
+      const proposal = ref<Recordable>({});
+
+      // processDataId 是引擎保存的原始业务键；兼容普通待办没有该字段时回退 dataId。
+      const proposalId = computed(() => props.formData?.processDataId || props.formData?.dataId);
+
+      async function loadProposal() {
+        if (!proposalId.value) {
+          proposal.value = {};
+          return;
+        }
+        loading.value = true;
+        try {
+          proposal.value = await queryDataById(proposalId.value);
+        } finally {
+          loading.value = false;
+        }
+      }
+
+      watch(proposalId, loadProposal, { immediate: true });
+
+      return {
+        loading,
+        proposal,
+        handleSuccess: () => emit('success'),
+        handleClaimSuccess: () => emit('claimSuccess'),
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .improvement-proposal-bpm-form {
+    padding: 8px 12px 16px;
+
+    :deep(.ant-descriptions-item-content) {
+      white-space: pre-wrap;
+    }
+  }
+</style>