@nstc-business/imes 1.0.20 → 1.0.22

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -32,14 +32,14 @@
         <el-table-column
           prop="name"
           label="指标项名称"
-          width="250"
+          min-width="160"
           align="center"
         />
         <el-table-column
           v-for="col in dynamicColumns(block)"
           :key="col.prop"
           :label="col.label"
-          :width="col.width || 250"
+          :min-width="col.minWidth || 140"
           align="center"
         >
           <template slot-scope="{ row }">
@@ -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,10 +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),
-          this.ctx.modelWrap
+          {
+            ...modelWrap,
+            modelStatsSetupVOS:
+              this.subModel.modelStatsSetupVOS || modelWrap.modelStatsSetupVOS
+          }
         )
       } finally {
         this.loading = false

package/src/components/measureCalc/MeasureSubModelPanel.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="measure-sub-model-panel">
-    <!-- 计算模型：树形表格 + 定性分组描述列表 -->
-    <measure-tree-table
+    <!-- 计算模型：分组外提为区块标题，指标用树表 -->
+    <measure-group-blocks
       v-if="isCalc"
       :nodes="subModel.children || []"
+      :group-node="subModel"
       :level="level"
       :number-prefix="numberPrefix"
       calc-mode
@@ -38,7 +39,7 @@ export default {
   components: {
     MeasureEvalFlatTable,
     MeasureStatPanel,
-    MeasureTreeTable: () => import('./MeasureTreeTable.vue')
+    MeasureGroupBlocks: () => import('./MeasureGroupBlocks.vue')
   },
   props: {
     subModel: {

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -229,7 +229,7 @@
       </vxe-column>
     </template>
 
-    <!-- 默认列：指标满分值 / 指标值 / 指标得分 / 理由 -->
+    <!-- 默认列：满分值 / 计算公式 / 评价标准 / 指标值 / 指标得分 / 模型指标得分 / 理由 -->
     <template v-else>
       <vxe-column title="指标满分值" width="110" align="center">
         <template #default="{ row }">
@@ -238,6 +238,25 @@
         </template>
       </vxe-column>
 
+      <vxe-column
+        v-if="showFormulaCol"
+        field="displayFormula"
+        title="计算公式"
+        width="130"
+        align="center"
+      >
+        <template #default="{ row }">{{ row.displayFormula || '—' }}</template>
+      </vxe-column>
+      <vxe-column
+        v-if="showRemarkCol"
+        field="indicatorRemark"
+        title="评价标准"
+        width="130"
+        align="center"
+      >
+        <template #default="{ row }">{{ row.indicatorRemark || '—' }}</template>
+      </vxe-column>
+
       <vxe-column title="指标值" min-width="260" align="center">
         <template #default="{ row }">
           <template v-if="isQuantIndicatorFn(row)">
@@ -298,6 +317,17 @@
       </vxe-column>
 
       <vxe-column title="指标得分" width="140" align="center">
+        <template #default="{ row }">
+          <template v-if="isQuantIndicatorFn(row)">
+            <div>{{ indicatorScoreFn(row) }}</div>
+          </template>
+          <template v-else-if="isSubModelFn(row) && ctx.parentCalced">
+            <div>{{ indicatorScoreFn(row) }}</div>
+          </template>
+          <span v-else class="color-placeholder">—</span>
+        </template>
+      </vxe-column>
+      <vxe-column title="模型指标得分" width="140" align="center">
         <template #default="{ row }">
           <template v-if="isQuantIndicatorFn(row)">
             <div>{{ resultFn(row) }}</div>
@@ -310,7 +340,7 @@
               :max="row.fullScore"
               :disabled="ctx.readonly"
               v-model="row.modifiedResult"
-              placeholder="修改指标得分"
+              placeholder="修改模型指标得分"
             />
           </template>
           <template v-else-if="isSubModelFn(row) && ctx.parentCalced">
@@ -319,24 +349,6 @@
           <span v-else class="color-placeholder">—</span>
         </template>
       </vxe-column>
-      <vxe-column
-        v-if="showFormulaCol"
-        field="displayFormula"
-        title="计算公式"
-        width="130"
-        align="center"
-      >
-        <template #default="{ row }">{{ row.displayFormula || '—' }}</template>
-      </vxe-column>
-      <vxe-column
-        v-if="showRemarkCol"
-        field="indicatorRemark"
-        title="评价标准"
-        width="130"
-        align="center"
-      >
-        <template #default="{ row }">{{ row.indicatorRemark || '—' }}</template>
-      </vxe-column>
 
       <vxe-column
         v-if="showModifyReasonCol"
@@ -404,6 +416,7 @@ import {
   typeMeta,
   digitsCalc,
   resultByShowStyle,
+  indicatorScoreText,
   indicatorResultText,
   fullScoreText,
   hierarchySerial,
@@ -567,6 +580,9 @@ export default {
     resultFn(row) {
       return resultByShowStyle(row, this.ctx.modelWrap)
     },
+    indicatorScoreFn(row) {
+      return indicatorScoreText(row, this.ctx.modelWrap)
+    },
     indicatorTextFn(row) {
       return indicatorResultText(row, this.ctx.modelWrap)
     },

package/src/components/measureCalc/helpers.js

@@ -8,6 +8,7 @@
  * sourceType：0 系统自定义 1 报表取数 2 指标取数 3 手工填报 4 标准值取数 5 系统取值 6 系统取数
  * modifyRank：0 不调整 1 调整指标得分 2 调整指标值
  */
+import { N } from 'n20-common-lib'
 import { toFixedTrunc, addThousands } from '../common'
 import { resolveManualFillValue, statItemChildren } from './statModelHelper'
 
@@ -83,15 +84,79 @@ export function isSubModel(row) {
   return t === 'calcModel' || t === 'evalModel' || t === 'statModel'
 }
 
+/** 普通分组（非子模型容器） */
+export function isGroup(row) {
+  return isContainer(row) && !isSubModel(row)
+}
+
+/** 当前层拆成普通分组 vs 其余（指标/子模型），分组抬到表格外展示 */
+export function splitGroupNodes(nodes) {
+  const groups = []
+  const loose = []
+  if (!Array.isArray(nodes)) return { groups, loose }
+  nodes.forEach(node => {
+    if (isGroup(node)) groups.push(node)
+    else loose.push(node)
+  })
+  return { groups, loose }
+}
+
+/** 节点用于汇总的得分（优先调整后得分） */
+export function nodeScoreValue(node) {
+  if (!node) return null
+  if (
+    node.modifyRank === 1 &&
+    node.modifiedResult !== '' &&
+    node.modifiedResult != null
+  ) {
+    return node.modifiedResult
+  }
+  if (node.result === '' || node.result == null) return null
+  return node.result
+}
+
+/** 收集分组下叶子指标（子模型不计入得分小计） */
+export function collectIndicatorScoreNodes(nodes, bucket = []) {
+  if (!Array.isArray(nodes)) return bucket
+  nodes.forEach(n => {
+    if (!n) return
+    if (isIndicator(n)) {
+      bucket.push(n)
+      return
+    }
+    if (isSubModel(n)) return
+    if (n.children && n.children.length) {
+      collectIndicatorScoreNodes(n.children, bucket)
+    }
+  })
+  return bucket
+}
+
+/** 分组得分小计：加总下属指标得分，无有效得分返回 null */
+export function sumIndicatorScores(nodes) {
+  const items = collectIndicatorScoreNodes(nodes)
+  let has = false
+  let total = 0
+  items.forEach(n => {
+    const val = nodeScoreValue(n)
+    if (val === null) return
+    const num = Number(val)
+    if (Number.isNaN(num)) return
+    has = true
+    total += num
+  })
+  return has ? total : null
+}
+
 /** 测算场景下子模型的统一展示名称 */
 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
   }
@@ -152,7 +217,7 @@ export function digitsCalc(row, modelWrap) {
   return modelWrap ? modelWrap.digits : 2
 }
 
-/** 指标得分 / 模型指标系数数值展示（始终用 result，字段值只在「指标值」列展示） */
+/** 模型指标得分 / 模型指标系数数值（权重之后的 result） */
 export function resultByShowStyle(row, modelWrap) {
   let val = ''
   const digits = digitsCalc(row, modelWrap)
@@ -168,6 +233,21 @@ export function resultByShowStyle(row, modelWrap) {
   return val
 }
 
+/**
+ * 指标得分（权重之前）：result * 100 / weight
+ * 与旧测算详情 valueScore 算法一致；无权重时不展示
+ */
+export function indicatorScoreText(row, modelWrap) {
+  if (!row || (row.result !== 0 && (row.result === '' || row.result == null))) {
+    return ''
+  }
+  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)
+}
+
 /** 指标满分值展示 */
 export function fullScoreText(row, modelWrap) {
   if (!row || (row.fullScore !== 0 && !row.fullScore)) return ''