diff --git a/packages/screen/src/component/MyDialog/index.vue b/packages/screen/src/component/MyDialog/index.vue index 9deb614..37bcd0a 100644 --- a/packages/screen/src/component/MyDialog/index.vue +++ b/packages/screen/src/component/MyDialog/index.vue @@ -15,8 +15,8 @@ @@ -58,6 +58,14 @@ const props = defineProps({ type: Function, default: () => {}, }, + onConfirmName: { + type: String, + default: "确认", + }, + onCancelName: { + type: String, + default: "取消", + } }); const normalizedComponent = computed(() => diff --git a/packages/screen/src/views/MaterialManagement/index.js b/packages/screen/src/views/MaterialManagement/index.js index 687eb3a..848c63d 100644 --- a/packages/screen/src/views/MaterialManagement/index.js +++ b/packages/screen/src/views/MaterialManagement/index.js @@ -79,6 +79,17 @@ const INIT_FORM = { }; // 表单初始值 const form = reactive({ ...INIT_FORM }); // 表单 +// 重置表单方法 +const resetForm = () => { + // 深拷贝重置嵌套对象 + form.material = { ...INIT_FORM.material }; + form.photos = [...INIT_FORM.photos]; + + form.material.yhzid = yhzid.value; + form.material.jd = yhzData.value?.jd; + form.material.wd = yhzData.value?.wd; +}; + // 节点过滤函数 @@ -367,10 +378,7 @@ const getDetailData = async (row) => { const openAddModel = () => { model.title = `新增物资`; model.content = AddDialog; - Object.assign(form, INIT_FORM); - form.material.yhzid = yhzid.value; - form.material.jd = yhzData.value?.jd; - form.material.wd = yhzData.value?.wd; + resetForm(); // 重置表单 model.props = { yhzData: yhzData.value, form: form,