@nstc-business/imes 1.0.22 → 1.0.24

package/package.json

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

package/src/components/measureCalc/MeasureGroupBlocks.vue

@@ -18,7 +18,7 @@
       :key="group._rowKey || i"
       class="measure-inner-group"
     >
-      <div class="section-title">
+      <div class="section-title" @click="toggleGroup(group)">
         {{ group.name }}
         <span v-if="group.remark" class="section-remark">
           备注：<span class="remark-html" v-html="group.remark"></span>
@@ -29,8 +29,13 @@
         <span v-if="innerSubtotalText(group)" class="section-score-pill">
           {{ innerSubtotalText(group) }}
         </span>
+        <span class="group-toggle">
+          {{ isExpanded(group) ? '收起' : '展开' }}
+          <i :class="isExpanded(group) ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+        </span>
       </div>
       <measure-group-blocks
+        v-show="isExpanded(group)"
         :nodes="group.children || []"
         :group-node="group"
         :level="level + 1"
@@ -124,6 +129,15 @@ export default {
       const fn = this.ctx.groupSubtotalText
       return fn ? fn(group) : ''
     },
+    isExpanded(group) {
+      const fn = this.ctx.isGroupExpanded
+      return fn ? fn(group) : !group || group._groupExpanded !== false
+    },
+    toggleGroup(group) {
+      const fn = this.ctx.toggleGroupExpanded
+      if (fn) fn(group)
+      else if (group) this.$set(group, '_groupExpanded', group._groupExpanded === false)
+    },
     childNumberPrefix(group) {
       const idx = this.nodes.findIndex(n => n._rowKey === group._rowKey)
       const serial = hierarchySerial(this.numberPrefix, idx < 0 ? 0 : idx)
@@ -153,6 +167,18 @@ export default {
   padding-left: 8px;
   margin-bottom: 8px;
   border-left: 3px solid #409eff;
+  cursor: pointer;
+}
+.group-toggle {
+  margin-left: auto;
+  font-size: 13px;
+  font-weight: 400;
+  color: #409eff;
+  white-space: nowrap;
+  user-select: none;
+}
+.group-toggle i {
+  margin-left: 2px;
 }
 .section-weight-pill,
 .section-score-pill {

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -5,7 +5,7 @@
       :key="group._groupKey"
       class="qual-group"
     >
-      <div v-if="group.name" class="qual-group-title">
+      <div v-if="group.name" class="qual-group-title" @click="toggleGroup(index)">
         <span v-if="showSerial" class="qual-group-index">{{ index + 1 }}.</span>
         <span>{{ group.name }}</span>
         <span
@@ -20,9 +20,14 @@
         >
           得分:{{ group.result }}
         </span>
+        <span class="group-toggle">
+          {{ isExpanded(index) ? '收起' : '展开' }}
+          <i :class="isExpanded(index) ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+        </span>
       </div>
 
       <vxe-table
+        v-show="isExpanded(index)"
         border
         class="qual-table"
         :data="group.children"
@@ -184,6 +189,20 @@ export default {
     }
   },
   methods: {
+    sourceGroup(index) {
+      return this.groups[index] || this.displayGroups[index]
+    },
+    isExpanded(index) {
+      const group = this.sourceGroup(index)
+      const fn = this.measureCtx().isGroupExpanded
+      return fn ? fn(group) : !group || group._groupExpanded !== false
+    },
+    toggleGroup(index) {
+      const group = this.sourceGroup(index)
+      const fn = this.measureCtx().toggleGroupExpanded
+      if (fn) fn(group)
+      else if (group) this.$set(group, '_groupExpanded', group._groupExpanded === false)
+    },
     isQualSelectNode(node) {
       return (
         node.sourceType === 0 ||
@@ -315,10 +334,11 @@ export default {
   display: flex;
   align-items: center;
   gap: 8px;
-  height: 30px;
+  min-height: 30px;
   margin-bottom: 8px;
   font-size: 15px;
   color: #303133;
+  cursor: pointer;
 }
 
 .qual-group-index {
@@ -331,8 +351,16 @@ export default {
   color: #606266;
 }
 
-.qual-group-score {
+.group-toggle {
   margin-left: auto;
+  font-size: 13px;
+  font-weight: 400;
+  color: #409eff;
+  white-space: nowrap;
+  user-select: none;
+}
+.group-toggle i {
+  margin-left: 2px;
 }
 
 .qual-table {

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/index.vue

@@ -12,32 +12,15 @@
             </span>
           </div>
           <div class="header-actions">
-            <el-button
-              v-if="!readonly"
-              type="primary"
-              size="small"
-              :loading="calcLoading"
-              @click="calc"
-            >
+            <el-button v-if="!readonly" type="primary" size="small" :loading="calcLoading" @click="calc">
               整体测算
             </el-button>
-            <el-button
-              v-if="hasAnyContainer"
-              size="small"
-              plain
-              @click="toggleExpandAll"
-            >
+            <el-button v-if="showCalcDetail" size="small" plain @click="openCalcDetail"> 测算详情 </el-button>
+            <el-button v-if="showCalcJournal" size="small" plain @click="openCalcJournal"> 测算日志 </el-button>
+            <el-button v-if="showPrint" size="small" plain :loading="printLoading" @click="printFn"> 打印 </el-button>
+            <el-button v-if="hasCollapsibleGroups" size="small" plain @click="toggleExpandAll">
               {{ allExpanded ? '全部收起' : '全部展开' }}
             </el-button>
-            <el-button
-              v-if="showPrint"
-              size="small"
-              plain
-              :loading="printLoading"
-              @click="printFn"
-            >
-              打印
-            </el-button>
           </div>
         </div>
 
@@ -63,12 +46,7 @@
         <div v-if="formulaRowLabel" class="result-panel-formula" :title="businessModuleRemark">
           <span class="meta-label">{{ formulaRowLabel }}</span>
           <el-tooltip
-            v-if="
-              calcRootModel &&
-              displayFormula &&
-              relFormula &&
-              displayFormula !== relFormula
-            "
+            v-if="calcRootModel && displayFormula && relFormula && displayFormula !== relFormula"
             placement="top"
             effect="dark"
           >
@@ -83,11 +61,7 @@
 
       <!-- 分区锚点 Tab -->
       <div v-if="anchorTabs.length > 1" class="measure-anchor">
-        <SecondaryTab
-          :init.sync="activeAnchorName"
-          :data="anchorTabs"
-          @click="onAnchorClick"
-        />
+        <SecondaryTab :init.sync="activeAnchorName" :data="anchorTabs" @click="onAnchorClick" />
       </div>
     </div>
 
@@ -129,12 +103,7 @@
           </el-form-item>
           <el-form-item label="报表月份" label-width="80px">
             <el-select v-model="param.reportMonth" placeholder="请选择" :disabled="readonly">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
         </div>
@@ -147,13 +116,7 @@
     </div>
 
     <!-- 评价/计算模型分区 -->
-    <div
-      v-else
-      v-for="(section, i) in sections"
-      :key="section._rowKey"
-      :ref="'section-' + i"
-      class="measure-section"
-    >
+    <div v-else v-for="(section, i) in sections" :key="section._rowKey" :ref="'section-' + i" class="measure-section">
       <div class="section-header">
         <div>
           <el-button
@@ -166,21 +129,13 @@
             {{ subModelCalcBtn }}
           </el-button>
           <span
-            v-if="
-              section.container &&
-              isSubModel(section.container) &&
-              subModelResultText(section.container)
-            "
+            v-if="section.container && isSubModel(section.container) && subModelResultText(section.container)"
             class="sub-result"
           >
             测算结果：{{ subModelResultText(section.container) }}
           </span>
           <el-tooltip
-            v-if="
-              section.container &&
-              isSubModel(section.container) &&
-              section.container.relFormula
-            "
+            v-if="section.container && isSubModel(section.container) && section.container.relFormula"
             placement="top"
             effect="dark"
           >
@@ -191,7 +146,7 @@
           </el-tooltip>
         </div>
 
-        <div class="section-title">
+        <div class="section-title" @click="toggleGroupExpanded(sectionExpandNode(section))">
           <template v-if="section.container && isSubModel(section.container)">
             {{ subModelLabel }}：{{ section.name }}
           </template>
@@ -200,35 +155,42 @@
           <span v-if="section.remark" class="section-remark">
             备注：<span class="remark-html" v-html="section.remark"></span>
           </span>
-          <span
-            v-if="sectionWeightText(section)"
-            class="section-weight-pill"
-          >
+          <span v-if="sectionWeightText(section)" class="section-weight-pill">
             {{ sectionWeightText(section) }}
           </span>
-          <span
-            v-if="sectionScoreText(section)"
-            class="section-score-pill"
-          >
+          <span v-if="sectionScoreText(section)" class="section-score-pill">
             {{ sectionScoreText(section) }}
           </span>
+          <span class="group-toggle">
+            {{ isGroupExpanded(sectionExpandNode(section)) ? '收起' : '展开' }}
+            <i
+              :class="
+                isGroupExpanded(sectionExpandNode(section))
+                  ? 'el-icon-arrow-up'
+                  : 'el-icon-arrow-down'
+              "
+            ></i>
+          </span>
         </div>
       </div>
-      <measure-sub-model-panel
-        v-if="section.container && isSubModel(section.container)"
-        :sub-model="section.container"
-        :level="1"
-      />
-      <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"
-      />
-      <div v-else class="section-empty">暂无指标</div>
+      <div v-show="isGroupExpanded(sectionExpandNode(section))">
+        <measure-sub-model-panel
+          v-if="section.container && isSubModel(section.container)"
+          :sub-model="section.container"
+          :level="1"
+        />
+        <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"
+        />
+        <div v-else class="section-empty">暂无指标</div>
+      </div>
     </div>
+    <calculate-detail-dialog ref="calculateDetailDialog" />
   </div>
 </template>
 
@@ -254,14 +216,11 @@ import {
   subModelResultText as formatSubModelResult,
   saveSubModelValueText
 } from './helpers'
-import {
-  preprocessStatIndicatorDeepList,
-  mergeStatModelNode,
-  statItemChildren
-} from './statModelHelper'
+import { preprocessStatIndicatorDeepList, mergeStatModelNode, statItemChildren } from './statModelHelper'
 import { withRequestTimestamp } from './api'
 import { formatFloat2 } from '../common'
 import { printJS } from 'n20-common-lib/src/plugins/Print'
+import calculateDetailDialog from '../calculateDetail/dialog.vue'
 
 export default {
   name: 'MeasureCalc',
@@ -269,13 +228,16 @@ export default {
     SecondaryTab,
     MeasureGroupBlocks,
     MeasureSubModelPanel,
-    MeasureStatPanel
+    MeasureStatPanel,
+    calculateDetailDialog
   },
   provide() {
     return {
       measureCtx: () => ({
         modelWrap: this.model,
         expandAll: this.allExpanded,
+        isGroupExpanded: node => this.isGroupExpanded(node),
+        toggleGroupExpanded: node => this.toggleGroupExpanded(node),
         calcSubModel: this.calcSubModel,
         calcMode: this.calcRootModel,
         parentCalced: this.parentCalced,
@@ -331,6 +293,16 @@ export default {
       type: Boolean,
       default: false
     },
+    /** 是否展示测算详情按钮，由业务系统做权限判断后传入，默认不展示 */
+    showCalcDetail: {
+      type: Boolean,
+      default: false
+    },
+    /** 是否展示测算日志按钮，由业务系统做权限判断后传入，默认不展示 */
+    showCalcJournal: {
+      type: Boolean,
+      default: false
+    },
     /** 授信申报信息，打印时原样传给打印接口 */
     creditInfo: {
       type: Object,
@@ -340,6 +312,16 @@ export default {
     gradeInfo: {
       type: Object,
       default: () => ({})
+    },
+    /** 打印接口地址，业务系统可覆盖 */
+    printUrl: {
+      type: String,
+      default: '/imes/v1/indicatorModel/print'
+    },
+    /** 打印附加参数，由业务系统传入，组件原样带到打印接口 */
+    printParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -464,6 +446,10 @@ export default {
         return walk(s.nodes)
       })
     },
+    /** 有分区或子模型时展示全部展开/收起 */
+    hasCollapsibleGroups() {
+      return this.sections.length > 0 || this.hasAnyContainer
+    },
     /** 仍有必填项未完善时显示黄字提示 */
     showIncompleteTip() {
       if (this.readonly) return false
@@ -519,15 +505,11 @@ export default {
     },
     findQualNode(tid, itemID, fallback) {
       if (tid) {
-        const byTid =
-          this.leafList.find(n => n.tid === tid) ||
-          this.qualList.find(n => n.tid === tid)
+        const byTid = this.leafList.find(n => n.tid === tid) || this.qualList.find(n => n.tid === tid)
         if (byTid) return byTid
       }
       if (itemID) {
-        const byId =
-          this.leafList.find(n => n.itemID === itemID) ||
-          this.qualList.find(n => n.itemID === itemID)
+        const byId = this.leafList.find(n => n.itemID === itemID) || this.qualList.find(n => n.itemID === itemID)
         if (byId) return byId
       }
       if (fallback && fallback._rowKey) {
@@ -557,9 +539,7 @@ export default {
       }
       if (next.scoreMapID != null && next.scoreMapID !== '') {
         this.$set(node, 'scoreMapID', next.scoreMapID)
-        const option = (node.optionList || []).find(
-          o => o.scoreMapID == next.scoreMapID
-        )
+        const option = (node.optionList || []).find(o => o.scoreMapID == next.scoreMapID)
         if (option) {
           this.$set(node, 'value', option)
           this.$set(node, 'scoreText', option.scoreText)
@@ -600,12 +580,7 @@ export default {
           scoreMapID: scoreMapID != null ? scoreMapID : item.scoreMapID
         })
       }
-      if (
-        !selected &&
-        draft &&
-        draft.scoreMapID != null &&
-        draft.scoreMapID !== ''
-      ) {
+      if (!selected && draft && draft.scoreMapID != null && draft.scoreMapID !== '') {
         selected =
           optionList.find(o => o.scoreMapID == draft.scoreMapID) ||
           (draft.scoreText != null
@@ -658,10 +633,11 @@ export default {
         if (!id && !code && !logId) return
         this.loading = true
         try {
-          const res = await this.$axios.post(
-            withRequestTimestamp('/imes/v1/indicatorModel/getModelTree'),
-            { code, id, logId }
-          )
+          const res = await this.$axios.post(withRequestTimestamp('/imes/v1/indicatorModel/getModelTree'), {
+            code,
+            id,
+            logId
+          })
           if (seq !== this.initSeq) return
           if (res.code === 0) data = res.data
         } finally {
@@ -672,10 +648,7 @@ export default {
     },
 
     setModel(data) {
-      this.model = Object.assign(
-        { type: 1, name: '', code: '', digits: 2 },
-        data
-      )
+      this.model = Object.assign({ type: 1, name: '', code: '', digits: 2 }, data)
       const root = this.model.modelTreeVO || {}
       const children = Array.isArray(root.children) ? root.children : []
       preprocessStatIndicatorDeepList(children)
@@ -688,11 +661,7 @@ export default {
       this.qualList = qualList
       this.subModelList = subModelList
       // 仅以模型级测算结果 / 日志为准；分组节点 result 默认 0 不能当作已测算
-      this.parentCalced = !!(
-        this.logId ||
-        this.model.logId ||
-        (this.model.result !== '' && this.model.result != null)
-      )
+      this.parentCalced = !!(this.logId || this.model.logId || (this.model.result !== '' && this.model.result != null))
       this.qualSelectionDraft = {}
       this.resultText = this.model.resultText || root.resultText || ''
       this.calcResult =
@@ -704,14 +673,10 @@ export default {
       this.scoreFormulaText =
         this.model.scoreFormulaText ||
         root.scoreFormulaText ||
-        (this.parentCalced && this.evalRootModel
-          ? this.buildEvalScoreText(this.model)
-          : '')
+        (this.parentCalced && this.evalRootModel ? this.buildEvalScoreText(this.model) : '')
       this.relFormula = this.model.relFormula || root.relFormula || ''
-      this.displayFormula =
-        this.model.displayFormula || root.displayFormula || ''
-      this.businessModuleRemark =
-        this.model.businessModuleRemark || root.businessModuleRemark || ''
+      this.displayFormula = this.model.displayFormula || root.displayFormula || ''
+      this.businessModuleRemark = this.model.businessModuleRemark || root.businessModuleRemark || ''
       this.applyCondParam({
         reportYear: this.model.reportYear,
         reportMonth: this.model.reportMonth,
@@ -719,9 +684,7 @@ export default {
       })
       this.sections = this.buildSections(root, children)
       this.anchorTabs = this.sections.map((s, i) => ({ key: i, name: s.name }))
-      this.activeAnchorName = this.anchorTabs.length
-        ? this.anchorTabs[0].name
-        : ''
+      this.activeAnchorName = this.anchorTabs.length ? this.anchorTabs[0].name : ''
       this.fetchQualOptions().then(() => {
         this.$emit('modelLoaded', this.getValue({ silent: true }))
       })
@@ -776,10 +739,9 @@ export default {
       await Promise.all(
         this.qualList.map(async row => {
           try {
-            const { code, data } = await this.$axios.post(
-              withRequestTimestamp('/imes/v1/indicator/getScoreMap'),
-              { id: row.itemID }
-            )
+            const { code, data } = await this.$axios.post(withRequestTimestamp('/imes/v1/indicator/getScoreMap'), {
+              id: row.itemID
+            })
             if (code === 0 && Array.isArray(data)) {
               this.$set(row, 'optionList', data)
               if (row.scoreMapID == null) this.$set(row, 'scoreMapID', null)
@@ -812,10 +774,9 @@ export default {
       this.cltSearchTimer = setTimeout(async () => {
         this.cltLoading = true
         try {
-          const res = await this.$axios.post(
-            withRequestTimestamp('/custman-core/customer/findSimpleList'),
-            { keyword: query }
-          )
+          const res = await this.$axios.post(withRequestTimestamp('/custman-core/customer/findSimpleList'), {
+            keyword: query
+          })
           this.cltOptions = res.code == 200 ? res.data || [] : []
         } catch (e) {
           this.cltOptions = []
@@ -837,9 +798,35 @@ export default {
       if (target) target.scrollIntoView({ behavior: 'smooth', block: 'start' })
     },
 
+    sectionExpandNode(section) {
+      return (section && section.container) || section
+    },
+    isGroupExpanded(node) {
+      return !node || node._groupExpanded !== false
+    },
+    toggleGroupExpanded(node) {
+      if (!node) return
+      this.$set(node, '_groupExpanded', node._groupExpanded === false)
+    },
+    setAllGroupExpanded(expanded) {
+      const walk = nodes => {
+        if (!Array.isArray(nodes)) return
+        nodes.forEach(node => {
+          if (!node) return
+          if (isContainer(node)) this.$set(node, '_groupExpanded', expanded)
+          if (node.children && node.children.length) walk(node.children)
+        })
+      }
+      this.sections.forEach(section => {
+        this.$set(section, '_groupExpanded', expanded)
+        if (section.container) this.$set(section.container, '_groupExpanded', expanded)
+        walk(section.nodes)
+      })
+    },
     toggleExpandAll() {
       // 各层表格通过 watch ctx.expandAll 调用 setRowExpand 联动展开/收起
       this.allExpanded = !this.allExpanded
+      this.setAllGroupExpanded(this.allExpanded)
     },
 
     /** 与测算校验一致：判断指标是否仍有必填未填 */
@@ -871,10 +858,7 @@ export default {
     /** 单个指标的入参校验与组装（同一指标只组装一条，避免后端 findFirst 丢调整得分） */
     checkItem(item) {
       const obj = { scoreMapList: [], indicatorCalcList: [], state: true }
-      const displayValue =
-        item.displayStyle === 1
-          ? formatFloat2(item.value / 100, this.model.digits)
-          : item.value
+      const displayValue = item.displayStyle === 1 ? formatFloat2(item.value / 100, this.model.digits) : item.value
       const calcItem = {
         hasInput: true,
         indicatorID: item.itemID,
@@ -894,15 +878,10 @@ export default {
       // 不可量化 + 有选项：校验选项（optionList 以 qualList 为准）
       if (isQualIndicator(item)) {
         const qualRef = this.findQualNode(item.tid, item.itemID, item)
-        const hasOptions =
-          qualRef?.optionList?.length || item.optionList?.length
+        const hasOptions = qualRef?.optionList?.length || item.optionList?.length
         if (hasOptions) {
           const selected = this.pickQualSelected(item)
-          if (
-            !selected ||
-            selected.scoreMapID == null ||
-            selected.scoreMapID === ''
-          ) {
+          if (!selected || selected.scoreMapID == null || selected.scoreMapID === '') {
             obj.state = false
             this.messageStr += `${item.name}的选项不可为空;`
           } else {
@@ -917,11 +896,7 @@ export default {
         }
       }
       // 不可量化 + 手工填报（无下拉选项）
-      if (
-        isQualIndicator(item) &&
-        item.sourceType === 3 &&
-        (!item.optionList || !item.optionList.length)
-      ) {
+      if (isQualIndicator(item) && item.sourceType === 3 && (!item.optionList || !item.optionList.length)) {
         if (!item.scoreValue && item.scoreValue !== 0) {
           obj.state = false
           this.messageStr += `${item.name}的评分不可为空;`
@@ -1049,28 +1024,57 @@ export default {
       }
     },
 
+    currentModelId() {
+      return this.model.modelID || this.model.id || this.id || ''
+    },
+    currentLogId() {
+      return this.model.logId || this.logId || ''
+    },
+    openCalcDetail() {
+      const modelId = this.currentModelId()
+      const logId = this.currentLogId()
+      if (!logId || !modelId) {
+        this.$message.warning('请先完成测算后再查看测算详情')
+        return
+      }
+      this.$refs.calculateDetailDialog.open({
+        modelId,
+        logId,
+        showModelInfo: true
+      })
+    },
+    openCalcJournal() {
+      const modelId = this.currentModelId()
+      if (!modelId) {
+        this.$message.warning('模型ID不能为空')
+        return
+      }
+      const url = `/imes/model/modelJournal?modelId=${modelId}`
+      if (typeof this.$linkPush === 'function') {
+        this.$linkPush(url)
+      } else if (this.$router) {
+        this.$router.push(url)
+      }
+    },
     async printFn() {
-      const logId = this.model.logId || this.logId || ''
-      const modelId = this.model.modelID || this.model.id || this.id || ''
+      const logId = this.currentLogId()
+      const modelId = this.currentModelId()
       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 || {}
-            }
-          ]
-        )
+        const extra = this.buildPrintExtra()
+        const res = await this.$axios.post(withRequestTimestamp(this.printUrl), [
+          {
+            ...extra,
+            logId,
+            modelId
+          }
+        ])
         if (res.code !== 0) {
-          this.$message.error(res.msg || '打印失败')
+          // this.$message.error(res.msg || '打印失败')
           return
         }
         printJS({
@@ -1079,11 +1083,24 @@ export default {
           base64: true
         })
       } catch (e) {
-        this.$message.error('打印异常')
+        // this.$message.error('打印异常')
       } finally {
         this.printLoading = false
       }
     },
+    hasPrintObj(val) {
+      return val && typeof val === 'object' && Object.keys(val).length > 0
+    },
+    buildPrintExtra() {
+      const extra = { ...(this.printParams || {}) }
+      if (this.hasPrintObj(this.creditInfo) && extra.creditInfo == null) {
+        extra.creditInfo = this.creditInfo
+      }
+      if (this.hasPrintObj(this.gradeInfo) && extra.gradeInfo == null) {
+        extra.gradeInfo = this.gradeInfo
+      }
+      return extra
+    },
 
     /** 外层模型整体测算 */
     async calc() {
@@ -1093,9 +1110,7 @@ export default {
         return
       }
       this.qualList.forEach(n => this.applyQualDraftToNode(n))
-      const { scoreMapList, indicatorCalcList, state } = this.buildCalcParams(
-        this.leafList
-      )
+      const { scoreMapList, indicatorCalcList, state } = this.buildCalcParams(this.leafList)
       if (!state) return
 
       const param = {
@@ -1109,10 +1124,7 @@ export default {
 
       this.calcLoading = true
       try {
-        const res = await this.$axios.post(
-          withRequestTimestamp('/imes/v2/models/calcModelTree'),
-          param
-        )
+        const res = await this.$axios.post(withRequestTimestamp('/imes/v2/models/calcModelTree'), param)
         if (res.code === 0) {
           const resData = res.data || {}
           if (this.statRootModel) {
@@ -1129,16 +1141,11 @@ export default {
           this.syncTopGroupResults(resData)
           this.parentCalced = true
           this.resultText = resData.resultText || ''
-          this.calcResult =
-            resData.result === '' || resData.result == null
-              ? null
-              : resData.result
+          this.calcResult = resData.result === '' || resData.result == null ? null : resData.result
           this.relFormula = resData.relFormula || ''
           this.displayFormula = resData.displayFormula || ''
-          this.scoreFormulaText = this.evalRootModel
-            ? this.buildEvalScoreText(resData)
-            : ''
-          this.businessModuleRemark =resData.businessModuleRemark
+          this.scoreFormulaText = this.evalRootModel ? this.buildEvalScoreText(resData) : ''
+          this.businessModuleRemark = resData.businessModuleRemark
           this.$set(this.model, 'logId', resData.logId || '')
           this.$set(this.model, 'maxReportTem', resData.maxReportTem || '')
           this.$emit('calcResult', this.displayResultText === '--' ? resData.resultText : this.displayResultText)
@@ -1175,8 +1182,7 @@ export default {
       }
       const leaves = this.collectLeaves(subModel)
       leaves.forEach(n => this.applyQualDraftToNode(n))
-      const { scoreMapList, indicatorCalcList, state } =
-        this.buildCalcParams(leaves)
+      const { scoreMapList, indicatorCalcList, state } = this.buildCalcParams(leaves)
       if (!state) return
 
       const param = {
@@ -1190,10 +1196,7 @@ export default {
 
       this.$set(subModel, '_calcing', true)
       try {
-        const res = await this.$axios.post(
-          withRequestTimestamp('/imes/v2/models/calcModelTree'),
-          param
-        )
+        const res = await this.$axios.post(withRequestTimestamp('/imes/v2/models/calcModelTree'), param)
         if (res.code === 0) {
           const data = res.data || {}
           if (isStatModel(subModel)) {
@@ -1207,34 +1210,18 @@ export default {
           }
           const root = data.modelTreeVO || {}
           // 模型结果在 ModelVO 顶层；modelTreeVO 根节点多为分组目录，result 常为 0
-          const modelResult =
-            data.result != null && data.result !== ''
-              ? data.result
-              : root.result
-          const modelResultText =
-            data.resultText != null && data.resultText !== ''
-              ? data.resultText
-              : root.resultText
+          const modelResult = data.result != null && data.result !== '' ? data.result : root.result
+          const modelResultText = data.resultText != null && data.resultText !== '' ? data.resultText : root.resultText
           const indicatorResult =
-            root.indicatorResult != null && root.indicatorResult !== ''
-              ? root.indicatorResult
-              : modelResult
+            root.indicatorResult != null && root.indicatorResult !== '' ? root.indicatorResult : modelResult
           // 回填子模型自身的值（供外层模型引用）
           this.$set(subModel, 'result', modelResult)
           this.$set(subModel, 'resultText', modelResultText)
           this.$set(subModel, 'indicatorResult', indicatorResult)
           this.$set(subModel, 'indicatorValText', root.indicatorValText)
-          this.$set(
-            subModel,
-            'value',
-            indicatorResult != null ? indicatorResult : modelResult
-          )
+          this.$set(subModel, 'value', indicatorResult != null ? indicatorResult : modelResult)
           this.$set(subModel, 'relFormula', data.relFormula || root.relFormula || '')
-          this.$set(
-            subModel,
-            'displayFormula',
-            data.displayFormula || root.displayFormula || ''
-          )
+          this.$set(subModel, 'displayFormula', data.displayFormula || root.displayFormula || '')
           const subValueText = saveSubModelValueText(subModel, this.model)
           if (subValueText) {
             this.$set(subModel, '_subModelValueText', subValueText)
@@ -1288,10 +1275,7 @@ export default {
           this.$set(target, key, source[key])
         }
       })
-      if (
-        target.itemType !== 22 &&
-        (source.modifiedVal || source.modifiedVal === 0)
-      ) {
+      if (target.itemType !== 22 && (source.modifiedVal || source.modifiedVal === 0)) {
         this.$set(target, 'value', source.modifiedVal)
       }
     },
@@ -1320,10 +1304,8 @@ export default {
      * 合成分组可能无稳定 tid，优先 tid，其次 name
      */
     syncTopGroupResults(resData) {
-      const remoteChildren =
-        (resData.modelTreeVO && resData.modelTreeVO.children) || []
-      const localChildren =
-        (this.model.modelTreeVO && this.model.modelTreeVO.children) || []
+      const remoteChildren = (resData.modelTreeVO && resData.modelTreeVO.children) || []
+      const localChildren = (this.model.modelTreeVO && this.model.modelTreeVO.children) || []
       this.syncTreeResults(localChildren, remoteChildren)
     },
 
@@ -1332,13 +1314,7 @@ export default {
       remoteNodes.forEach(remote => {
         const local =
           localNodes.find(n => n.tid && remote.tid && n.tid === remote.tid) ||
-          localNodes.find(
-            n =>
-              n.name === remote.name &&
-              n.itemID &&
-              remote.itemID &&
-              n.itemID === remote.itemID
-          ) ||
+          localNodes.find(n => n.name === remote.name && n.itemID && remote.itemID && n.itemID === remote.itemID) ||
           localNodes.find(n => n.name === remote.name)
         if (!local) return
         this.applyResultFields(local, remote)
@@ -1386,10 +1362,7 @@ export default {
       nodes.forEach(n => {
         if (!n) return
         if (this.isSubModel(n) || isIndicator(n)) {
-          if (
-            (n.fullScore === 0 || n.fullScore) &&
-            (n.weight === 0 || n.weight)
-          ) {
+          if ((n.fullScore === 0 || n.fullScore) && (n.weight === 0 || n.weight)) {
             bucket.push(n)
           }
           return
@@ -1406,20 +1379,13 @@ export default {
      */
     buildGroupWeightText(groupNode, children) {
       if (!groupNode) return ''
-      const contributors = this.collectWeightContributors(
-        children || groupNode.children || []
-      )
+      const contributors = this.collectWeightContributors(children || groupNode.children || [])
       let total = null
       if (contributors.length) {
         total = contributors.reduce((sum, n) => {
           const full = Number(n.fullScore)
           const weight = Number(n.weight)
-          return (
-            sum +
-            ((Number.isNaN(full) ? 0 : full) *
-              (Number.isNaN(weight) ? 0 : weight)) /
-              100
-          )
+          return sum + ((Number.isNaN(full) ? 0 : full) * (Number.isNaN(weight) ? 0 : weight)) / 100
         }, 0)
       } else if (groupNode.fullScore === 0 || groupNode.fullScore) {
         total = groupNode.fullScore
@@ -1433,10 +1399,7 @@ export default {
       if (!this.evalRootModel || !groupNode) return ''
       if (this.model.showWeight !== 1) return ''
       if (this.isSubModel(groupNode)) return ''
-      return this.buildGroupWeightText(
-        groupNode,
-        children || groupNode.children
-      )
+      return this.buildGroupWeightText(groupNode, children || groupNode.children)
     },
     sectionWeightText(section) {
       if (!section || !section.container) return ''
@@ -1448,12 +1411,7 @@ export default {
       if (!this.evalRootModel || !groupNode) return ''
       if (this.isSubModel(groupNode)) return ''
       if (!this.parentCalced) return '总得分: --'
-      return (
-        this.buildGroupScoreText(
-          groupNode,
-          children || groupNode.children
-        ) || '总得分: --'
-      )
+      return this.buildGroupScoreText(groupNode, children || groupNode.children) || '总得分: --'
     },
     sectionScoreText(section) {
       if (!section || !section.container) return ''
@@ -1667,6 +1625,18 @@ export default {
   font-weight: 600;
   padding-left: 8px;
   border-left: 3px solid #409eff;
+  cursor: pointer;
+}
+.group-toggle {
+  margin-left: auto;
+  font-size: 13px;
+  font-weight: 400;
+  color: #409eff;
+  white-space: nowrap;
+  user-select: none;
+}
+.group-toggle i {
+  margin-left: 2px;
 }
 .section-weight-pill,
 .section-score-pill {

package/src/index.js

@@ -19,7 +19,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '1.0.16',
+  version: '1.0.24',
   install,
   ModelCalculate,
   MeasureCalc,