@nstc-business/imes 1.0.20 → 1.0.22

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>
 
@@ -47,7 +56,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>
 
@@ -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月' }
       ]
     }
   },
@@ -386,18 +412,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 '模型得分：'
@@ -412,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() {
@@ -465,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)
@@ -831,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)) {
@@ -902,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 (
@@ -920,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
     },
 
@@ -1021,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
@@ -1077,7 +1141,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,
@@ -1286,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) {
@@ -1374,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

@@ -112,12 +112,26 @@ export function hasStatPivotData(statNode) {
 
 /**
  * calType：0=指标取数（展示「xxx指标值/指标得分」），非 0（如 9=统计项运算）只展示统计项名。
- * 树节点通常只有 rankType，缺 calType 时用 rankType 推断，避免「平均」被当成指标取数导致列重复。
+ *
+ * 注意：指标取数节点落库时 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 statLike.calType
-  if (statLike.rankType !== '' && statLike.rankType != null) return statLike.rankType
+  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
 }
 
@@ -275,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 = []
 
@@ -288,17 +302,18 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
         columns.push({
           label,
           prop: label,
-          width: '250px',
+          minWidth: 140,
           align: 'center',
           slotName: label
         })
-        if (statMeta.statShow == 1 && statMeta.calType == 0) {
+        // 测算页始终展示指标得分列；statShow 仅约束业务端（授信等）是否展示
+        if (statMeta.calType == 0) {
           columns.push({
             label: item.statsName + '指标得分',
             prop: item.statsName + '指标得分',
             slotName: item.statsName + '指标得分',
             disabled: true,
-            width: '250px',
+            minWidth: 140,
             align: 'center'
           })
         }
@@ -326,12 +341,22 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
                 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