Merge remote-tracking branch 'origin/master' into feature/hcs-api-p0-web

This commit is contained in:
刘泉佳
2026-10-22 09:43:02 +08:00
108 changed files with 7779 additions and 1683 deletions
+10 -5
View File
@@ -256,7 +256,7 @@
placeholder="请选择"
filterable
clearable
:disabled="isBasicInfoReadonly"
:disabled="dialogReadonly"
/>
</el-form-item>
<el-form-item label="平台公司" prop="undertakeDeptId">
@@ -268,7 +268,7 @@
collapse-tags-tooltip
clearable
filterable
:disabled="isBasicInfoReadonly"
:disabled="dialogReadonly"
@change="handleUndertakeDeptChange"
>
<el-option
@@ -1866,6 +1866,7 @@ export default {
bizId: row.id,
subjectName: row.projectName || '',
approvalStatus: row.approvalStatus || '',
mkEnabled: this.mkEnabled,
}).then(() => request())
: request();
// 项目通过会同步等待合规推送,加遮罩防重复点击
@@ -2089,6 +2090,7 @@ export default {
bizId: id,
subjectName: name,
approvalStatus: status,
mkEnabled: this.mkEnabled,
}).then(() => {
this.$message.success('提交成功!');
this.closeProjectForm();
@@ -2160,6 +2162,7 @@ export default {
bizId: id,
subjectName: this.form.projectName || '',
approvalStatus: this.form.approvalStatus || 'change_rejected',
mkEnabled: this.mkEnabled,
}).then(() => {
this.$message.success('提交成功!');
this.closeProjectForm();
@@ -2623,7 +2626,8 @@ export default {
loadDeptOptions() {
getDeptTree().then(res => {
const deptTree = res.data.data || [];
const businessDeptTree = ['add', 'edit', 'majorSupplement'].includes(this.dialogType)
// 新增/编辑/重大补录/项目变更均可选择业务部门,排除外部组织
const businessDeptTree = ['add', 'edit', 'majorSupplement', 'change'].includes(this.dialogType)
? this.excludeExternalOrganization(deptTree)
: deptTree;
this.deptOptions = this.flattenDept(businessDeptTree);
@@ -2636,8 +2640,9 @@ export default {
const list = res.data.data || [];
this.platformCompanyOptions = list.map(item => ({
label: item.deptName || item.fullName || item.title || item.name,
value: item.id,
}));
// 雪花 ID 必须以字符串绑定,避免 JS Number 精度丢失导致多选提交异常
value: item.id == null || item.id === '' ? '' : String(item.id),
})).filter(item => item.value);
this.ensureCurrentPlatformOption();
});
},