数据定价对接计算接口

@@ -905,16 +905,15 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => {
 const getCalculatPrice = async (params) => {
 const getCalculatPrice = async (params) => {
   try {
   try {
     const res: any = await calculatPrice(params);
     const res: any = await calculatPrice(params);
-    loading.value = false;
     if (res.code === proxy.$passCode) {
     if (res.code === proxy.$passCode) {
       const data = res.data || {};
       const data = res.data || {};
       return data; // 返回计算结果以便后续使用
       return data; // 返回计算结果以便后续使用
     } else {
     } else {
       proxy.$ElMessage.error(res.msg);
       proxy.$ElMessage.error(res.msg);
+      loading.value = false;
       throw new Error(res.msg); // 抛出错误以便 catch 捕获
       throw new Error(res.msg); // 抛出错误以便 catch 捕获
     }
     }
   } catch (error) {
   } catch (error) {
-    console.error('计算价格失败:', error);
     loading.value = false;
     loading.value = false;
     throw error; // 重新抛出错误
     throw error; // 重新抛出错误
   }
   }
@@ -933,8 +932,10 @@ const checkForm = (type) => {
       const priceData = await getCalculatPrice(paramsInfo);
       const priceData = await getCalculatPrice(paramsInfo);
       // 显示结果
       // 显示结果
       dataTransactionPrice.value = priceData.transactionPrice.toFixed(2);
       dataTransactionPrice.value = priceData.transactionPrice.toFixed(2);
-      if (type == 'export') {
-        loading.value = true;
+
+      if (type == 'calculate') {
+        loading.value = false;
+      } else if (type == 'export') {
         const exportOut = {
         const exportOut = {
           one: priceData.one,
           one: priceData.one,
           two: priceData.two,
           two: priceData.two,
@@ -958,12 +959,11 @@ const checkForm = (type) => {
             message: '下载报告请求失败',
             message: '下载报告请求失败',
           });
           });
         })
         })
-      } else if (type == 'submit') {
+      } else {
         let params = {
         let params = {
           ...paramsInfo,
           ...paramsInfo,
           dataTransactionPrice: dataTransactionPrice.value,
           dataTransactionPrice: dataTransactionPrice.value,
         }
         }
-        loading.value = true;
         savePrice(params).then((res: any) => {
         savePrice(params).then((res: any) => {
           loading.value = false;
           loading.value = false;
           if (res.code == proxy.$passCode) {
           if (res.code == proxy.$passCode) {