@nstc-business/imes 1.0.8 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +2 -2
  2. package/src/components/calculateDetail/index.vue +45 -5
  3. package/src/components/model-calculate/modelCalcTest.vue +18 -13
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nstc-business/imes",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -16,7 +16,7 @@
16
16
  "access": "public"
17
17
  },
18
18
  "dependencies": {
19
- "axios": "^0.21.4",
19
+ "axios": "^1.15.1",
20
20
  "core-js": "^3.6.5",
21
21
  "dayjs": "^1.10.7",
22
22
  "echarts": "^5.3.3",
package/src/components/calculateDetail/index.vue CHANGED
@@ -178,8 +178,11 @@
178
178
  <br/>
179
179
  {{ row.relFormula }}
180
180
  </div>
181
+ <div v-if="row.sourceType === 5 && row.showValueType === 1">
182
+ {{ row.fieldValue || row.fieldValue === 0 ? row.fieldValue : '--' }}
183
+ </div>
181
184
  <div
182
- v-if="
185
+ v-else-if="
183
186
  row.sourceType !== 3 &&
184
187
  (!row?.optionList || row?.optionList?.length == 0)
185
188
  "
@@ -333,6 +336,19 @@
333
336
  </div>
334
337
  </template>
335
338
  </vxe-column>
339
+ <vxe-column
340
+ slot="indicatorValText"
341
+ slot-scope="{ column }"
342
+ v-bind="{ ...column, field: column.prop, title: column.label }"
343
+ v-if="!typeObj.targetArray.every(
344
+ el => !el.supplementRuleVOList || item.supplementRuleVOList.length === 0
345
+ )">
346
+ <template slot-scope="{ row }">
347
+ <div>
348
+ {{row.indicatorValText || '--' }}
349
+ </div>
350
+ </template>
351
+ </vxe-column>
336
352
  </table-pro>
337
353
  </div>
338
354
  <!-- 评价模型 -->
@@ -393,8 +409,11 @@
393
409
  <br/>
394
410
  {{ row.relFormula }}
395
411
  </div>
412
+ <div v-if="row.sourceType === 5 && row.showValueType === 1">
413
+ {{ row.fieldValue || row.fieldValue === 0 ? row.fieldValue : '--' }}
414
+ </div>
396
415
  <div
397
- v-if="
416
+ v-else-if="
398
417
  row.sourceType !== 3 &&
399
418
  (!row?.optionList || row?.optionList?.length == 0)
400
419
  "
@@ -603,8 +622,11 @@
603
622
  <br/>
604
623
  {{ row.relFormula }}
605
624
  </div>
625
+ <div v-if="row.sourceType === 5 && row.showValueType === 1">
626
+ {{ row.fieldValue || row.fieldValue === 0 ? row.fieldValue : '--' }}
627
+ </div>
606
628
  <div
607
- v-if="
629
+ v-else-if="
608
630
  row.sourceType !== 3 &&
609
631
  (!row?.optionList || row?.optionList?.length == 0)
610
632
  "
@@ -823,8 +845,11 @@
823
845
  <br/>
824
846
  {{ row.relFormula }}
825
847
  </div>
848
+ <div v-if="row.sourceType === 5 && row.showValueType === 1">
849
+ {{ row.fieldValue || row.fieldValue === 0 ? row.fieldValue : '--' }}
850
+ </div>
826
851
  <div
827
- v-if="
852
+ v-else-if="
828
853
  row.sourceType !== 3 &&
829
854
  (!row?.optionList || row?.optionList?.length == 0)
830
855
  "
@@ -958,6 +983,19 @@
958
983
  </div>
959
984
  </template>
960
985
  </vxe-column>
986
+ <vxe-column
987
+ slot="indicatorValText"
988
+ slot-scope="{ column }"
989
+ v-bind="{ ...column, field: column.prop, title: column.label }"
990
+ v-if="!item.tableData.every(
991
+ el => !el.supplementRuleVOList || item.supplementRuleVOList.length === 0
992
+ )">
993
+ <template slot-scope="{ row }">
994
+ <div>
995
+ {{row.indicatorValText || '--' }}
996
+ </div>
997
+ </template>
998
+ </vxe-column>
961
999
  </table-pro>
962
1000
  </div>
963
1001
  </div>
@@ -1299,6 +1337,7 @@ export default {
1299
1337
  {
1300
1338
  label: '指标值显示',
1301
1339
  prop: 'indicatorValText',
1340
+ slotName: 'indicatorValText',
1302
1341
  align: 'center',
1303
1342
  minWidth: 150,
1304
1343
  'show-overflow-tooltip': false
@@ -1581,6 +1620,7 @@ export default {
1581
1620
  itemc.relFormula = item.relFormula
1582
1621
  itemc.displayFormula = item.displayFormula
1583
1622
  itemc.serialNumber = item.serialNumber
1623
+ itemc.fieldValue = item.fieldValue
1584
1624
  this.itemDataFn(itemc, data)
1585
1625
  }
1586
1626
 
@@ -1788,7 +1828,7 @@ export default {
1788
1828
  },
1789
1829
  async printFn() {
1790
1830
  const res = await this.$axios.post('/imes/v1/indicatorModel/print', [
1791
- {logId: this.id, modelId: this.$route.query.modelId}
1831
+ {logId: this.logId, modelId: this.modelId}
1792
1832
  ])
1793
1833
  printJS({
1794
1834
  printable: res.data,
package/src/components/model-calculate/modelCalcTest.vue CHANGED
@@ -826,6 +826,7 @@ export default {
826
826
  itemc.result = item.result
827
827
  itemc.indicatorResult = item.indicatorResult
828
828
  itemc.businessModuleRemark = item.businessModuleRemark
829
+ itemc.fieldValue = item.fieldValue
829
830
  if (item.itemType !== 22 && (item.modifiedVal || item.modifiedVal === 0)) {
830
831
  itemc.value = item.modifiedVal
831
832
  }
@@ -1182,21 +1183,25 @@ export default {
1182
1183
  }
1183
1184
  },
1184
1185
  resultByshowStyle(row) {
1185
- const digits =
1186
- row.showDigits || row.showDigits === 0
1187
- ? row.showDigits
1188
- : this.modelData.digits
1189
1186
  let val = ''
1190
- if (row.showStyle === 2) {
1191
- val =
1192
- row.result || row.result === 0
1193
- ? addThousands(toFixedTrunc(row?.result, digits))
1194
- : ''
1187
+ if (row.sourceType === 5 && row.showValueType === 1) {
1188
+ val = row.fieldValue
1195
1189
  } else {
1196
- val =
1197
- row.result || row.result === 0
1198
- ? Number(row.result).toFixed(digits)
1199
- : ''
1190
+ const digits =
1191
+ row.showDigits || row.showDigits === 0
1192
+ ? row.showDigits
1193
+ : this.modelData.digits
1194
+ if (row.showStyle === 2) {
1195
+ val =
1196
+ row.result || row.result === 0
1197
+ ? addThousands(toFixedTrunc(row?.result, digits))
1198
+ : ''
1199
+ } else {
1200
+ val =
1201
+ row.result || row.result === 0
1202
+ ? Number(row.result).toFixed(digits)
1203
+ : ''
1204
+ }
1200
1205
  }
1201
1206
  return val
1202
1207
  },