数据定价更新

@@ -274,10 +274,8 @@ const getDetail = () => {
         typeMap.value.modelGuid.unshift(mtem);
         typeMap.value.modelGuid.unshift(mtem);
         baseConfigFormItems.value[0].options.unshift(mtem);
         baseConfigFormItems.value[0].options.unshift(mtem);
       };
       };
-      setTimeout(() => {
-        getModelInfo(flowDetail.value.modelGuid);
-        getDataTypeList()
-      }, 200)
+      getModelInfo(flowDetail.value.modelGuid);
+      getDataTypeList()
     }
     }
   }).catch(() => {
   }).catch(() => {
     loading.value = false;
     loading.value = false;
@@ -374,7 +372,8 @@ const setBuildInFormItems = (buildList) => {
     buildInData.value.push({
     buildInData.value.push({
       guid: b.guid,
       guid: b.guid,
       targetName: buildName,
       targetName: buildName,
-      targetValue: b.defaultValue || ''
+      targetValue: b.defaultValue || '',
+      isInputParameter: b.isInputParameter,
     })
     })
     baseConfigFormItems.value.push({
     baseConfigFormItems.value.push({
       label: buildName,
       label: buildName,
@@ -385,7 +384,8 @@ const setBuildInFormItems = (buildList) => {
       inputType: 'moneyNumber',
       inputType: 'moneyNumber',
       maxlength: 18,
       maxlength: 18,
       clearable: true,
       clearable: true,
-      disabled: b.isInputParameter != 'Y'
+      disabled: b.isInputParameter != 'Y',
+      required: true
     });
     });
     baseConfigFormRules.value[buildField] = [
     baseConfigFormRules.value[buildField] = [
       { required: true, message: `请填写${buildName}`, trigger: 'blur' },
       { required: true, message: `请填写${buildName}`, trigger: 'blur' },
@@ -865,9 +865,15 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => {
     }
     }
   }
   }
   buildInData.value.map(item => {
   buildInData.value.map(item => {
+    let targetValue = baseConfigFormInfo[`build_${item.guid}`];
+    if(typeof targetValue === 'string'){
+      if(/^[+-]?\d{1,3}(,\d{3})*(\.\d{2})?$/.test(targetValue)){
+        targetValue = parseFloat(targetValue.replace(/,/g, ''))
+      }
+    }
     builtInTarget.push({
     builtInTarget.push({
       ...item,
       ...item,
-      targetValue: baseConfigFormInfo[`build_${item.guid}`],
+      targetValue
     })
     })
   })
   })
   params.dictionaryJson = Object.keys(dictionaryJson).length ? JSON.stringify(dictionaryJson) : '';
   params.dictionaryJson = Object.keys(dictionaryJson).length ? JSON.stringify(dictionaryJson) : '';
@@ -1060,11 +1066,9 @@ onBeforeMount(() => {
     getDetail();
     getDetail();
   } else {
   } else {
     getDataTypeList();
     getDataTypeList();
-    getModel()
   }
   }
 })
 })
 onMounted(() => {
 onMounted(() => {
-  getModel()
 })
 })
 </script>
 </script>
 <template>
 <template>