fix: 修复新增定价切换模型问题

lihua
Showing 2 changed files with 85 additions and 68 deletions
src/views/data_pricing/calculateConfig.vue
src/views/data_pricing/calculateConfigNew.vue
--- a/src/views/data_pricing/calculateConfig.vue
View file @3ad84ff
+++ b/src/views/data_pricing/calculateConfig.vue
View file @3ad84ff
@@ -199,7 +199,7 @@ const getDiseaseData = () => {
        item.options = typeMap.value['diseaseGuid'];
        if (guid) {
          const diseaseData = typeMap.value.diseaseGuid.find(m => m.guid == flowDetail.value.diseaseGuid);
-          if (!diseaseData) {
+          if (!diseaseData && flowDetail.value.diseaseGuid) {
            item.options.unshift({
              guid: flowDetail.value.diseaseGuid,
              diseaseName: flowDetail.value.diseaseName
@@ -501,7 +501,7 @@ const setTableData = (dataArr) => {
  }, 0);
  setTimeout(() => {
    tableData.value.map(t => {
-      expendTableRef.value.toggleRowExpansion(t);
+      expendTableRef.value?.toggleRowExpansion(t);
    })
  }, 200)
 }
--- a/src/views/data_pricing/calculateConfigNew.vue
View file @3ad84ff
+++ b/src/views/data_pricing/calculateConfigNew.vue
View file @3ad84ff
 <route lang="yaml">
-  name: calculateConfig
+  name: calculateConfigNew
  </route>
-<script lang="ts" setup name="calculateConfig">
+<script lang="ts" setup name="calculateConfigNew">
 import { ref, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -24,6 +24,7 @@ import {
 } from '@/api/modules/dataPricing';
 import { changeNum } from "@/utils/common";
 import { useValidator } from '@/hooks/useValidator';
+import { cloneDeep } from "lodash-es";
 const { required } = useValidator();
 const { proxy } = getCurrentInstance() as any;
@@ -119,7 +120,7 @@ const productConfigFormRules = ref({
 // 基础设置
 const baseConfigFormRef = ref();
-const baseConfigFormItems: any = ref([
+const baseConfigInitFormItems: any = ref([
  {
    label: '模型名称',
    type: 'select',
@@ -189,6 +190,8 @@ const baseConfigFormItems: any = ref([
  //   disabled: true
  // },
 ])
+const baseConfigFormItems = ref(cloneDeep(baseConfigInitFormItems.value));
 const baseConfigFormRules: any = ref({
  modelGuid: [
    { required: true, trigger: 'change', message: "请选择模型名称" }
@@ -420,7 +423,7 @@ const setDiseaseFormItems = () => {
    if (item) {
      item.options = typeMap.value['diseaseGuid'];
      const diseaseData = typeMap.value.diseaseGuid.find(m => m.guid == flowDetail.value.diseaseGuid);
-      if (!diseaseData) {
+      if (!diseaseData && flowDetail.value.diseaseGuid) {
        item.options.unshift({
          guid: flowDetail.value.diseaseGuid,
          diseaseName: flowDetail.value.diseaseName
@@ -558,7 +561,7 @@ const setTableData = (dataArr) => {
      const rGuid = item.demandTableGuid || item.guid;
      const rIndex = i;
      (() => {
-        getDemandField(rGuid, rIndex);
+     //   getDemandField(rGuid, rIndex);
      })()
    }
  })
@@ -567,7 +570,7 @@ const setTableData = (dataArr) => {
  }, 0);
  setTimeout(() => {
    tableData.value.map(t => {
-      expendTableRef.value.toggleRowExpansion(t);
+      expendTableRef.value?.toggleRowExpansion(t);
    })
  }, 200)
 }
@@ -612,7 +615,7 @@ const getQuilityModelScore = (sGuid) => {
  })
 }
 // 獲取模型相关信息
-const getModelInfo = (mGuid) => {
+const getModelInfo = (mGuid, valueInfo = null) => {
  const promises: any = [
    getModelConfig(mGuid),
    getModelDetail(mGuid)
@@ -626,7 +629,7 @@ const getModelInfo = (mGuid) => {
        dataTransactionPrice.value = flowDetail.value.dataTransactionPrice;
        setTimeout(() => {
          //   getResourceDetail(flowDetail.value.dataResourceGuid, false);
-          setFormItems();
+          setFormItems(valueInfo);
          setdemandTableData(mGuid);
        }, 200);
      } else {
@@ -747,8 +750,15 @@ const selectChange = async (val, row, info) => {
    demandTableFieldAllNum.value = 0;
    resourceTableAllNum.value = 0;
    resourceTableFieldAllNum.value = 0;
-    await setFormItems(info);
+    baseConfigFormItems.value[0].default = val;
-    val && getModelInfo(val);
+    baseConfigFormItems.value = [baseConfigFormItems.value[0]];
+    if (val) {
+      getModelInfo(val, info);
+    } else {
+      setFormItems(info);
+    }
+    // await setFormItems(info);
+    // val && getModelInfo(val, info);
    currModelGuid.value = val || '';
    qualityScoreData.value = {};
    //   baseConfigFormItems.value[1].default = '';
@@ -789,38 +799,38 @@ const selectChange = async (val, row, info) => {
  }
 }
 // 获取需求表字段
-const getDemandField = (rGuid, rIndex) => {
+// const getDemandField = (rGuid, rIndex) => {
-  getDemandList({
+//   getDemandList({
-    pageSize: -1,
+//     pageSize: -1,
-    pageIndex: 1,
+//     pageIndex: 1,
-    relationMenuGuid: rGuid,
+//     relationMenuGuid: rGuid,
-    bizState: 'Y'
+//     bizState: 'Y'
-  }).then((res: any) => {
+//   }).then((res: any) => {
-    tableLoading.value = false;
+//     tableLoading.value = false;
-    if (res.code == proxy.$passCode) {
+//     if (res.code == proxy.$passCode) {
-      const data = res.data || {};
+//       const data = res.data || {};
-      const fData = data.records || [];
+//       const fData = data.records || [];
-      const tFields = tableData.value[rIndex].dataFields;
+//       const tFields = tableData.value[rIndex].dataFields;
-      const tData = fData.map(item => {
+//       const tData = fData.map(item => {
-        const iData = tFields.find(t => t.demandFieldGuid == item.guid) || {};
+//         const iData = tFields.find(t => t.demandFieldGuid == item.guid) || {};
-        return {
+//         return {
-          ...item,
+//           ...item,
-          fieldName: item.fieldName,
+//           fieldName: item.fieldName,
-          isRequired: item.isRequired,
+//           isRequired: item.isRequired,
-          chName: item.chName || '',
+//           chName: item.chName || '',
-          enName: item.enName || '',
+//           enName: item.enName || '',
-          ...iData
+//           ...iData
-        }
+//         }
-      });
+//       });
-      tableData.value[rIndex].dataFields = tData;
+//       tableData.value[rIndex].dataFields = tData;
-    } else {
+//     } else {
-      proxy.$ElMessage.error(res.msg);
+//       proxy.$ElMessage.error(res.msg);
-    }
+//     }
-  }).catch(() => {
+//   }).catch(() => {
-    tableLoading.value = false;
+//     tableLoading.value = false;
-  })
+//   })
-}
+// }
 const toPath = () => {
  userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
  assetStore.set(true);
@@ -890,27 +900,27 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => {
  })
  params.dictionaryJson = Object.keys(dictionaryJson).length ? JSON.stringify(dictionaryJson) : '';
  params.builtIndicators = builtInTarget;
-  let demandMatchingData: any = [];
+  // let demandMatchingData: any = [];
-  tableData.value.map(item => {
+  // tableData.value.map(item => {
-    demandMatchingData.push({
+  //   demandMatchingData.push({
-      demandTableName: item.demandTableName,
+  //     demandTableName: item.demandTableName,
-      demandTableGuid: item.demandTableGuid || item.guid, // 需求表guid
+  //     demandTableGuid: item.demandTableGuid || item.guid, // 需求表guid
-      dataTableGuid: item.dataTableGuid || '', // 数据资源表guid
+  //     dataTableGuid: item.dataTableGuid || '', // 数据资源表guid
-      weightDemandTable: item.weightDemandTable,
+  //     weightDemandTable: item.weightDemandTable,
-      dataFieldsNum: item.dataFieldsNum,
+  //     dataFieldsNum: item.dataFieldsNum,
-      pricingDemandFieldRQVOS: item.dataFields.map(d => {
+  //     pricingDemandFieldRQVOS: item.dataFields.map(d => {
-        return {
+  //       return {
-          demandFieldGuid: d.demandFieldGuid || d.guid, // 资源表字段guid
+  //         demandFieldGuid: d.demandFieldGuid || d.guid, // 资源表字段guid
-          fieldName: d.fieldName,
+  //         fieldName: d.fieldName,
-          enName: d.enName,
+  //         enName: d.enName,
-          chName: d.chName,
+  //         chName: d.chName,
-          isRequired: d.isRequired,
+  //         isRequired: d.isRequired,
-          orderNum: d.orderNum
+  //         orderNum: d.orderNum
-        }
+  //       }
-      })
+  //     })
-    })
+  //   })
-  });
+  // });
-  params.dataPricingDemandmatchingRQVOS = demandMatchingData;
+  params.dataPricingDemandmatchingRQVOS = [];
  guid && (params.guid = guid);
  return params;
 }
@@ -939,8 +949,7 @@ const checkForm = (type) => {
  const baseConfigFormObj = baseConfigFormRef.value;
  const baseConfigFormEl = baseConfigFormObj.ruleFormRef;
  const baseConfigFormInfo = baseConfigFormObj.formInline;
-  productConfigFormRef.value.ruleFormRef.validate((valid1, errorItem) => {
+  const validateModelConfig = () => {
-    if (valid1) {
    baseConfigFormEl.validate(async (valid, errorItem) => {
      if (valid) {
        const paramsInfo = getCalculateParams(baseConfigFormObj, baseConfigFormInfo);
@@ -1001,6 +1010,13 @@ const checkForm = (type) => {
        baseConfigFormEl.scrollToField(obj[0]);
      }
    })
+  }
+  if (type == 'calculate') {
+    validateModelConfig();
+  } else {
+    productConfigFormRef.value.ruleFormRef.validate((valid1, errorItem) => {
+      if (valid1) {
+        validateModelConfig();
      } else {
        expandProduct.value = true;
        var obj = Object.keys(errorItem);
@@ -1012,6 +1028,7 @@ const checkForm = (type) => {
        })
      }
    })
+  }
 }
 const btnClick = async (btn, row: any = null) => {
  const type = btn.value;
@@ -1107,8 +1124,8 @@ onMounted(() => {
      </ContentWrap>
      <ContentWrap id="contract-content-wrap" title="输入参数" expandSwicth style="margin-top: 15px" :isExpand="expand1"
        @expand="(v) => expand1 = v">
-        <Form ref="baseConfigFormRef" formId="contract-content-form" :itemList="baseConfigForm.items"
+        <Form ref="baseConfigFormRef" formId="contract-content-form" :itemList="baseConfigFormItems"
-          :rules="baseConfigForm.rules" col="col3" @selectChange="selectChange" @cascaderChange="cascaderChange" />
+          :rules="baseConfigFormRules" col="col3" @selectChange="selectChange" @cascaderChange="cascaderChange" />
      </ContentWrap>
      <!-- <ContentWrap id="contract-signatory-wrap" title="需求匹配" expandSwicth style="margin-top: 15px" :isExpand="expand2"
        @expand="(v) => expand2 = v">