diff --git a/src/views/gh/improvementProposal/ImprovementProposal.data.ts b/src/views/gh/improvementProposal/ImprovementProposal.data.ts
index 1f01377..f1ebf25 100644
--- a/src/views/gh/improvementProposal/ImprovementProposal.data.ts
+++ b/src/views/gh/improvementProposal/ImprovementProposal.data.ts
@@ -80,18 +80,11 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'improvementMethod'
},
- {
- title: '业务状态',
- align:"center",
- dataIndex: 'bpmStatus_dictText',
- width:90
-
- dataIndex: 'finalAward_dictText'
- },
{
title: '流程状态',
align:"center",
- dataIndex: 'bpmStatus_dictText'
+ width:90,
+ dataIndex: 'bpmStatus_dictText'
},
];
diff --git a/src/views/gh/improvementProposal/ImprovementProposalList.vue b/src/views/gh/improvementProposal/ImprovementProposalList.vue
index 676c462..fecce76 100644
--- a/src/views/gh/improvementProposal/ImprovementProposalList.vue
+++ b/src/views/gh/improvementProposal/ImprovementProposalList.vue
@@ -20,8 +20,6 @@
业务状态
- 流程状态
-
diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
index 45f88c9..9de5c3b 100644
--- a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
@@ -6,7 +6,7 @@
-
+
@@ -126,7 +126,7 @@
import { defineComponent, ref, reactive, computed, toRaw, onMounted, nextTick } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
- import { queryImprovementDeptScoreListByMainId, queryImprovementInstituteVoteListByMainId, queryDataById, saveOrUpdate, getLatestProposalSequence } from '../ImprovementProposal.api';
+ import { queryImprovementDeptScoreListByMainId, queryImprovementInstituteVoteListByMainId, queryDataById, saveOrUpdate } from '../ImprovementProposal.api';
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
import {improvementDeptScoreColumns, improvementInstituteVoteColumns} from '../ImprovementProposal.data';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
@@ -308,20 +308,6 @@
formData.proposalDeptCode = departInfo.orgCode;
}
- async function getProposalSequence() {
- const year = new Date().getFullYear();
- const latestSequence = await getLatestProposalSequence(year);
- // return Number(latestSequence) + 1;
- return String(Number(latestSequence) + 1).padStart(4, '0');
- }
-
- async function generateProposalNo() {
- const deptCode = formData.proposalDeptName || '';
- const year = new Date().getFullYear();
- const proposalSequence = await getProposalSequence();
- return `${deptCode}-${year}年-${proposalSequence}`;
- }
-
onMounted(()=>{
initFormData();
});
@@ -355,7 +341,6 @@
improvementInstituteVoteTable.dataSource = [];
formData.proposalDate = getCurrentDate();
await applyCurrentUserDeptInfo();
- formData.proposalNo = await generateProposalNo();
}
async function edit(row) {
@@ -420,12 +405,14 @@
// 新增阶段附件暂不绑定;主表生成 ID 后统一关联,保证普通表单和 BPM 使用同一查询键。
if (!isUpdate) {
const newId = typeof result?.id === 'string' ? result.id.trim() : '';
+ const proposalNo = typeof result?.proposalNo === 'string' ? result.proposalNo.trim() : '';
if (!newId) {
// 阻断成功文案等非业务 ID 写入附件表,避免后续 BPM 无法按主表 ID 查询附件。
createMessage.error('新增成功但未返回提案ID,附件未关联,请刷新后重试');
return;
}
formData.id = newId;
+ formData.proposalNo = proposalNo;
await beforeFileRef.value?.bindBussinessId(`${formData.id}:before`);
await afterFileRef.value?.bindBussinessId(`${formData.id}:after`);
}