数据定价更新

@@ -658,14 +658,10 @@ const matchTableFields = (rData, tData) => {
   }, 0);
   }, 0);
 }
 }
 
 
-
-const setTableRowData = (dGuid, rIndex) => {
-  let rowData = tableData.value[rIndex], currDataTableGuid = "";
+const setRowData = (rowData, dGuid) => {
   const detailDataTable = (flowDetail.value.dataPricingDemandmatchingRQVOS || []).find(f => f.dataTableGuid == dGuid);
   const detailDataTable = (flowDetail.value.dataPricingDemandmatchingRQVOS || []).find(f => f.dataTableGuid == dGuid);
-  detailDataTable && (currDataTableGuid = detailDataTable.dataTableGuid);
   if (guid && dGuid == rowData.dataTableGuid) {
   if (guid && dGuid == rowData.dataTableGuid) {
-    const sourceTableField = flowDetail.value.dataPricingDemandmatchingRQVOS?.find(s => dGuid == s.dataTableGuid);
-    const pricingDemandField = sourceTableField?.pricingDemandFieldRQVOS || [];
+    const pricingDemandField = detailDataTable?.pricingDemandFieldRQVOS || [];
     rowData.dataFields.map(f => {
     rowData.dataFields.map(f => {
       f.chName = pricingDemandField.find(s => f.guid == s.guid)?.chName || ''
       f.chName = pricingDemandField.find(s => f.guid == s.guid)?.chName || ''
     })
     })
@@ -679,13 +675,12 @@ const setTableRowData = (dGuid, rIndex) => {
     return accumulator + Number(currentValue.dataFieldsNum);
     return accumulator + Number(currentValue.dataFieldsNum);
   }, 0);
   }, 0);
   resourceTableAllNum.value = tableData.value.filter(item => item.dataTableGuid != '' && item.dataTableGuid != null).length;
   resourceTableAllNum.value = tableData.value.filter(item => item.dataTableGuid != '' && item.dataTableGuid != null).length;
+  return detailDataTable.dataTableGuid || '';
 }
 }
 
 
 const setTableRowData = (dGuid, rIndex, setRow = true) => {
 const setTableRowData = (dGuid, rIndex, setRow = true) => {
-  let rowData = tableData.value[rIndex];
-  const detailDataTable = (flowDetail.value.dataPricingDemandmatchingRQVOS || []).find(f => f.dataTableGuid == dGuid && f.demandTableGuid == rowData.demandTableGuid);
-  setRow && setRowData(rowData, dGuid, detailDataTable);
-  const currDataTableGuid = detailDataTable?.dataTableGuid || '';
+  let rowData = tableData.value[rIndex], currDataTableGuid = "";
+  setRow && (currDataTableGuid = setRowData(rowData, dGuid));
   if (dGuid) {
   if (dGuid) {
     tableLoading.value = true;
     tableLoading.value = true;
     getRegisterCatalogTableDetail(dGuid).then((res: any) => {
     getRegisterCatalogTableDetail(dGuid).then((res: any) => {
@@ -932,7 +927,6 @@ 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') {
       if (type == 'export') {
         loading.value = true;
         loading.value = true;
         const exportOut = {
         const exportOut = {
@@ -958,7 +952,7 @@ const checkForm = (type) => {
             message: '下载报告请求失败',
             message: '下载报告请求失败',
           });
           });
         })
         })
-      } else {
+      } else if (type == 'submit') {
         let params = {
         let params = {
           ...paramsInfo,
           ...paramsInfo,
           dataTransactionPrice: dataTransactionPrice.value,
           dataTransactionPrice: dataTransactionPrice.value,