|
@@ -375,6 +375,22 @@ const getMaterialNumber = async () => {
|
|
|
|
|
|
if (!error && code === 200) {
|
|
if (!error && code === 200) {
|
|
backObj.value = getObjVal(data)
|
|
backObj.value = getObjVal(data)
|
|
|
|
+ let mergedObject = null
|
|
|
|
+ // 合并对象并赋值给新对象
|
|
|
|
+ if (Object.keys(backObj.value).length > 0 && Object.keys(delegateHtmlForm.value).length > 0) {
|
|
|
|
+ mergedObject = { ...backObj.value, ...delegateHtmlForm.value }
|
|
|
|
+ } else if (Object.keys(backObj.value).length > 0) {
|
|
|
|
+ mergedObject = { ...backObj.value }
|
|
|
|
+ } else if (Object.keys(delegateHtmlForm.value).length > 0) {
|
|
|
|
+ mergedObject = { ...delegateHtmlForm.value }
|
|
|
|
+ } else {
|
|
|
|
+ mergedObject = {}
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // 可以在这里使用 mergedObject.value
|
|
|
|
+ delegateHtmlForm.value = mergedObject
|
|
|
|
+
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
backObj.value = {}
|
|
backObj.value = {}
|
|
|
|
|
|
@@ -446,7 +462,7 @@ const rowEdit = async (row) => {
|
|
|
|
|
|
await getDelegateExcelHtml()
|
|
await getDelegateExcelHtml()
|
|
await getDelegateDataInfo('', row.id)
|
|
await getDelegateDataInfo('', row.id)
|
|
- getMaterialNumber()
|
|
|
|
|
|
+
|
|
row. rowLoad = false
|
|
row. rowLoad = false
|
|
delegateHtmlLoading.value = false
|
|
delegateHtmlLoading.value = false
|
|
delegateModal.value = true
|
|
delegateModal.value = true
|