@nstc-business/imes 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/measureCalc/EvaOfCreditConditionsRewrite.vue

@@ -19,9 +19,7 @@
             <span v-if="statResult.statCalMethod == 1 && statResult.statShow == 1">
               {{ statResult.name }}合计:
               {{
-                statResult.statResult || statResult.statResult === 0
-                  ? statResult.statResult.toFixed(paramsObj.digits)
-                  : ''
+                formatScoreCell(statResult.statResult)
               }}
             </span>
           </div>
@@ -55,17 +53,7 @@
               <!-- 手工录入的时候不显示调整框，显示手工录入的框，就是 sourceType为3-->
               <div v-else-if="row[column.prop]?.sourceType === 3">
                 <span v-if="column.disabled">
-                  {{
-                    row[column.prop]?.value || row[column.prop]?.value === 0
-                      ? N.subFixed(row[column.prop]?.value, paramsObj.digits)
-                      : ''
-                  }}
-
-                  {{
-                    row[column.prop]?.displayStyle === 1 && (row[column.prop]?.value || row[column.prop]?.value === 0)
-                      ? '%'
-                      : ''
-                  }}
+                  {{ formatScoreCell(row[column.prop]?.value) }}
                 </span>
                 <div v-else>
                   <InputNumber
@@ -91,17 +79,7 @@
               <!-- @change="getReason(node)" -->
               <div v-else-if="row[column.prop]?.sourceType === 0">
                 <span v-if="column.disabled">
-                  {{
-                    row[column.prop]?.value || row[column.prop]?.value === 0
-                      ? N.subFixed(row[column.prop]?.value, paramsObj.digits)
-                      : ''
-                  }}
-
-                  {{
-                    row[column.prop]?.displayStyle === 1 && (row[column.prop]?.value || row[column.prop]?.value === 0)
-                      ? '%'
-                      : ''
-                  }}
+                  {{ formatScoreCell(row[column.prop]?.value) }}
                 </span>
                 <el-select
                   v-else
@@ -151,6 +129,9 @@
                   "
                 ></InputNumber>
 
+                <span v-else-if="column.disabled">
+                  {{ formatScoreCell(row[column.prop]?.value) }}
+                </span>
                 <span v-else>
                   {{
                     row[column.prop]?.value || row[column.prop]?.value === 0
@@ -203,6 +184,7 @@ import { N } from 'n20-common-lib'
 import { Descriptions, Table, InputNumber } from './ui'
 import { getScoreMap } from './api'
 import { formatFloat2 } from '../common'
+import { formatScoreText } from './helpers'
 export default {
   name: 'EvaOfCreditConditions',
   components: { Descriptions, Table, InputNumber },
@@ -235,7 +217,8 @@ export default {
       //   }
       // })
       result = this.nodeListData.result
-      return formatFloat2(result, this.paramsObj.digits)
+      // 总得分固定 2 位四舍五入，不读模型 digits
+      return formatScoreText(result)
     },
     opinionPage() {
       return (
@@ -245,6 +228,10 @@ export default {
     }
   },
   methods: {
+    /** 得分列/合计：固定 2 位四舍五入 */
+    formatScoreCell(val) {
+      return formatScoreText(val)
+    },
     // 指标值是否可录入
     showInput(row) {
       // 授信定量分析指标值，系统取数可编辑 手工填报：3

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -105,15 +105,17 @@
             </el-select>
           </template>
           <div v-else>
-            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
+            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方；悬浮展示计算公式（对齐测算详情） -->
             <el-tooltip
               v-if="row.sourceType !== 3 && (row.displayFormula || row.relFormula)"
               placement="top"
               effect="dark"
             >
-              <template #content>
-                <div>{{ row.displayFormula }}</div>
-              </template>
+              <div slot="content">
+                {{ row.displayFormula }}：
+                <br />
+                {{ row.relFormula }}
+              </div>
               <span>{{ indicatorTextFn(row) }}</span>
             </el-tooltip>
             <span v-else-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
@@ -160,7 +162,7 @@
               row.modifyRank === 1
             "
             class="full-w"
-            :d-num="ctx.modelWrap.digits"
+            :d-num="SCORE_DIGITS"
             :max="row.fullScore"
             :disabled="ctx.readonly"
             v-model="row.modifiedResult"
@@ -230,6 +232,7 @@ import { InputNumber } from './ui'
 import {
   isQualIndicator,
   digitsCalc,
+  SCORE_DIGITS,
   resultByShowStyle,
   indicatorScoreText,
   indicatorResultText,
@@ -242,6 +245,9 @@ export default {
   name: 'MeasureEvalFlatTable',
   components: { InputNumber },
   inject: ['measureCtx'],
+  data() {
+    return { SCORE_DIGITS }
+  },
   props: {
     section: {
       type: Object,

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -231,7 +231,7 @@ export default {
       return indicatorScoreText(node, this.modelWrap)
     },
     formatScore(val) {
-      if (val === '' || val == null) return ''
+      // resultByShowStyle 已固定得分 2 位四舍五入
       return resultByShowStyle({ result: val }, this.modelWrap)
     },
     formatFullScore(node) {

package/src/components/measureCalc/MeasureStatCell.vue

@@ -86,6 +86,7 @@
 <script>
 import { InputNumber } from './ui'
 import { toFixedTrunc, addThousands } from '../common'
+import { formatScoreText } from './helpers'
 
 export default {
   name: 'MeasureStatCell',
@@ -94,6 +95,7 @@ export default {
   props: {
     cell: { type: Object, default: null },
     column: { type: Object, default: () => ({}) },
+    /** 指标值小数位（可读模型配置）；得分列固定 SCORE_DIGITS */
     digits: { type: Number, default: 2 }
   },
   computed: {
@@ -133,15 +135,11 @@ export default {
         if (val === '' || val == null) return ''
         return String(val)
       }
+      // 得分列：固定 2 位四舍五入，不读模型 digits
       if (this.column.disabled) {
         const val =
           cell.result !== '' && cell.result != null ? cell.result : cell.value
-        if (val === '' || val == null) return ''
-        let text = Number(val).toFixed(this.digits)
-        if (cell.showStyle === 2) {
-          text = addThousands(toFixedTrunc(val, this.digits))
-        }
-        return text
+        return formatScoreText(val, { thousands: cell.showStyle === 2 })
       }
       const val = cell.value
       if (val === '' || val == null) return ''

package/src/components/measureCalc/MeasureStatFlatTable.vue

@@ -115,7 +115,7 @@
               row.modifyRank === 1
             "
             class="full-w"
-            :d-num="ctx.modelWrap.digits"
+            :d-num="SCORE_DIGITS"
             :max="row.fullScore"
             :disabled="ctx.readonly"
             v-model="row.modifiedResult"
@@ -139,6 +139,7 @@ import { setMergeCells } from '../common'
 import {
   isQualIndicator,
   digitsCalc,
+  SCORE_DIGITS,
   resultByShowStyle,
   indicatorResultText
 } from './helpers'
@@ -157,6 +158,9 @@ export default {
   name: 'MeasureStatFlatTable',
   components: { InputNumber },
   inject: ['measureCtx'],
+  data() {
+    return { SCORE_DIGITS }
+  },
   props: {
     rows: {
       type: Array,

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -46,7 +46,7 @@ import {
   hasStatPivotNodes,
   sumStatBlockScores
 } from './statModelHelper'
-import { showLevelSerial } from './helpers'
+import { showLevelSerial, formatScoreText } from './helpers'
 import { withRequestTimestamp } from './api'
 import MeasureStatCell from './MeasureStatCell.vue'
 
@@ -93,7 +93,7 @@ export default {
       if (!this.ctx.parentCalced) return '得分小计: --'
       const total = sumStatBlockScores(block)
       if (total === null) return '得分小计: --'
-      return `得分小计: ${Number(total).toFixed(this.digits)}`
+      return `得分小计: ${formatScoreText(total)}`
     },
     dynamicColumns(block) {
       return (block.columns || []).filter(c => c.prop !== 'name')

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -129,8 +129,20 @@
       <vxe-column title="指标值" min-width="200" align="center">
         <template #default="{ row }">
           <div>
-            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
-            <span v-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
+            <!-- 原指标值：非手工填报始终展示；悬浮展示计算公式（对齐测算详情） -->
+            <el-tooltip
+              v-if="row.sourceType !== 3 && (row.displayFormula || row.relFormula)"
+              placement="top"
+              effect="dark"
+            >
+              <div slot="content">
+                {{ row.displayFormula }}：
+                <br />
+                {{ row.relFormula }}
+              </div>
+              <span>{{ indicatorTextFn(row) }}</span>
+            </el-tooltip>
+            <span v-else-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
             <InputNumber
               v-if="row.sourceType === 3 && row.itemType === 21"
               class="full-w"
@@ -176,7 +188,7 @@
                 row.result !== null
               "
               class="full-w"
-              :d-num="digitsFn(row)"
+              :d-num="SCORE_DIGITS"
               :disabled="ctx.readonly"
               v-model="row.modifiedResult"
               placeholder="请输入"
@@ -266,15 +278,17 @@
       <vxe-column title="指标值" min-width="260" align="center">
         <template #default="{ row }">
           <div v-if="isQuantIndicatorFn(row)">
-            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
+            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方；悬浮展示计算公式（对齐测算详情） -->
             <el-tooltip
               v-if="row.sourceType !== 3 && (row.displayFormula || row.relFormula)"
               placement="top"
               effect="dark"
             >
-              <template #content>
-                <div>{{ row.displayFormula }}</div>
-              </template>
+              <div slot="content">
+                {{ row.displayFormula }}：
+                <br />
+                {{ row.relFormula }}
+              </div>
               <span>{{ indicatorTextFn(row) }}</span>
             </el-tooltip>
             <span v-else-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
@@ -312,9 +326,11 @@
               placement="top"
               effect="dark"
             >
-              <template #content>
-                <div>{{ row.displayFormula }}</div>
-              </template>
+              <div slot="content">
+                {{ row.displayFormula }}：
+                <br />
+                {{ row.relFormula }}
+              </div>
               <span>{{ subModelIndicatorFn(row) }}</span>
             </el-tooltip>
             <span v-else>{{ subModelIndicatorFn(row) || '—' }}</span>
@@ -343,7 +359,7 @@
                 row.result !== '' && row.result !== null && row.modifyRank === 1
               "
               class="full-w"
-              :d-num="ctx.modelWrap.digits"
+              :d-num="SCORE_DIGITS"
               :max="row.fullScore"
               :disabled="ctx.readonly"
               v-model="row.modifiedResult"
@@ -422,6 +438,7 @@ import {
   showLevelSerial,
   typeMeta,
   digitsCalc,
+  SCORE_DIGITS,
   resultByShowStyle,
   indicatorScoreText,
   indicatorResultText,
@@ -435,6 +452,9 @@ export default {
   name: 'MeasureTreeTable',
   components: { InputNumber, MeasureQualAnalysis, MeasureSubModelPanel },
   inject: ['measureCtx'],
+  data() {
+    return { SCORE_DIGITS }
+  },
   props: {
     section: {
       type: Object,

package/src/components/measureCalc/helpers.js

@@ -9,7 +9,7 @@
  * modifyRank：0 不调整 1 调整指标得分 2 调整指标值
  */
 import { N } from 'n20-common-lib'
-import { toFixedTrunc, addThousands } from '../common'
+import { addThousands } from '../common'
 import { resolveManualFillValue, statItemChildren } from './statModelHelper'
 
 export const ITEM_TYPE = {
@@ -209,7 +209,7 @@ export function typeMeta(row) {
   return map[nodeTypeOf(row)] || map.group
 }
 
-/** 小数位：优先取指标自身 showDigits，否则取模型整体 digits */
+/** 小数位：优先取指标自身 showDigits，否则取模型整体 digits（仅用于指标值等非得分展示） */
 export function digitsCalc(row, modelWrap) {
   if (row && (row.showDigits || row.showDigits === 0)) {
     return row.showDigits
@@ -217,25 +217,39 @@ export function digitsCalc(row, modelWrap) {
   return modelWrap ? modelWrap.digits : 2
 }
 
-/** 模型指标得分 / 模型指标系数数值（权重之后的 result） */
+/**
+ * 得分展示固定小数位（总得分/指标得分/模型指标得分等）
+ * 不读业务系统模型「保留小数位数」配置，始终四舍五入保留 2 位
+ */
+export const SCORE_DIGITS = 2
+
+/**
+ * 得分数值格式化：四舍五入，固定保留 SCORE_DIGITS 位
+ * @param {*} val
+ * @param {{ thousands?: boolean }} [options]
+ */
+export function formatScoreText(val, options = {}) {
+  if (val === '' || val == null) return ''
+  const num = Number(val)
+  if (Number.isNaN(num)) return String(val)
+  let text = num.toFixed(SCORE_DIGITS)
+  if (options.thousands) {
+    text = addThousands(text)
+  }
+  return text
+}
+
+/** 模型指标得分 / 模型指标系数数值（权重之后的 result）；得分不读模型 digits */
 export function resultByShowStyle(row, modelWrap) {
-  let val = ''
-  const digits = digitsCalc(row, modelWrap)
-  if (row.showStyle === 2) {
-    val =
-      row.result || row.result === 0
-        ? addThousands(toFixedTrunc(row.result, digits))
-        : ''
-  } else {
-    val =
-      row.result || row.result === 0 ? Number(row.result).toFixed(digits) : ''
+  if (!row || (row.result !== 0 && (row.result === '' || row.result == null))) {
+    return ''
   }
-  return val
+  return formatScoreText(row.result, { thousands: row.showStyle === 2 })
 }
 
 /**
  * 指标得分（权重之前）：result * 100 / weight
- * 与旧测算详情 valueScore 算法一致；无权重时不展示
+ * 与旧测算详情 valueScore 算法一致；无权重时不展示；得分固定 2 位四舍五入
  */
 export function indicatorScoreText(row, modelWrap) {
   if (!row || (row.result !== 0 && (row.result === '' || row.result == null))) {
@@ -244,8 +258,12 @@ export function indicatorScoreText(row, modelWrap) {
   if (!row.weight) {
     return resultByShowStyle(row, modelWrap)
   }
-  const digits = digitsCalc(row, modelWrap)
-  return N.div(N.mul(row.result, 100, digits + 2), row.weight, digits)
+  const raw = N.div(
+    N.mul(row.result, 100, SCORE_DIGITS + 2),
+    row.weight,
+    SCORE_DIGITS + 2
+  )
+  return formatScoreText(raw, { thousands: row.showStyle === 2 })
 }
 
 /** 是否展示满分值（showFullScore：1 展示；0 不展示；空值兼容旧数据按展示处理） */

package/src/components/measureCalc/index.vue

@@ -214,7 +214,8 @@ import {
   isCalcRootModel as checkCalcRootModel,
   isStatRootModel as checkStatRootModel,
   subModelResultText as formatSubModelResult,
-  saveSubModelValueText
+  saveSubModelValueText,
+  formatScoreText
 } from './helpers'
 import { preprocessStatIndicatorDeepList, mergeStatModelNode, statItemChildren } from './statModelHelper'
 import { withRequestTimestamp } from './api'
@@ -407,15 +408,21 @@ export default {
       if (this.model.version === '' || this.model.version == null) return '--'
       return `版本${this.model.version}`
     },
-    /** 测算结果展示：优先 resultText，统计模型计算模式可回退到 result */
+    /** 测算结果展示：优先 resultText，统计模型计算模式可回退到 result；得分固定 2 位四舍五入 */
     displayResultText() {
-      if (this.resultText !== '' && this.resultText != null) {
-        return this.resultText
-      }
-      if (this.calcResult !== '' && this.calcResult != null) {
-        return this.calcResult
+      const raw =
+        this.resultText !== '' && this.resultText != null
+          ? this.resultText
+          : this.calcResult !== '' && this.calcResult != null
+            ? this.calcResult
+            : null
+      if (raw === null || raw === '') return '--'
+      const text = String(raw).trim()
+      // 纯数字得分：固定 2 位；非数字文案原样展示
+      if (/^-?\d+(\.\d+)?$/.test(text)) {
+        return formatScoreText(text)
       }
-      return '--'
+      return String(raw)
     },
     /** 评价模型展示「模型得分」，计算模型展示「模型公式」 */
     formulaRowLabel() {
@@ -1330,10 +1337,8 @@ export default {
     },
 
     formatScoreNum(val) {
-      if (val === '' || val == null) return ''
-      const digits = this.model.digits != null ? this.model.digits : 2
-      const num = Number(val)
-      return Number.isNaN(num) ? String(val) : num.toFixed(digits)
+      // 得分固定 2 位四舍五入，不读模型 digits 配置
+      return formatScoreText(val)
     },
 
     /**

package/src/components/measureCalc/statModelHelper.js

@@ -262,6 +262,14 @@ function isShowFullScoreNode(row) {
   return !!(row && row.showFullScore !== 0)
 }
 
+/**
+ * 统计项是否展示指标得分列（statShow：1 展示；0 不展示；空值经 resolveStatMeta 已默认 1）
+ * 与业务端 EvaOfCreditConditionsRewrite 一致
+ */
+function isShowStatScoreCol(statMeta) {
+  return !!(statMeta && Number(statMeta.statShow) === 1)
+}
+
 /** 某一统计项列是否需要「满分值」列（任一行开启则展示） */
 function shouldShowFullScoreCol(indicatorItems, statsName) {
   return (indicatorItems || []).some(ind => {
@@ -347,8 +355,8 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
           align: 'center',
           slotName: label
         })
-        // 测算页始终展示指标得分列；statShow 仅约束业务端（授信等）是否展示
-        if (statMeta.calType == 0) {
+        // 与业务端一致：按统计项「指标得分是否展示」(statShow) 决定是否展示得分列
+        if (statMeta.calType == 0 && isShowStatScoreCol(statMeta)) {
           columns.push({
             label: item.statsName + '指标得分',
             prop: item.statsName + '指标得分',