111

src/views/tentative/detect/commission.vue

@@ -326,9 +326,7 @@ const addFormData = () => {
 //合同段被选择
 const delegateContractChange = async () => {
     delegateHtmlLoading.value = true
-    if (!isNullES(editHtmlId.value)) {
-        await getDelegateDataInfo(editHtmlId.value)
-    }
+    await getDelegateDataInfo(editHtmlId.value)
     await getDelegateExcelHtml()
     delegateHtmlLoading.value = false
 }
@@ -341,7 +339,7 @@ const getDelegateExcelHtml = async () => {
     })
     if (!error && code === 200) {
         delegateHtml.value = isString(data) ? data : ''
-        nodeErTreeId.value = msg
+        nodeErTreeId.value = msg === '未知错误' ? null : msg
     } else {
         delegateHtml.value = ''
         window.$message.error(msg || '获取委托信息失败')
@@ -352,7 +350,7 @@ const getDelegateExcelHtml = async () => {
 const getDelegateDataInfo = async (editId) => {
     const { primaryKeyId } = nodeDataInfo.value
     const { error, code, msg, data } = await samplingApi.getBussDataInfoTrialEntrust({
-        id: editId,
+        id: editId ?? null,
         pkeyId: nodeErTreeId.value,
         projectId: projectId.value,
         contractId: delegateContractId.value,

src/views/tentative/material/sampling.vue

@@ -823,9 +823,7 @@ const editHtmlId = ref('')
 const entrustId = ref('')
 const delegateContractChange = async () => {
     delegateHtmlLoading.value = true
-    if (!isNullES(entrustId.value)) {
-        await getDelegateDataInfo(entrustId.value)
-    }
+    await getDelegateDataInfo(entrustId.value)
     await getDelegateExcelHtml()
     delegateHtmlLoading.value = false
 }
@@ -833,7 +831,7 @@ const delegateContractChange = async () => {
 //获取委托数据
 const getDelegateDataInfo = async (editId) => {
     const { error, code, msg, data } = await samplingApi.getBussDataInfoTrialEntrust({
-        id: editId,
+        id: editId ?? null,
         pkeyId: nodeErTreeId.value,
         contractId: delegateContractId.value,
     })