yxk-20260724
改善提案 新增申请只填写主表,子表由后续评分和投票流程维护。
This commit is contained in:
@@ -84,8 +84,8 @@
|
||||
</template>
|
||||
</JFormContainer>
|
||||
|
||||
<!-- 子表单区域 -->
|
||||
<a-tabs v-model:activeKey="activeKey" animated style="overflow:hidden;">
|
||||
<!-- 新增申请只填写主表,子表由后续评分和投票流程维护。 -->
|
||||
<a-tabs v-if="showSubTables" v-model:activeKey="activeKey" animated style="overflow:hidden;">
|
||||
<a-tab-pane tab="部门评议评分表" key="improvementDeptScore" :forceRender="true">
|
||||
<j-vxe-table
|
||||
:keep-source="true"
|
||||
@@ -214,6 +214,9 @@
|
||||
return props.formDisabled;
|
||||
});
|
||||
|
||||
// 普通新增没有业务 ID,不展示评分和投票子表;已有数据及流程表单正常展示。
|
||||
const showSubTables = computed(() => Boolean(formData.id || props.formData?.dataId));
|
||||
|
||||
onMounted(()=>{
|
||||
initFormData();
|
||||
});
|
||||
@@ -297,10 +300,14 @@
|
||||
|
||||
async function submitForm() {
|
||||
const mainData = await getFormData();
|
||||
const subData = await getSubFormAndTableData();
|
||||
const values = Object.assign({}, dbData, mainData, subData);
|
||||
const isUpdate = Boolean(mainData.id);
|
||||
const values = Object.assign({}, dbData, mainData);
|
||||
// 新增提案只保存主表;已有提案编辑或流程提交时才采集子表数据。
|
||||
if (isUpdate) {
|
||||
const subData = await getSubFormAndTableData();
|
||||
Object.assign(values, subData);
|
||||
}
|
||||
console.log('表单提交数据', values)
|
||||
const isUpdate = values.id ? true : false
|
||||
await saveOrUpdate(values, isUpdate);
|
||||
//关闭弹窗
|
||||
emit('success');
|
||||
@@ -338,6 +345,7 @@
|
||||
handleFormChange,
|
||||
formItemLayout,
|
||||
disabled,
|
||||
showSubTables,
|
||||
showFlowSubmitButton,
|
||||
getFormData,
|
||||
submitForm,
|
||||
|
||||
Reference in New Issue
Block a user