|
@@ -953,6 +953,10 @@ const delegateContractChange = async () => {
|
|
|
delegateModal.value = true
|
|
|
await getDelegateExcelHtml()
|
|
|
await getDelegateDataInfo()
|
|
|
+ await getEntrustNumberData()
|
|
|
+ console.log(backObj.value, 'backObj.value')
|
|
|
+
|
|
|
+
|
|
|
delegateHtmlLoading.value = false
|
|
|
}
|
|
|
|
|
@@ -987,7 +991,37 @@ const getDelegateDataInfo = async () => {
|
|
|
window.$message.error(msg || '获取委托信息失败')
|
|
|
}
|
|
|
}
|
|
|
+const dataInfo = ref({})
|
|
|
+const getEntrustNumberData = async () => {
|
|
|
+ const { error, code, data } = await dataApi.getEntrustNumber({
|
|
|
+ contractId: contractId.value,
|
|
|
+ pkeyId: searchForm.value.nodeId,
|
|
|
+ })
|
|
|
+ //处理数据
|
|
|
+
|
|
|
+ if (!error && code === 200) {
|
|
|
+ dataInfo.value = getObjVal(data)
|
|
|
+ let mergedObject = null
|
|
|
+ // 合并对象并赋值给新对象
|
|
|
+ if (Object.keys(dataInfo.value).length > 0 && Object.keys(delegateHtmlForm.value).length > 0) {
|
|
|
+ mergedObject = { ...dataInfo.value, ...delegateHtmlForm.value }
|
|
|
+ } else if (Object.keys(dataInfo.value).length > 0) {
|
|
|
+ mergedObject = { ...dataInfo.value }
|
|
|
+ } else if (Object.keys(delegateHtmlForm.value).length > 0) {
|
|
|
+ mergedObject = { ...delegateHtmlForm.value }
|
|
|
+ } else {
|
|
|
+ mergedObject = {}
|
|
|
+ }
|
|
|
+
|
|
|
+ // 可以在这里使用 mergedObject.value
|
|
|
+ delegateHtmlForm.value = mergedObject
|
|
|
|
|
|
+
|
|
|
+ } else {
|
|
|
+ backObj.value = {}
|
|
|
+
|
|
|
+ }
|
|
|
+}
|
|
|
//获取委托html
|
|
|
const getDelegateExcelHtml = async () => {
|
|
|
const { error, code, msg, data } = await samplingApi.getExcelHtml({
|