@nstc-business/imes 1.0.25 → 1.0.27

package/package.json

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

package/src/components/measureCalc/EvaOfCreditConditionsRewrite.vue

@@ -44,8 +44,16 @@
             v-bind="{ width: '150', align: 'center', 'show-overflow-tooltip': false, ...column }"
           >
             <template slot-scope="{ row }">
+              <!-- 满分值列：按录入原样展示，不做位数格式化 -->
+              <span v-if="column.isFullScore">
+                {{
+                  row[column.prop]?.value || row[column.prop]?.value === 0
+                    ? String(row[column.prop].value)
+                    : ''
+                }}
+              </span>
               <!-- 手工录入的时候不显示调整框，显示手工录入的框，就是 sourceType为3-->
-              <div v-if="row[column.prop]?.sourceType === 3">
+              <div v-else-if="row[column.prop]?.sourceType === 3">
                 <span v-if="column.disabled">
                   {{
                     row[column.prop]?.value || row[column.prop]?.value === 0

package/src/components/measureCalc/MeasureStatCell.vue

@@ -126,6 +126,13 @@ export default {
       return text + suffix
     },
     displayValue(cell) {
+      // 满分值列：按录入原样展示，不做位数格式化
+      if (this.column.isFullScore) {
+        const val =
+          cell.result !== '' && cell.result != null ? cell.result : cell.value
+        if (val === '' || val == null) return ''
+        return String(val)
+      }
       if (this.column.disabled) {
         const val =
           cell.result !== '' && cell.result != null ? cell.result : cell.value

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -8,24 +8,9 @@
           <span v-if="showSerial">{{ index + 1 }}.</span>
           {{ block.statIndicatorName }}
         </span>
-        <div class="stat-title-sums">
-          <span
-            v-for="(statResult, i2) in block.statsResultList"
-            :key="i2"
-            class="stat-sum-item"
-          >
-            <template
-              v-if="statResult.statCalMethod == 1 && statResult.statShow == 1"
-            >
-              {{ statResult.name }}合计:
-              {{
-                statResult.statResult || statResult.statResult === 0
-                  ? Number(statResult.statResult).toFixed(digits)
-                  : ''
-              }}
-            </template>
-          </span>
-        </div>
+        <span v-if="subtotalText(block)" class="section-score-pill">
+          {{ subtotalText(block) }}
+        </span>
       </div>
 
       <el-table border :data="block.list" style="width: 100%">
@@ -56,7 +41,11 @@
 </template>
 
 <script>
-import { buildStatModelTables, hasStatPivotNodes } from './statModelHelper'
+import {
+  buildStatModelTables,
+  hasStatPivotNodes,
+  sumStatBlockScores
+} from './statModelHelper'
 import { showLevelSerial } from './helpers'
 import { withRequestTimestamp } from './api'
 import MeasureStatCell from './MeasureStatCell.vue'
@@ -100,6 +89,12 @@ export default {
     }
   },
   methods: {
+    subtotalText(block) {
+      if (!this.ctx.parentCalced) return '得分小计: --'
+      const total = sumStatBlockScores(block)
+      if (total === null) return '得分小计: --'
+      return `得分小计: ${Number(total).toFixed(this.digits)}`
+    },
     dynamicColumns(block) {
       return (block.columns || []).filter(c => c.prop !== 'name')
     },
@@ -174,15 +169,23 @@ export default {
 .stat-title {
   display: flex;
   align-items: center;
-  height: 30px;
-  margin-bottom: 8px;
+  flex-wrap: wrap;
+  gap: 8px;
   font-size: 15px;
+  font-weight: 600;
+  padding-left: 8px;
+  margin-bottom: 8px;
+  border-left: 3px solid #409eff;
 }
-.stat-title-sums {
-  margin-left: auto;
-  display: flex;
-  gap: 12px;
+.section-score-pill {
+  display: inline-block;
+  padding: 2px 10px;
+  font-size: 14px;
+  font-weight: 400;
   color: #606266;
+  line-height: 20px;
+  background: #f2f3f5;
+  border-radius: 4px;
 }
 .stat-loading,
 .stat-empty {

package/src/components/measureCalc/helpers.js

@@ -253,16 +253,11 @@ export function isShowFullScore(row) {
   return !row || row.showFullScore !== 0
 }
 
-/** 指标满分值展示 */
+/** 指标满分值展示：按录入原样显示，不做位数/千分位格式化 */
 export function fullScoreText(row, modelWrap) {
   if (!isShowFullScore(row)) return ''
   if (!row || (row.fullScore !== 0 && !row.fullScore)) return ''
-  const digits = digitsCalc(row, modelWrap)
-  let val = Number(row.fullScore).toFixed(digits)
-  if (row.showStyle === 2) {
-    val = addThousands(val)
-  }
-  return val
+  return String(row.fullScore)
 }
 
 /** 指标原始值（优先 indicatorValText） */

package/src/components/measureCalc/statModelHelper.js

@@ -424,6 +424,50 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
   return tables
 }
 
+/** 行转列单元格得分：优先调整后得分 */
+function cellScoreValue(cell) {
+  if (!cell) return null
+  if (
+    cell.modifyRank === 1 &&
+    cell.modifiedResult !== '' &&
+    cell.modifiedResult != null
+  ) {
+    return cell.modifiedResult
+  }
+  if (cell.result !== '' && cell.result != null) return cell.result
+  if (cell.value !== '' && cell.value != null && typeof cell.value !== 'object') {
+    return cell.value
+  }
+  return null
+}
+
+/**
+ * 统计模型文件夹得分小计：
+ * 只加总「是否参与计算」的统计项得分（指标取数取 xxx指标得分，其余取该列本身）
+ */
+export function sumStatBlockScores(block) {
+  if (!block || !Array.isArray(block.list)) return null
+  const participating = (block.statsResultList || []).filter(
+    s => s && Number(s.statCalMethod) === 1
+  )
+  if (!participating.length) return null
+  let has = false
+  let total = 0
+  block.list.forEach(row => {
+    participating.forEach(stat => {
+      const prop =
+        Number(stat.calType) === 0 ? `${stat.name}指标得分` : stat.name
+      const val = cellScoreValue(row && row[prop])
+      if (val === null) return
+      const num = Number(val)
+      if (Number.isNaN(num)) return
+      has = true
+      total += num
+    })
+  })
+  return has ? total : null
+}
+
 /** 统计模型：isLeaf=2 节点预处理 indicatorDeepList（参考 evaluateModelCalcTest.recursionFn） */
 export function preprocessStatIndicatorDeepList(nodes) {
   if (!Array.isArray(nodes)) return