@nstc-business/imes 1.0.19 → 1.0.21

package/package.json

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

package/src/components/calculateDetail/index.vue

@@ -101,8 +101,20 @@
           label-width="10em"
           v-if="modelData.sataMode !== 1"
         >
-          <el-form-item label="模型得分：" v-if="modelData.type === 1">
-            <span>{{ modelData.result.toFixed(modelData.digits) }}</span>
+          <el-form-item
+            label="模型得分："
+            v-if="
+              modelData.type === 1 ||
+                (modelData.type === 3 && modelData.sataMode === 2)
+            "
+          >
+            <span>
+              {{
+                modelData.result || modelData.result === 0
+                  ? Number(modelData.result).toFixed(modelData.digits)
+                  : '--'
+              }}
+            </span>
           </el-form-item>
           <el-form-item label="模型结果：" v-if="modelData.type !== 3">
             <span>{{ modelData.resultText }}</span>

package/src/components/measureCalc/MeasureStatCell.vue

@@ -79,7 +79,8 @@ export default {
   methods: {
     displayValue(cell) {
       if (this.column.disabled) {
-        const val = cell.result
+        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) {

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -114,6 +114,30 @@ export default {
         return []
       }
     },
+    /** 嵌套统计模型时父模没有 modelStatsSetupVOS，按子模型 ID 拉取统计项配置 */
+    async ensureModelStatsSetup(modelWrap) {
+      const existing =
+        (modelWrap && modelWrap.modelStatsSetupVOS) ||
+        (this.subModel && this.subModel.modelStatsSetupVOS)
+      if (Array.isArray(existing) && existing.length) return existing
+      const id =
+        (this.subModel && (this.subModel.itemID || this.subModel.modelID)) ||
+        (modelWrap && modelWrap.modelID)
+      if (!id) return null
+      try {
+        const { code, data } = await this.$axios.post(
+          withRequestTimestamp('/imes/v1/indicatorModel/getModelById'),
+          { id }
+        )
+        if (code === 0 && data && Array.isArray(data.modelStatsSetupVOS)) {
+          this.$set(this.subModel, 'modelStatsSetupVOS', data.modelStatsSetupVOS)
+          return data.modelStatsSetupVOS
+        }
+      } catch (e) {
+        /* ignore */
+      }
+      return null
+    },
     async loadTables() {
       if (!this.subModel || !hasStatPivotNodes(this.subModel)) {
         this.tableData = []
@@ -121,9 +145,16 @@ export default {
       }
       this.loading = true
       try {
+        const modelWrap = this.ctx.modelWrap || {}
+        await this.ensureModelStatsSetup(modelWrap)
         this.tableData = await buildStatModelTables(
           this.subModel,
-          id => this.fetchScoreMap(id)
+          id => this.fetchScoreMap(id),
+          {
+            ...modelWrap,
+            modelStatsSetupVOS:
+              this.subModel.modelStatsSetupVOS || modelWrap.modelStatsSetupVOS
+          }
         )
       } finally {
         this.loading = false

package/src/components/measureCalc/helpers.js

@@ -89,9 +89,9 @@ export const SUB_MODEL_LABEL = '测算子模型'
 /** 子模型独立测算按钮文案 */
 export const SUB_MODEL_CALC_BTN = '子模型测算'
 
-/** 子模型测算结果展示（优先 resultText，否则格式化 result） 统计模型没有测算结果*/
+/** 子模型测算结果展示（优先 resultText，否则格式化 result） */
 export function subModelResultText(row, modelWrap) {
-  if (!row || row.itemType ===13) return ''
+  if (!row) return ''
   if (row.resultText != null && row.resultText !== '') {
     return row.resultText
   }

package/src/components/measureCalc/index.vue

@@ -47,7 +47,7 @@
           </span>
           <span class="meta-item">
             <span class="meta-label">测算结果</span>
-            <span class="meta-value meta-result">{{ resultText || '--' }}</span>
+            <span class="meta-value meta-result">{{ displayResultText }}</span>
           </span>
         </div>
 
@@ -386,18 +386,29 @@ export default {
     statRootModel() {
       return checkStatRootModel(this.model)
     },
-    /** 顶层统计模型的根节点 */
+    /** 顶层统计模型的根节点（必须返回原引用，保证 _statTableVersion 能触发子表刷新） */
     statRootNode() {
       const root = this.model.modelTreeVO || {}
-      return {
-        ...root,
-        itemID: root.itemID || root.modelID || this.model.modelID
+      const itemID = root.itemID || root.modelID || this.model.modelID
+      if (itemID && root.itemID !== itemID) {
+        this.$set(root, 'itemID', itemID)
       }
+      return root
     },
     modelVersionText() {
       if (this.model.version === '' || this.model.version == null) return '--'
       return `版本${this.model.version}`
     },
+    /** 测算结果展示：优先 resultText，统计模型计算模式可回退到 result */
+    displayResultText() {
+      if (this.resultText !== '' && this.resultText != null) {
+        return this.resultText
+      }
+      if (this.calcResult !== '' && this.calcResult != null) {
+        return this.calcResult
+      }
+      return '--'
+    },
     /** 评价模型展示「模型得分」，计算模型展示「模型公式」 */
     formulaRowLabel() {
       if (this.evalRootModel) return '模型得分：'
@@ -1054,6 +1065,10 @@ export default {
           if (this.statRootModel) {
             const treeRoot = resData.modelTreeVO || {}
             preprocessStatIndicatorDeepList(treeRoot.children || [])
+            if (resData.modelStatsSetupVOS) {
+              treeRoot.modelStatsSetupVOS = resData.modelStatsSetupVOS
+              this.$set(this.model, 'modelStatsSetupVOS', resData.modelStatsSetupVOS)
+            }
             mergeStatModelNode(this.model.modelTreeVO || {}, treeRoot)
             this.bumpStatTableVersion(this.model.modelTreeVO)
           }
@@ -1073,7 +1088,7 @@ export default {
           this.businessModuleRemark =resData.businessModuleRemark
           this.$set(this.model, 'logId', resData.logId || '')
           this.$set(this.model, 'maxReportTem', resData.maxReportTem || '')
-          this.$emit('calcResult', resData.resultText)
+          this.$emit('calcResult', this.displayResultText === '--' ? resData.resultText : this.displayResultText)
           this.$emit('getLogId', resData.logId)
           this.$emit('calcComplete', {
             ...resData,
@@ -1131,6 +1146,9 @@ export default {
           if (isStatModel(subModel)) {
             const treeRoot = data.modelTreeVO || {}
             preprocessStatIndicatorDeepList(treeRoot.children || [])
+            if (data.modelStatsSetupVOS) {
+              treeRoot.modelStatsSetupVOS = data.modelStatsSetupVOS
+            }
             mergeStatModelNode(subModel, treeRoot)
             this.bumpStatTableVersion(subModel)
           }

package/src/components/measureCalc/statModelHelper.js

@@ -1,7 +1,12 @@
 /**
  * 统计模型行转列：以 isLeaf=2 为横向展开边界
  * 逻辑参考 EvaOfCreditConditionsRewrite.initColumnsRewrite
- * statCalResult 仅作辅助元数据（列配置/标题/合计），不作为是否行转列的判断条件
+ * statCalResult / modelStatsSetupVOS 作辅助元数据（列配置/标题/合计），
+ * 不作为是否行转列的判断条件。
+ *
+ * 注意：getModelTree 对统计模型通常不下发 statCalResult（挂在评价模型的
+ * 定量分析/定性分析节点上），标题需按 pid 反查分组目录，列配置优先用
+ * modelStatsSetupVOS，避免回退到第一个指标名 / 默认 calType=0 导致错列。
  */
 
 function hasFilledValue(val) {
@@ -105,14 +110,45 @@ export function hasStatPivotData(statNode) {
   return hasStatPivotNodes(statNode)
 }
 
+/**
+ * calType：0=指标取数（展示「xxx指标值/指标得分」），非 0（如 9=统计项运算）只展示统计项名。
+ *
+ * 注意：指标取数节点落库时 rankType 常是「指标自身打分规则」，不是统计项 calType
+ *（见 statisticModel createIndicatorWithData: rankType = deepItem.rankType || calType）。
+ * 因此不能把 rankType 直接当 calType；有指标类型/itemID 时应视为指标取数(0)。
+ */
+function resolveStatCalType(statLike) {
+  if (!statLike) return 0
+  if (statLike.calType !== '' && statLike.calType != null) {
+    return Number(statLike.calType)
+  }
+  const itemType = Number(statLike.itemType)
+  if (itemType === 21 || itemType === 22) return 0
+  // 无关联指标：保存时 rankType === 统计项 calType（如 9=统计项运算）
+  if (!statLike.itemID) {
+    if (statLike.rankType !== '' && statLike.rankType != null) {
+      return Number(statLike.rankType)
+    }
+  }
+  // 有 itemID 的统计项按指标取数处理
+  if (statLike.itemID) return 0
+  return 0
+}
+
 function resolveStatMeta(statsResultList, statChild) {
   const fromList = (statsResultList || []).find(
     s => s.name == statChild.statsName
   )
-  if (fromList) return fromList
+  if (fromList) {
+    return {
+      ...fromList,
+      name: fromList.name || statChild.statsName,
+      calType: resolveStatCalType(fromList)
+    }
+  }
   return {
     name: statChild.statsName,
-    calType: statChild.calType ?? 0,
+    calType: resolveStatCalType(statChild),
     statShow: statChild.statShow ?? 1,
     statCalMethod: statChild.statCalMethod,
     statResult: statChild.statResult
@@ -120,25 +156,104 @@ function resolveStatMeta(statsResultList, statChild) {
 }
 
 function buildStatsResultListFromChildren(statChildren) {
-  return statChildren.map(c => ({
+  return (statChildren || []).map(c => ({
     name: c.statsName,
-    calType: c.calType ?? 0,
+    calType: resolveStatCalType(c),
     statShow: c.statShow ?? 1,
     statCalMethod: c.statCalMethod,
     statResult: c.statResult
   }))
 }
 
-function resolveTableBlockMeta(treeData, pid, indicatorItems) {
-  const calBlock = (treeData.statCalResult || []).find(r => r.pid === pid)
-  const first = indicatorItems[0]
-  const firstStatChildren = statItemChildren(first)
+function normalizeStatsResultList(list) {
+  if (!Array.isArray(list) || !list.length) return null
+  return list.map(s => ({
+    name: s.name || s.statsName,
+    calType: resolveStatCalType(s),
+    statShow: s.statShow ?? 1,
+    statCalMethod: s.statCalMethod,
+    statResult: s.statResult
+  }))
+}
+
+/** 在节点树中按 tid 查找节点（含根） */
+function findNodeByTid(root, tid) {
+  if (!root || tid == null || tid === '') return null
+  if (root.tid === tid || root.TID === tid) return root
+  const stack = Array.isArray(root.children) ? [...root.children] : []
+  while (stack.length) {
+    const node = stack.shift()
+    if (!node) continue
+    if (node.tid === tid || node.TID === tid) return node
+    if (Array.isArray(node.children) && node.children.length) {
+      stack.push(...node.children)
+    }
+  }
+  return null
+}
+
+/** 收集整棵树上所有 statCalResult（挂在定量分析/定性分析等祖先节点上） */
+function collectAllStatCalResults(root, bucket = []) {
+  if (!root) return bucket
+  if (Array.isArray(root.statCalResult) && root.statCalResult.length) {
+    bucket.push(...root.statCalResult)
+  }
+  ;(root.children || []).forEach(child => collectAllStatCalResults(child, bucket))
+  return bucket
+}
+
+function findStatCalBlock(treeData, pid, modelWrap) {
+  const local = (treeData && treeData.statCalResult) || []
+  let block = local.find(r => r.pid === pid)
+  if (block) return block
+  const modelRoot = modelWrap && modelWrap.modelTreeVO
+  if (!modelRoot) return null
+  return collectAllStatCalResults(modelRoot).find(r => r.pid === pid) || null
+}
+
+/**
+ * 分组标题优先用 statCalResult.statIndicatorName（分组目录名），
+ * 否则按 pid 反查树节点 name；禁止回退到第一个指标 name（缺陷现象）。
+ */
+function resolveStatIndicatorName(calBlock, treeData, pid, indicatorItems, modelWrap) {
+  if (calBlock && calBlock.statIndicatorName) return calBlock.statIndicatorName
+  const fromTree =
+    findNodeByTid(treeData, pid) ||
+    findNodeByTid(modelWrap && modelWrap.modelTreeVO, pid)
+  if (fromTree && fromTree.name) return fromTree.name
+  const first = indicatorItems && indicatorItems[0]
+  if (first && first.folderName) return first.folderName
+  return ''
+}
+
+function resolveStatsResultList(calBlock, treeData, indicatorItems, modelWrap) {
+  const fromBlock = normalizeStatsResultList(calBlock && calBlock.statsResultList)
+  if (fromBlock) return fromBlock
+  const fromModel = normalizeStatsResultList(
+    (modelWrap && modelWrap.modelStatsSetupVOS) ||
+      (treeData && treeData.modelStatsSetupVOS)
+  )
+  if (fromModel) return fromModel
+  const first = indicatorItems && indicatorItems[0]
+  return buildStatsResultListFromChildren(statItemChildren(first))
+}
+
+function resolveTableBlockMeta(treeData, pid, indicatorItems, modelWrap) {
+  const calBlock = findStatCalBlock(treeData, pid, modelWrap)
   return {
-    statIndicatorName:
-      calBlock?.statIndicatorName || first?.folderName || first?.name || '',
-    statsResultList:
-      calBlock?.statsResultList ||
-      buildStatsResultListFromChildren(firstStatChildren)
+    statIndicatorName: resolveStatIndicatorName(
+      calBlock,
+      treeData,
+      pid,
+      indicatorItems,
+      modelWrap
+    ),
+    statsResultList: resolveStatsResultList(
+      calBlock,
+      treeData,
+      indicatorItems,
+      modelWrap
+    )
   }
 }
 
@@ -155,8 +270,9 @@ function groupIsLeaf2ByPid(nodes) {
 /**
  * @param {Object} treeData 统计模型节点
  * @param {Function} fetchScoreMap async (itemID) => optionList
+ * @param {Object} [modelWrap] 整模 ModelVO（含 modelTreeVO / modelStatsSetupVOS）
  */
-export async function buildStatModelTables(treeData, fetchScoreMap) {
+export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
   const isLeaf2Nodes = collectIsLeaf2Nodes(treeData.children || [])
   if (!isLeaf2Nodes.length) return []
 
@@ -168,7 +284,8 @@ export async function buildStatModelTables(treeData, fetchScoreMap) {
       const { statIndicatorName, statsResultList } = resolveTableBlockMeta(
         treeData,
         pid,
-        indicatorItems
+        indicatorItems,
+        modelWrap
       )
 
       const columns = [
@@ -189,7 +306,8 @@ export async function buildStatModelTables(treeData, fetchScoreMap) {
           align: 'center',
           slotName: label
         })
-        if (statMeta.statShow == 1 && statMeta.calType == 0) {
+        // 测算页始终展示指标得分列；statShow 仅约束业务端（授信等）是否展示
+        if (statMeta.calType == 0) {
           columns.push({
             label: item.statsName + '指标得分',
             prop: item.statsName + '指标得分',
@@ -223,12 +341,22 @@ export async function buildStatModelTables(treeData, fetchScoreMap) {
                 statMeta.calType == 0
                   ? item.statsName + '指标值'
                   : item.statsName
-              applyCellValue(item, optionList)
+              // 非手工填报：每次重建表格都取最新测算值；手工填报保留用户已输入
+              if (item.sourceType === 3) {
+                applyCellValue(item, optionList)
+              } else {
+                item.value = resolveCellValue(item, optionList)
+              }
               listItem[label] = item
               if (statMeta.calType == 0) {
+                const scoreVal =
+                  item.result !== '' && item.result != null
+                    ? item.result
+                    : item.modifiedResult
                 listItem[item.statsName + '指标得分'] = {
                   ...item,
-                  value: item.result,
+                  result: scoreVal,
+                  value: scoreVal,
                   sourceType: '',
                   displayStyle: 0,
                   calcState: false
@@ -342,6 +470,9 @@ export function mergeStatModelNode(target, source) {
   if (source.statsResultList) {
     target.statsResultList = source.statsResultList
   }
+  if (source.modelStatsSetupVOS) {
+    target.modelStatsSetupVOS = source.modelStatsSetupVOS
+  }
   const fields = [
     'result',
     'resultText',