diff --git a/src/hook/useFormHandler.js b/src/hook/useFormHandler.js index 2fd29e4..474e2c9 100644 --- a/src/hook/useFormHandler.js +++ b/src/hook/useFormHandler.js @@ -122,6 +122,7 @@ export default function useFormHandler(formItems, api) { detailData, onSubmit, handleBack, - fetchData + fetchData, + initializeFormData } } diff --git a/src/views/basicData/materiel/detail/index.vue b/src/views/basicData/materiel/detail/index.vue index 196db58..4e595f2 100644 --- a/src/views/basicData/materiel/detail/index.vue +++ b/src/views/basicData/materiel/detail/index.vue @@ -107,11 +107,16 @@ - + - + @@ -146,6 +151,7 @@ promoteEnabledState: 'ENABLE' }) let extendData = ref([]) // 扩展字段 + let extendFormData = ref({}) // 扩展字段 onMounted(async () => { formRefs.value = [formRef1.value, formRef2.value, formRef3.value] @@ -170,6 +176,11 @@ unitOptions = unitList dataSource.value = packageData + + if (res.extJson) { + extendFormData.value = JSON.parse(res.extJson) + console.log(extendFormData.value, 'extendFormData.value') + } } }) @@ -232,21 +243,29 @@ .then((res) => { if (res) { res.forEach((item) => { + const showValues = JSON.parse(item.showValues) + let options = [] + showValues.forEach((value) => { + options.push({ + value: value.name, + label: value.name + }) + }) extendData.value.push({ - label: item.fieldName, + label: item.name, name: item.fieldName, - type: 'ASelect', + type: item.showType, span: 6, attrs: { placeholder: '请输入内容', - options: [], - fieldNames: { - label: 'name', - value: 'id' - } + options } }) }) + + extendData.value.forEach((item) => { + if (item.fieldName) extendFormData.value[item.fieldName] = null + }) } }) }) @@ -279,12 +298,13 @@ } const onSubmitForm = () => { - console.log(productFormData.value, 'productFormData.value') + console.log(extendFormData.value, 'extendFormData.value') onSubmit({ isDeep: true, materialPackageList: dataSource.value, ...formData, - ...productFormData.value + ...productFormData.value, + extJson: JSON.stringify(extendFormData.value) }) } diff --git a/src/views/biz/extendedField/detail/form.vue b/src/views/biz/extendedField/detail/form.vue index fbbb984..b2396c1 100644 --- a/src/views/biz/extendedField/detail/form.vue +++ b/src/views/biz/extendedField/detail/form.vue @@ -28,7 +28,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -102,13 +102,13 @@ // 增加数据 let selectableData = ref([ { - filedName: '' + name: '', } ]) const addSelectableData = () => { selectableData.value.push({ - filedName: '' + name: '', }) }