Commit 974bd4e3 by 宋春膨

refactor(zlgl/llzjd): 将表单模型从reactive对象改为ref对象

- 将state.formModel替换为独立的formModel ref对象
- 更新所有使用state.formModel的地方为formModel
- 修改表单数据绑定和监听逻辑以适配新的响应式对象
- 调整工作流表单数据处理逻辑以兼容新的数据结构
parent e1a5ca1f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<SimpleForm <SimpleForm
ref="systemFormRef" ref="systemFormRef"
:formProps="data.formDataProps" :formProps="data.formDataProps"
:formModel="state.formModel" :formModel="formModel"
:isWorkFlow="props.fromPage != FromPageType.MENU" :isWorkFlow="props.fromPage != FromPageType.MENU"
:isCamelCase="true" :isCamelCase="true"
@model-change="handleChange" @model-change="handleChange"
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
formDataProps: cloneDeep(formProps), formDataProps: cloneDeep(formProps),
}); });
const state = reactive({ const state = reactive({
formModel: {},
formInfo: { formId: '', formName: '' }, formInfo: { formId: '', formName: '' },
}); });
let formModel = ref<any>({});
const { currentRoute } = useRouter(); const { currentRoute } = useRouter();
watch( watch(
() => state.formModel, () => formModel,
(val) => { (val) => {
emits('update:value', val); emits('update:value', val);
}, },
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
); );
watch( watch(
() => state.formModel.zjfa, () => formModel.value.zjfa,
(newZjfaId) => { (newZjfaId) => {
if (newZjfaId) { if (newZjfaId) {
state.formModel.mesQualityInspectionDetailList = []; formModel.value.mesQualityInspectionDetailList = [];
try { try {
axios axios
.get(import.meta.env.VITE_GLOB_API_URL + '/magic-api/zlgl/zjjcsj/getFaById', { .get(import.meta.env.VITE_GLOB_API_URL + '/magic-api/zlgl/zjjcsj/getFaById', {
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
}) })
.then((response) => { .then((response) => {
for (const item of response.data.data) { for (const item of response.data.data) {
state.formModel.mesQualityInspectionDetailList.push({ formModel.value.mesQualityInspectionDetailList.push({
bzz: item.bzz, bzz: item.bzz,
bh: item.bh, bh: item.bh,
zjxm: item.mc, zjxm: item.mc,
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
await createFormEvent( await createFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
await nextTick(); await nextTick();
await loadFormEvent( await loadFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
emits('loadingCompleted'); //告诉系统表单已经加载完毕 emits('loadingCompleted'); //告诉系统表单已经加载完毕
await createFormEvent( await createFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
); //表单事件:初始化表单 ); //表单事件:初始化表单
await loadFormEvent( await loadFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
try { try {
const record = await getMesDeQualityInspection(rowId); const record = await getMesDeQualityInspection(rowId);
setFieldsValue(record); setFieldsValue(record);
state.formModel = record; formModel.value = record;
// 等待 DOM 更新完成后,如果 zjfa 存在,则手动触发处理 // 等待 DOM 更新完成后,如果 zjfa 存在,则手动触发处理
await nextTick(); await nextTick();
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
await getFormDataEvent( await getFormDataEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -239,11 +239,11 @@ ...@@ -239,11 +239,11 @@
async function update({ values, rowId }) { async function update({ values, rowId }) {
try { try {
values[RowKey] = rowId; values[RowKey] = rowId;
state.formModel = values; formModel.value = values;
let saveVal = await updateMesDeQualityInspection(values); let saveVal = await updateMesDeQualityInspection(values);
await submitFormEvent( await submitFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -256,11 +256,11 @@ ...@@ -256,11 +256,11 @@
// 新增api表单数据 // 新增api表单数据
async function add(values) { async function add(values) {
try { try {
state.formModel = values; formModel.value = values;
let saveVal = await addMesDeQualityInspection(values); let saveVal = await addMesDeQualityInspection(values);
await submitFormEvent( await submitFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -276,18 +276,18 @@ ...@@ -276,18 +276,18 @@
if (obj.formId) state.formInfo.formId = obj.formId; if (obj.formId) state.formInfo.formId = obj.formId;
if (obj.formName) state.formInfo.formName = obj.formName; if (obj.formName) state.formInfo.formName = obj.formName;
let flowData = await changeWorkFlowForm(cloneDeep(formProps), obj); let flowData = await changeWorkFlowForm(cloneDeep(formProps), obj);
let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData; let { buildOptionJson, uploadComponentIds, formModel, isViewProcess } = flowData;
data.formDataProps = buildOptionJson; data.formDataProps = buildOptionJson;
emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】 emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】
if (isViewProcess) { if (isViewProcess) {
setDisabledForm(); //查看 setDisabledForm(); //查看
} }
state.formModel = formModels; formModel.value = formModel.values;
setFieldsValue(formModels); setFieldsValue(formModel.values);
} catch (error) {} } catch (error) {}
await createFormEvent( await createFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
); //表单事件:初始化表单 ); //表单事件:初始化表单
await loadFormEvent( await loadFormEvent(
formEventConfigs, formEventConfigs,
state.formModel, formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, formProps.schemas,
true, true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment