数据定价更新
Showing
1 changed file
with
7 additions
and
14 deletions
| ... | @@ -380,7 +380,7 @@ const setBuildInFormItems = (buildList) => { | ... | @@ -380,7 +380,7 @@ const setBuildInFormItems = (buildList) => { |
| 380 | type: 'input', | 380 | type: 'input', |
| 381 | placeholder: '', | 381 | placeholder: '', |
| 382 | field: buildField, | 382 | field: buildField, |
| 383 | default: '', | 383 | default: b.isInputParameter != 'Y' ? changeNum(b.defaultValue, 2) : b.defaultValue != '' && b.defaultValue != null ? parseFloat(b.defaultValue).toFixed(2) : '', |
| 384 | inputType: 'moneyNumber', | 384 | inputType: 'moneyNumber', |
| 385 | maxlength: 18, | 385 | maxlength: 18, |
| 386 | clearable: true, | 386 | clearable: true, |
| ... | @@ -491,11 +491,9 @@ const setTableData = (dataArr) => { | ... | @@ -491,11 +491,9 @@ const setTableData = (dataArr) => { |
| 491 | if ((item.demandTableGuid || item.guid)) { | 491 | if ((item.demandTableGuid || item.guid)) { |
| 492 | const rGuid = item.demandTableGuid || item.guid; | 492 | const rGuid = item.demandTableGuid || item.guid; |
| 493 | const rIndex = i; | 493 | const rIndex = i; |
| 494 | if (!guid || (guid && rGuid != (demInfo?.demandTableGuid || ''))) { | 494 | (() => { |
| 495 | (() => { | 495 | getDemandField(rGuid, rIndex); |
| 496 | getDemandField(rGuid, rIndex); | 496 | })() |
| 497 | })() | ||
| 498 | } | ||
| 499 | } | 497 | } |
| 500 | }) | 498 | }) |
| 501 | resourceTableFieldAllNum.value = tableData.value.reduce((accumulator, currentValue) => { | 499 | resourceTableFieldAllNum.value = tableData.value.reduce((accumulator, currentValue) => { |
| ... | @@ -680,7 +678,7 @@ const setRowData = (rowData, dGuid, detailDataTable) => { | ... | @@ -680,7 +678,7 @@ const setRowData = (rowData, dGuid, detailDataTable) => { |
| 680 | 678 | ||
| 681 | const setTableRowData = (dGuid, rIndex, setRow = true) => { | 679 | const setTableRowData = (dGuid, rIndex, setRow = true) => { |
| 682 | let rowData = tableData.value[rIndex]; | 680 | let rowData = tableData.value[rIndex]; |
| 683 | const detailDataTable = (flowDetail.value.dataPricingDemandmatchingRQVOS || []).find(f => f.dataTableGuid == dGuid); | 681 | const detailDataTable = (flowDetail.value.dataPricingDemandmatchingRQVOS || []).find(f => f.dataTableGuid == dGuid && f.demandTableGuid == rowData.demandTableGuid); |
| 684 | setRow && setRowData(rowData, dGuid, detailDataTable); | 682 | setRow && setRowData(rowData, dGuid, detailDataTable); |
| 685 | const currDataTableGuid = detailDataTable?.dataTableGuid || ''; | 683 | const currDataTableGuid = detailDataTable?.dataTableGuid || ''; |
| 686 | if (dGuid) { | 684 | if (dGuid) { |
| ... | @@ -866,8 +864,8 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => { | ... | @@ -866,8 +864,8 @@ const getCalculateParams = (baseConfigFormObj, baseConfigFormInfo) => { |
| 866 | } | 864 | } |
| 867 | buildInData.value.map(item => { | 865 | buildInData.value.map(item => { |
| 868 | let targetValue = baseConfigFormInfo[`build_${item.guid}`]; | 866 | let targetValue = baseConfigFormInfo[`build_${item.guid}`]; |
| 869 | if(typeof targetValue === 'string'){ | 867 | if (typeof targetValue === 'string') { |
| 870 | if(/^[+-]?\d{1,3}(,\d{3})*(\.\d{2})?$/.test(targetValue)){ | 868 | if (/^[+-]?\d{1,3}(,\d{3})*(\.\d{2})?$/.test(targetValue)) { |
| 871 | targetValue = parseFloat(targetValue.replace(/,/g, '')) | 869 | targetValue = parseFloat(targetValue.replace(/,/g, '')) |
| 872 | } | 870 | } |
| 873 | } | 871 | } |
| ... | @@ -1158,11 +1156,6 @@ onMounted(() => { | ... | @@ -1158,11 +1156,6 @@ onMounted(() => { |
| 1158 | clearable /> | 1156 | clearable /> |
| 1159 | </template> | 1157 | </template> |
| 1160 | </el-table-column> | 1158 | </el-table-column> |
| 1161 | <el-table-column label="操作" fixed="right" width="100"> | ||
| 1162 | <template #default="scope"> | ||
| 1163 | <el-button type="primary" link @click="btnClick({ value: 'expend' }, scope.row)">字段映射</el-button> | ||
| 1164 | </template> | ||
| 1165 | </el-table-column> | ||
| 1166 | </el-table> | 1159 | </el-table> |
| 1167 | </div> | 1160 | </div> |
| 1168 | </div> | 1161 | </div> | ... | ... |
-
Please register or sign in to post a comment