@nstc-business/imes 1.0.21 → 1.0.23

package/package.json

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

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -57,6 +57,25 @@
         <template #default="{ row }">{{ fullScoreFn(row) }}</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="isQualFn(row)">
@@ -119,6 +138,11 @@
       </vxe-column>
 
       <vxe-column title="指标得分" width="140" align="center">
+        <template #default="{ row }">
+          <div>{{ indicatorScoreFn(row) }}</div>
+        </template>
+      </vxe-column>
+      <vxe-column title="模型指标得分" width="140" align="center">
         <template #default="{ row }">
           <div>{{ resultFn(row) }}</div>
           <InputNumber
@@ -133,28 +157,10 @@
             :max="row.fullScore"
             :disabled="ctx.readonly"
             v-model="row.modifiedResult"
-            placeholder="修改指标得分"
+            placeholder="修改模型指标得分"
           />
         </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"
         min-width="260"
@@ -218,6 +224,7 @@ import {
   isQualIndicator,
   digitsCalc,
   resultByShowStyle,
+  indicatorScoreText,
   indicatorResultText,
   fullScoreText,
   showLevelSerial
@@ -278,6 +285,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/MeasureGroupBlocks.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="measure-group-blocks">
+    <measure-qual-analysis
+      v-if="qualLooseNodes.length"
+      :groups="qualLooseGroups"
+    />
+    <measure-tree-table
+      v-if="tableLooseNodes.length"
+      :nodes="tableLooseNodes"
+      :level="level"
+      :number-prefix="numberPrefix"
+      :calc-mode="calcMode"
+      :section="section"
+    />
+
+    <div
+      v-for="(group, i) in nestedGroups"
+      :key="group._rowKey || i"
+      class="measure-inner-group"
+    >
+      <div class="section-title">
+        {{ group.name }}
+        <span v-if="group.remark" class="section-remark">
+          备注：<span class="remark-html" v-html="group.remark"></span>
+        </span>
+        <span v-if="innerWeightText(group)" class="section-weight-pill">
+          {{ innerWeightText(group) }}
+        </span>
+        <span v-if="innerSubtotalText(group)" class="section-score-pill">
+          {{ innerSubtotalText(group) }}
+        </span>
+      </div>
+      <measure-group-blocks
+        :nodes="group.children || []"
+        :group-node="group"
+        :level="level + 1"
+        :number-prefix="childNumberPrefix(group)"
+        :calc-mode="calcMode"
+        :section="section"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import MeasureQualAnalysis from './MeasureQualAnalysis.vue'
+import {
+  splitGroupNodes,
+  isQualIndicator,
+  hierarchySerial,
+  hierarchySerialPrefix
+} from './helpers'
+
+export default {
+  name: 'MeasureGroupBlocks',
+  components: {
+    MeasureQualAnalysis,
+    MeasureTreeTable: () => import('./MeasureTreeTable.vue')
+  },
+  inject: ['measureCtx'],
+  props: {
+    nodes: {
+      type: Array,
+      default: () => []
+    },
+    groupNode: {
+      type: Object,
+      default: null
+    },
+    level: {
+      type: Number,
+      default: 1
+    },
+    numberPrefix: {
+      type: String,
+      default: ''
+    },
+    calcMode: {
+      type: Boolean,
+      default: false
+    },
+    section: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  computed: {
+    ctx() {
+      return this.measureCtx()
+    },
+    split() {
+      return splitGroupNodes(this.nodes)
+    },
+    nestedGroups() {
+      return this.split.groups
+    },
+    looseNodes() {
+      return this.split.loose
+    },
+    qualLooseNodes() {
+      return this.looseNodes.filter(isQualIndicator)
+    },
+    tableLooseNodes() {
+      return this.looseNodes.filter(n => !isQualIndicator(n))
+    },
+    qualLooseGroups() {
+      const resolve = this.ctx.resolveLeafNode
+      return [
+        {
+          name: '',
+          children: this.qualLooseNodes.map(n =>
+            resolve ? resolve(n) || n : n
+          )
+        }
+      ]
+    }
+  },
+  methods: {
+    innerWeightText(group) {
+      const fn = this.ctx.groupWeightText
+      return fn ? fn(group) : ''
+    },
+    innerSubtotalText(group) {
+      const fn = this.ctx.groupSubtotalText
+      return fn ? fn(group) : ''
+    },
+    childNumberPrefix(group) {
+      const idx = this.nodes.findIndex(n => n._rowKey === group._rowKey)
+      const serial = hierarchySerial(this.numberPrefix, idx < 0 ? 0 : idx)
+      return hierarchySerialPrefix(serial)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.measure-group-blocks {
+  width: 100%;
+}
+.measure-inner-group {
+  margin-top: 12px;
+}
+.measure-inner-group + .measure-inner-group {
+  margin-top: 16px;
+}
+.section-title {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  font-size: 15px;
+  font-weight: 600;
+  padding-left: 8px;
+  margin-bottom: 8px;
+  border-left: 3px solid #409eff;
+}
+.section-weight-pill,
+.section-score-pill {
+  display: inline-block;
+  margin-left: 4px;
+  padding: 2px 10px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #606266;
+  line-height: 20px;
+  background: #f2f3f5;
+  border-radius: 4px;
+}
+.section-remark {
+  margin-left: 0;
+  font-weight: 400;
+  color: #909399;
+}
+.section-remark .remark-html {
+  display: inline;
+  ::v-deep p {
+    display: inline;
+    margin: 0;
+  }
+}
+</style>

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -22,92 +22,120 @@
         </span>
       </div>
 
-      <div class="qual-table">
-        <template v-for="(node, i) in group.children">
-          <!-- 不可量化：下拉选项 -->
-          <div
-            v-if="isQualSelectNode(node)"
-            :key="'qual-' + (node._rowKey || i)"
-            class="qual-row"
-          >
-            <div class="qual-cell qual-cell-name" v-title="node.name">
-              {{ node.name }}
-            </div>
-            <div class="qual-cell qual-cell-select">
-              <el-select
-                class="qual-select"
-                :value="node.scoreMapID"
-                :disabled="readonly"
-                size="small"
-                placeholder="请选择"
-                @change="val => onSelectChange(node, val)"
+      <vxe-table
+        border
+        class="qual-table"
+        :data="group.children"
+        :row-config="{ keyField: '_rowKey' }"
+        :scroll-y="{ enabled: false }"
+      >
+        <vxe-column v-if="showSerial" title="序号" width="72" align="center">
+          <template #default="{ rowIndex }">{{ rowIndex + 1 }}</template>
+        </vxe-column>
+
+        <vxe-column field="name" title="指标名称" min-width="180" align="center">
+          <template #default="{ row }">
+            <span v-title="row.name">{{ row.name }}</span>
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          v-if="showWeightCol"
+          title="指标权重"
+          width="100"
+          align="center"
+        >
+          <template #default="{ row }">{{ row.weight || '—' }}</template>
+        </vxe-column>
+
+        <vxe-column title="指标满分值" width="110" align="center">
+          <template #default="{ row }">{{ formatFullScore(row) }}</template>
+        </vxe-column>
+
+        <vxe-column title="评价标准" min-width="180" align="center">
+          <template #default="{ row }">{{ evalStandardText(row) }}</template>
+        </vxe-column>
+
+        <vxe-column title="指标值" min-width="220" align="center">
+          <template #default="{ row }">
+            <el-select
+              v-if="isQualSelectNode(row)"
+              class="qual-select"
+              :value="row.scoreMapID"
+              :disabled="readonly"
+              size="small"
+              placeholder="请选择"
+              @change="val => onSelectChange(row, val)"
+            >
+              <el-option
+                v-for="option in row.optionList"
+                :key="option.scoreMapID"
+                :label="option.scoreText"
+                :value="option.scoreMapID"
+                style="height: auto"
               >
-                <el-option
-                  v-for="option in node.optionList"
-                  :key="option.scoreMapID"
-                  :label="option.scoreText"
-                  :value="option.scoreMapID"
-                  style="height: auto"
-                >
-                  <div class="select-top">{{ option.scoreText }}</div>
-                  <div class="select-bottom">{{ option.reason }}</div>
-                </el-option>
-              </el-select>
-              <div class="option-reason">{{ selectedOptionReason(node) }}</div>
-            </div>
-            <div class="qual-cell qual-cell-score">
-              <span class="qual-inline-label">
-                {{ scoreLabel(group, node) }}
-              </span>
-              <span class="qual-score-value">
-                {{ formatScore(node.result) }}
-              </span>
-            </div>
-            <div class="qual-cell qual-cell-reason">
-              <span class="qual-inline-label">评价理由</span>
-              <el-input
-                class="qual-reason-input"
-                type="textarea"
-                v-title
-                :show-overflow-tooltip="true"
-                :maxlength="2000"
-                show-word-limit
-                v-model="node.reason"
-                :disabled="readonly"
-                placeholder="请输入具体评价依据，不超过2000字"
-                @input="onReasonInput(node)"
-              />
-            </div>
-          </div>
+                <div class="select-top">{{ option.scoreText }}</div>
+                <div class="select-bottom">{{ option.reason }}</div>
+              </el-option>
+            </el-select>
+            <el-input
+              v-else-if="row.sourceType === 3"
+              class="qual-manual-input"
+              type="number"
+              size="small"
+              v-model="row.scoreValue"
+              :disabled="readonly"
+              placeholder="请输入评分"
+            />
+            <span v-else>—</span>
+          </template>
+        </vxe-column>
 
-          <!-- 手工填报 -->
-          <div
-            v-else-if="node.sourceType === 3"
-            :key="'manual-' + (node._rowKey || i)"
-            class="qual-row"
-          >
-            <div class="qual-cell qual-cell-name" v-title="node.name">
-              {{ node.name }}
-            </div>
-            <div class="qual-cell qual-cell-manual">
-              <el-input
-                class="qual-manual-input"
-                type="number"
-                size="small"
-                v-model="node.scoreValue"
-                :disabled="readonly"
-                placeholder="请输入评分"
-              />
-            </div>
-          </div>
-        </template>
-      </div>
+        <vxe-column :title="scoreColTitle(group)" width="120" align="center">
+          <template #default="{ row }">
+            {{ formatIndicatorScore(group, row) }}
+          </template>
+        </vxe-column>
+
+        <vxe-column
+          v-if="showModelScoreCol"
+          title="模型指标得分"
+          width="130"
+          align="center"
+        >
+          <template #default="{ row }">{{ formatScore(row.result) }}</template>
+        </vxe-column>
+
+        <vxe-column title="评价理由" min-width="240" align="center">
+          <template #default="{ row }">
+            <el-input
+              v-if="isQualSelectNode(row)"
+              class="qual-reason-input"
+              type="textarea"
+              v-title
+              :show-overflow-tooltip="true"
+              :maxlength="2000"
+              show-word-limit
+              v-model="row.reason"
+              :disabled="readonly"
+              placeholder="请输入具体评价依据，不超过2000字"
+              @input="onReasonInput(row)"
+            />
+          </template>
+        </vxe-column>
+      </vxe-table>
     </div>
   </div>
 </template>
 
 <script>
-import { resultByShowStyle, showLevelSerial, isQualIndicator } from './helpers'
+import {
+  resultByShowStyle,
+  indicatorScoreText,
+  showLevelSerial,
+  isQualIndicator,
+  fullScoreText
+} from './helpers'
 
 export default {
   name: 'MeasureQualAnalysis',
@@ -128,6 +156,12 @@ export default {
     showSerial() {
       return showLevelSerial(this.modelWrap)
     },
+    showWeightCol() {
+      return this.modelWrap.showWeight === 1 && !this.measureCtx().calcMode
+    },
+    showModelScoreCol() {
+      return !this.measureCtx().calcMode
+    },
     /** 始终绑定 leafList 原始节点，避免 vxe 展开区副本导致 v-model 丢失 */
     displayGroups() {
       const resolve = this.measureCtx().resolveLeafNode
@@ -156,16 +190,26 @@ export default {
         (isQualIndicator(node) && node.optionList && node.optionList.length)
       )
     },
-    scoreLabel(group, node) {
+    scoreColTitle(group) {
+      if (group.itemType === 11) return '系数值'
+      return '指标得分'
+    },
+    formatIndicatorScore(group, node) {
       if (group.itemType === 11) {
-        return node.ratioName ? `${node.ratioName}系数值` : '系数值'
+        return this.formatScore(node.result)
       }
-      return '得分'
+      return indicatorScoreText(node, this.modelWrap)
     },
     formatScore(val) {
       if (val === '' || val == null) return ''
       return resultByShowStyle({ result: val }, this.modelWrap)
     },
+    formatFullScore(node) {
+      return fullScoreText(node, this.modelWrap) || '—'
+    },
+    evalStandardText(node) {
+      return node.indicatorRemark || this.selectedOptionReason(node) || '—'
+    },
     resolveNode(node) {
       const resolve = this.measureCtx().resolveLeafNode
       return resolve ? resolve(node) || node : node
@@ -293,105 +337,14 @@ export default {
 
 .qual-table {
   width: 100%;
-  border: 1px solid #ebeef5;
-  border-radius: 2px;
-  overflow: hidden;
-}
-
-.qual-row {
-  display: flex;
-  width: 100%;
-  min-height: 52px;
-  border-bottom: 1px solid #ebeef5;
-  box-sizing: border-box;
-
-  &:last-child {
-    border-bottom: none;
-  }
-}
-
-.qual-cell {
-  padding: 10px 12px;
-  border-right: 1px solid #ebeef5;
-  box-sizing: border-box;
-  min-width: 0;
-  font-size: 14px;
-  color: #303133;
-  line-height: 1.5;
-
-  &:last-child {
-    border-right: none;
-  }
-}
-
-/* 指标名称 | 选项 | 得分 | 评价理由 */
-.qual-cell-name {
-  flex: 0 0 16%;
-  background: #fafafa;
-  color: #606266;
-  display: flex;
-  align-items: center;
-  word-break: break-all;
-}
-
-.qual-cell-select {
-  flex: 0 0 28%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.qual-cell-score {
-  flex: 0 0 12%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  gap: 4px;
-}
-
-.qual-cell-reason {
-  flex: 0 0 44%;
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-
-.qual-cell-manual {
-  flex: 1;
-  display: flex;
-  align-items: center;
-}
-
-.qual-inline-label {
-  flex-shrink: 0;
-  font-size: 14px;
-  color: #606266;
-  line-height: 1.4;
-}
-
-.qual-score-value {
-  min-height: 20px;
-  word-break: break-all;
 }
 
+.qual-select,
 .qual-reason-input,
 .qual-manual-input {
   width: 100%;
 }
 
-.qual-select {
-  width: 100%;
-}
-
-.option-reason {
-  margin-top: 4px;
-  color: #999;
-  font-size: 14px;
-  line-height: 1.4;
-  white-space: normal;
-  word-wrap: break-word;
-}
-
 .select-top {
   margin-top: 2px;
   height: 14px;
@@ -409,7 +362,15 @@ export default {
   white-space: normal;
   word-wrap: break-word;
 }
+
 /deep/ .el-select .el-input__inner {
   text-align: center;
 }
+
+/deep/ .vxe-body--column {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  height: auto !important;
+  max-height: unset !important;
+}
 </style>

package/src/components/measureCalc/MeasureStatCell.vue

@@ -53,6 +53,18 @@
         :d-num="digits"
         v-model="cell.value"
       />
+      <el-tooltip
+        v-else-if="showFormulaTip"
+        placement="top"
+        effect="dark"
+      >
+        <div slot="content">
+          {{ cell.displayFormula }}：
+          <br />
+          {{ cell.relFormula }}
+        </div>
+        <span>{{ displayValue(cell) }}</span>
+      </el-tooltip>
       <span v-else>{{ displayValue(cell) }}</span>
     </template>
   </div>
@@ -74,6 +86,11 @@ export default {
   computed: {
     readonly() {
       return !!this.measureCtx().readonly
+    },
+    /** 指标值列才展示公式；得分列 column.disabled 不展示 */
+    showFormulaTip() {
+      if (!this.cell || this.column.disabled) return false
+      return !!(this.cell.displayFormula || this.cell.relFormula)
     }
   },
   methods: {

package/src/components/measureCalc/MeasureStatFlatTable.vue

@@ -53,8 +53,24 @@
             </el-select>
           </template>
           <template v-else>
-            <span
+            <el-tooltip
               v-if="
+                row.sourceType !== 3 &&
+                (!row.optionList || !row.optionList.length) &&
+                hasFormulaFn(row)
+              "
+              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 &&
                 (!row.optionList || !row.optionList.length)
               "
@@ -175,6 +191,9 @@ export default {
     indicatorTextFn(row) {
       return indicatorResultText(row, this.ctx.modelWrap)
     },
+    hasFormulaFn(row) {
+      return !!(row && (row.displayFormula || row.relFormula))
+    },
     onQualChange(row) {
       const option = row.value
       if (!option || !option.scoreMapID) return

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 }">

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,6 +84,70 @@ 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 = '测算子模型'
 
@@ -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 ''

package/src/components/measureCalc/index.vue

@@ -29,6 +29,15 @@
             >
               {{ allExpanded ? '全部收起' : '全部展开' }}
             </el-button>
+            <el-button
+              v-if="showPrint"
+              size="small"
+              plain
+              :loading="printLoading"
+              @click="printFn"
+            >
+              打印
+            </el-button>
           </div>
         </div>
 
@@ -210,13 +219,10 @@
         :sub-model="section.container"
         :level="1"
       />
-      <measure-qual-analysis
-        v-else-if="isQualOnlySection(section)"
-        :groups="qualSectionGroups(section)"
-      />
-      <measure-tree-table
+      <measure-group-blocks
         v-else-if="section.nodes && section.nodes.length"
         :nodes="section.nodes"
+        :group-node="section.container"
         :level="1"
         :calc-mode="calcRootModel"
         :section="section"
@@ -228,8 +234,7 @@
 
 <script>
 import { SecondaryTab } from './ui'
-import MeasureTreeTable from './MeasureTreeTable.vue'
-import MeasureQualAnalysis from './MeasureQualAnalysis.vue'
+import MeasureGroupBlocks from './MeasureGroupBlocks.vue'
 import MeasureSubModelPanel from './MeasureSubModelPanel.vue'
 import MeasureStatPanel from './MeasureStatPanel.vue'
 import {
@@ -238,9 +243,10 @@ import {
   isIndicator,
   isSubModel,
   isStatModel,
-  isQualOnlyNodes,
   isQualIndicator,
   resolveQualSelection,
+  sumIndicatorScores,
+  nodeScoreValue as readNodeScore,
   SUB_MODEL_LABEL,
   SUB_MODEL_CALC_BTN,
   isCalcRootModel as checkCalcRootModel,
@@ -255,13 +261,13 @@ import {
 } from './statModelHelper'
 import { withRequestTimestamp } from './api'
 import { formatFloat2 } from '../common'
+import { printJS } from 'n20-common-lib/src/plugins/Print'
 
 export default {
   name: 'MeasureCalc',
   components: {
     SecondaryTab,
-    MeasureTreeTable,
-    MeasureQualAnalysis,
+    MeasureGroupBlocks,
     MeasureSubModelPanel,
     MeasureStatPanel
   },
@@ -276,7 +282,11 @@ export default {
         readonly: this.readonly,
         resolveLeafNode: this.resolveLeafNode,
         syncQualSelection: this.syncQualSelection,
-        getQualSelection: this.getQualSelection
+        getQualSelection: this.getQualSelection,
+        evalRootModel: this.evalRootModel,
+        groupWeightText: this.groupWeightText,
+        groupScoreText: this.groupScoreText,
+        groupSubtotalText: this.groupSubtotalText
       })
     }
   },
@@ -315,12 +325,28 @@ export default {
     condParam: {
       type: Object,
       default: () => ({})
+    },
+    /** 是否展示打印按钮，由业务系统做权限判断后传入，默认不展示 */
+    showPrint: {
+      type: Boolean,
+      default: false
+    },
+    /** 授信申报信息，打印时原样传给打印接口 */
+    creditInfo: {
+      type: Object,
+      default: () => ({})
+    },
+    /** 评级申报信息，打印时原样传给打印接口 */
+    gradeInfo: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
     return {
       loading: false,
       calcLoading: false,
+      printLoading: false,
       model: { type: 1, name: '', code: '', digits: 2, modelTreeVO: {} },
       sections: [],
       anchorTabs: [],
@@ -352,18 +378,18 @@ export default {
       messageStr: '',
       options: [
         { value: '13', label: '13月（已审计报表）' },
-        { value: '1', label: '1月' },
-        { value: '2', label: '2月' },
-        { value: '3', label: '3月' },
-        { value: '4', label: '4月' },
-        { value: '5', label: '5月' },
-        { value: '6', label: '6月' },
-        { value: '7', label: '7月' },
-        { value: '8', label: '8月' },
-        { value: '9', label: '9月' },
-        { value: '10', label: '10月' },
+        { value: '12', label: '12月' },
         { value: '11', label: '11月' },
-        { value: '12', label: '12月' }
+        { value: '10', label: '10月' },
+        { value: '9', label: '9月' },
+        { value: '8', label: '8月' },
+        { value: '7', label: '7月' },
+        { value: '6', label: '6月' },
+        { value: '5', label: '5月' },
+        { value: '4', label: '4月' },
+        { value: '3', label: '3月' },
+        { value: '2', label: '2月' },
+        { value: '1', label: '1月' }
       ]
     }
   },
@@ -423,9 +449,20 @@ export default {
       }
       return this.relFormula || this.displayFormula || '--'
     },
-    /** 是否存在容器节点（决定是否显示「全部展开/收起」） */
+    /** 表格内仍可展开的容器（分组已外提，只剩子模型） */
     hasAnyContainer() {
-      return this.sections.some(s => (s.nodes || []).some(n => isContainer(n)))
+      const walk = nodes => {
+        if (!Array.isArray(nodes)) return false
+        return nodes.some(n => {
+          if (isSubModel(n)) return true
+          if (n && n.children && n.children.length) return walk(n.children)
+          return false
+        })
+      }
+      return this.sections.some(s => {
+        if (s.container && isSubModel(s.container)) return true
+        return walk(s.nodes)
+      })
     },
     /** 仍有必填项未完善时显示黄字提示 */
     showIncompleteTip() {
@@ -476,17 +513,6 @@ export default {
     subModelResultText(node) {
       return formatSubModelResult(node, this.model)
     },
-    isQualOnlySection(section) {
-      return isQualOnlyNodes(section.nodes)
-    },
-    qualSectionGroups(section) {
-      return [
-        {
-          name: '',
-          children: (section.nodes || []).map(n => this.resolveLeafNode(n) || n)
-        }
-      ]
-    },
     /** 表格展开区可能是副本节点，统一解析到 leafList / qualList 原始引用 */
     resolveLeafNode(node) {
       return this.findQualNode(node && node.tid, node && node.itemID, node)
@@ -842,25 +868,28 @@ export default {
       return false
     },
 
-    /** 单个指标的入参校验与组装 */
+    /** 单个指标的入参校验与组装（同一指标只组装一条，避免后端 findFirst 丢调整得分） */
     checkItem(item) {
       const obj = { scoreMapList: [], indicatorCalcList: [], state: true }
+      const displayValue =
+        item.displayStyle === 1
+          ? formatFloat2(item.value / 100, this.model.digits)
+          : item.value
+      const calcItem = {
+        hasInput: true,
+        indicatorID: item.itemID,
+        tid: item.tid,
+        modifiedReason: item.modifiedReason || ''
+      }
+      let hasCalc = false
       // 手工填报（含统计模型行转列内的可量化指标）
       if (item.sourceType === 3 && !isQualIndicator(item)) {
         if (!item.value && item.value !== 0) {
           obj.state = false
           this.messageStr += `${item.name}的指标值不可为空;`
         }
-        obj.indicatorCalcList.push({
-          hasInput: true,
-          indicatorID: item.itemID,
-          tid: item.tid,
-          modifiedReason: item.modifiedReason || '',
-          scoreValue:
-            item.displayStyle === 1
-              ? formatFloat2(item.value / 100, this.model.digits)
-              : item.value
-        })
+        calcItem.scoreValue = displayValue
+        hasCalc = true
       }
       // 不可量化 + 有选项：校验选项（optionList 以 qualList 为准）
       if (isQualIndicator(item)) {
@@ -913,16 +942,8 @@ export default {
         item.indicatorResult !== null &&
         (item.value || item.value === 0)
       ) {
-        obj.indicatorCalcList.push({
-          hasInput: true,
-          indicatorID: item.itemID,
-          tid: item.tid,
-          modifiedReason: item.modifiedReason || '',
-          modifiedVal:
-            item.displayStyle === 1
-              ? formatFloat2(item.value / 100, this.model.digits)
-              : item.value
-        })
+        calcItem.modifiedVal = displayValue
+        hasCalc = true
       }
       // 调整项=指标得分
       if (
@@ -931,14 +952,10 @@ export default {
         item.modifyRank === 1 &&
         (item.modifiedResult || item.modifiedResult === 0)
       ) {
-        obj.indicatorCalcList.push({
-          hasInput: true,
-          indicatorID: item.itemID,
-          tid: item.tid,
-          modifiedReason: item.modifiedReason || '',
-          modifiedResult: item.modifiedResult
-        })
+        calcItem.modifiedResult = item.modifiedResult
+        hasCalc = true
       }
+      if (hasCalc) obj.indicatorCalcList.push(calcItem)
       return obj
     },
 
@@ -1032,6 +1049,42 @@ export default {
       }
     },
 
+    async printFn() {
+      const logId = this.model.logId || this.logId || ''
+      const modelId = this.model.modelID || this.model.id || this.id || ''
+      if (!logId || !modelId) {
+        this.$message.warning('请先完成测算后再打印')
+        return
+      }
+      this.printLoading = true
+      try {
+        const res = await this.$axios.post(
+          withRequestTimestamp('/imes/v1/indicatorModel/print'),
+          [
+            {
+              logId,
+              modelId,
+              creditInfo: this.creditInfo || {},
+              gradeInfo: this.gradeInfo || {}
+            }
+          ]
+        )
+        if (res.code !== 0) {
+          this.$message.error(res.msg || '打印失败')
+          return
+        }
+        printJS({
+          printable: res.data,
+          type: 'pdf',
+          base64: true
+        })
+      } catch (e) {
+        this.$message.error('打印异常')
+      } finally {
+        this.printLoading = false
+      }
+    },
+
     /** 外层模型整体测算 */
     async calc() {
       if (this.readonly) return
@@ -1297,16 +1350,7 @@ export default {
 
     /** 节点用于汇总的得分（优先调整后得分） */
     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
+      return readNodeScore(node)
     },
 
     formatScoreNum(val) {
@@ -1385,23 +1429,46 @@ export default {
     },
 
     /** 分区标题旁总权重（评价模型且开启显示权重） */
-    sectionWeightText(section) {
-      if (!this.evalRootModel || !section) return ''
+    groupWeightText(groupNode, children) {
+      if (!this.evalRootModel || !groupNode) return ''
       if (this.model.showWeight !== 1) return ''
-      if (!section.container || this.isSubModel(section.container)) return ''
-      return this.buildGroupWeightText(section.container, section.nodes)
+      if (this.isSubModel(groupNode)) return ''
+      return this.buildGroupWeightText(
+        groupNode,
+        children || groupNode.children
+      )
+    },
+    sectionWeightText(section) {
+      if (!section || !section.container) return ''
+      return this.groupWeightText(section.container, section.nodes)
     },
 
-    /** 分区标题旁得分（评价模型：未测算显示 --） */
-    sectionScoreText(section) {
-      if (!this.evalRootModel || !section) return ''
-      if (!section.container || this.isSubModel(section.container)) return ''
+    /** 分组标题旁得分（评价模型：未测算显示 --） */
+    groupScoreText(groupNode, children) {
+      if (!this.evalRootModel || !groupNode) return ''
+      if (this.isSubModel(groupNode)) return ''
       if (!this.parentCalced) return '总得分: --'
       return (
-        this.buildGroupScoreText(section.container, section.nodes) ||
-        '总得分: --'
+        this.buildGroupScoreText(
+          groupNode,
+          children || groupNode.children
+        ) || '总得分: --'
       )
     },
+    sectionScoreText(section) {
+      if (!section || !section.container) return ''
+      return this.groupScoreText(section.container, section.nodes)
+    },
+
+    /** 内层分组标题旁得分小计：加总下属指标得分 */
+    groupSubtotalText(groupNode, children) {
+      if (!this.evalRootModel || !groupNode) return ''
+      if (this.isSubModel(groupNode)) return ''
+      if (!this.parentCalced) return '得分小计: --'
+      const total = sumIndicatorScores(children || groupNode.children || [])
+      if (total === null) return '得分小计: --'
+      return `得分小计: ${this.formatScoreNum(total)}`
+    },
 
     /**
      * 评价模型得分文案：总分(57) = 定量分析(7) + 定性分析(50)

package/src/components/measureCalc/statModelHelper.js

@@ -289,7 +289,7 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
       )
 
       const columns = [
-        { label: '指标项名称', prop: 'name', width: '250px', align: 'center' }
+        { label: '指标项名称', prop: 'name', minWidth: 160, align: 'center' }
       ]
       const list = []
 
@@ -302,7 +302,7 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
         columns.push({
           label,
           prop: label,
-          width: '250px',
+          minWidth: 140,
           align: 'center',
           slotName: label
         })
@@ -313,7 +313,7 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
             prop: item.statsName + '指标得分',
             slotName: item.statsName + '指标得分',
             disabled: true,
-            width: '250px',
+            minWidth: 140,
             align: 'center'
           })
         }