@nstc-business/imes 1.0.24 → 1.0.25

package/package.json

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

package/src/components/measureCalc/EvaOfCreditConditionsRewrite.vue

@@ -372,6 +372,25 @@ export default {
           item1.children[0].children &&
           item1.children[0].children.map(item => {
             const obj = item1.statsResultList.find(stats => stats.name == item.statsName)
+            // 指标取数：任一行开启「是否展示满分值」则插入满分值列
+            const showFullScoreCol =
+              obj &&
+              obj.calType == 0 &&
+              item1.children.some(row => {
+                const child = (row.children || []).find(c => c.statsName === item.statsName)
+                return child && child.showFullScore !== 0
+              })
+            if (showFullScoreCol) {
+              columns.push({
+                label: item.statsName + '满分值',
+                prop: item.statsName + '满分值',
+                slotName: item.statsName + '满分值',
+                disabled: true,
+                isFullScore: true,
+                width: '200px',
+                align: 'center'
+              })
+            }
             const label = obj.calType == 0 ? item.statsName + '指标值' : item.statsName
             const columnsItem = {
               label: label,
@@ -443,6 +462,18 @@ export default {
                 value = obj
               }
             }
+            if ([0].includes(obj.calType) && item.showFullScore !== 0) {
+              const fullScore =
+                item.fullScore === 0 || item.fullScore ? item.fullScore : ''
+              listItem[item.statsName + '满分值'] = {
+                ...item,
+                value: fullScore,
+                result: fullScore,
+                sourceType: '',
+                displayStyle: 0,
+                calcState: false
+              }
+            }
             if ([0].includes(obj.calType)) {
               // 得分列清空  sourceType 得分列用result
               listItem[item.statsName + '指标得分'] = {

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -53,7 +53,12 @@
         </template>
       </vxe-column>
 
-      <vxe-column title="指标满分值" width="110" align="center">
+      <vxe-column
+        v-if="showFullScoreCol"
+        title="指标满分值"
+        width="110"
+        align="center"
+      >
         <template #default="{ row }">{{ fullScoreFn(row) }}</template>
       </vxe-column>
 
@@ -99,7 +104,19 @@
               </el-option>
             </el-select>
           </template>
-          <template v-else>
+          <div v-else>
+            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
+            <el-tooltip
+              v-if="row.sourceType !== 3 && (row.displayFormula || row.relFormula)"
+              placement="top"
+              effect="dark"
+            >
+              <template #content>
+                <div>{{ row.displayFormula }}</div>
+              </template>
+              <span>{{ indicatorTextFn(row) }}</span>
+            </el-tooltip>
+            <span v-else-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
             <InputNumber
               v-if="row.sourceType === 3 && row.itemType === 21"
               class="full-w"
@@ -121,19 +138,9 @@
               :d-num="digitsFn(row)"
               :disabled="ctx.readonly"
               v-model="resolveRow(row).value"
+              placeholder="请输入"
             />
-            <el-tooltip
-              v-else-if="row.displayFormula || row.relFormula"
-              placement="top"
-              effect="dark"
-            >
-              <template #content>
-                <div>{{ row.displayFormula }}</div>
-              </template>
-              <span>{{ indicatorTextFn(row) }}</span>
-            </el-tooltip>
-            <span v-else>{{ indicatorTextFn(row) }}</span>
-          </template>
+          </div>
         </template>
       </vxe-column>
 
@@ -227,7 +234,8 @@ import {
   indicatorScoreText,
   indicatorResultText,
   fullScoreText,
-  showLevelSerial
+  showLevelSerial,
+  isShowFullScore
 } from './helpers'
 
 export default {
@@ -261,6 +269,9 @@ export default {
     showRemarkCol() {
       return this.resolveShowFlag('showRemark')
     },
+    showFullScoreCol() {
+      return (this.rows || []).some(row => isShowFullScore(row))
+    },
     showModifyReasonCol() {
       return this.resolveShowFlag('showModifyReason')
     }

package/src/components/measureCalc/MeasureGroupBlocks.vue

@@ -49,6 +49,7 @@
 
 <script>
 import MeasureQualAnalysis from './MeasureQualAnalysis.vue'
+import MeasureTreeTable from './MeasureTreeTable.vue'
 import {
   splitGroupNodes,
   isQualIndicator,
@@ -60,7 +61,7 @@ export default {
   name: 'MeasureGroupBlocks',
   components: {
     MeasureQualAnalysis,
-    MeasureTreeTable: () => import('./MeasureTreeTable.vue')
+    MeasureTreeTable
   },
   inject: ['measureCtx'],
   props: {

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -53,7 +53,12 @@
           <template #default="{ row }">{{ row.weight || '—' }}</template>
         </vxe-column>
 
-        <vxe-column title="指标满分值" width="110" align="center">
+        <vxe-column
+          v-if="showFullScoreCol"
+          title="指标满分值"
+          width="110"
+          align="center"
+        >
           <template #default="{ row }">{{ formatFullScore(row) }}</template>
         </vxe-column>
 
@@ -139,7 +144,8 @@ import {
   indicatorScoreText,
   showLevelSerial,
   isQualIndicator,
-  fullScoreText
+  fullScoreText,
+  isShowFullScore
 } from './helpers'
 
 export default {
@@ -167,6 +173,11 @@ export default {
     showModelScoreCol() {
       return !this.measureCtx().calcMode
     },
+    showFullScoreCol() {
+      return this.displayGroups.some(group =>
+        (group.children || []).some(child => isShowFullScore(child))
+      )
+    },
     /** 始终绑定 leafList 原始节点，避免 vxe 展开区副本导致 v-model 丢失 */
     displayGroups() {
       const resolve = this.measureCtx().resolveLeafNode

package/src/components/measureCalc/MeasureStatCell.vue

@@ -37,20 +37,33 @@
         </el-option>
       </el-select>
     </template>
-    <!-- 其余：只读或调整 -->
+    <!-- 其余：只读或调整（可调整时原值与输入框同时展示） -->
     <template v-else>
+      <el-tooltip
+        v-if="showOriginalWhenAdjust && showFormulaTip"
+        placement="top"
+        effect="dark"
+      >
+        <div slot="content">
+          {{ cell.displayFormula }}：
+          <br />
+          {{ cell.relFormula }}
+        </div>
+        <span>{{ originalValue(cell) }}</span>
+      </el-tooltip>
+      <span v-else-if="showOriginalWhenAdjust">{{ originalValue(cell) }}</span>
       <InputNumber
         v-if="
           cell.modifyRank === 2 &&
           cell.value !== '' &&
           cell.value !== null &&
           !column.disabled
-          && !readonly
         "
         class="full-w"
         size="small"
         :type="cell.displayStyle === 1 ? 'rate' : 'money'"
         :d-num="digits"
+        :disabled="readonly"
         v-model="cell.value"
       />
       <el-tooltip
@@ -65,7 +78,7 @@
         </div>
         <span>{{ displayValue(cell) }}</span>
       </el-tooltip>
-      <span v-else>{{ displayValue(cell) }}</span>
+      <span v-else-if="!showOriginalWhenAdjust">{{ displayValue(cell) }}</span>
     </template>
   </div>
 </template>
@@ -91,9 +104,27 @@ export default {
     showFormulaTip() {
       if (!this.cell || this.column.disabled) return false
       return !!(this.cell.displayFormula || this.cell.relFormula)
+    },
+    showOriginalWhenAdjust() {
+      return (
+        this.cell &&
+        this.cell.modifyRank === 2 &&
+        this.cell.indicatorResult !== '' &&
+        this.cell.indicatorResult !== null
+      )
     }
   },
   methods: {
+    originalValue(cell) {
+      const val = cell.indicatorResult
+      if (val === '' || val == null) return ''
+      let text = Number(val).toFixed(this.digits)
+      if (cell.showStyle === 2) {
+        text = addThousands(toFixedTrunc(val, this.digits))
+      }
+      const suffix = cell.displayStyle === 1 && (val || val === 0) ? '%' : ''
+      return text + suffix
+    },
     displayValue(cell) {
       if (this.column.disabled) {
         const val =

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -128,7 +128,9 @@
     <template v-if="tableCalcMode">
       <vxe-column title="指标值" min-width="200" align="center">
         <template #default="{ row }">
-          <template>
+          <div>
+            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
+            <span v-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
             <InputNumber
               v-if="row.sourceType === 3 && row.itemType === 21"
               class="full-w"
@@ -153,8 +155,7 @@
               v-model="row.value"
               placeholder="请输入"
             />
-            <span v-else>{{ indicatorTextFn(row) }}</span>
-          </template>
+          </div>
         </template>
       </vxe-column>
 
@@ -231,7 +232,12 @@
 
     <!-- 默认列：满分值 / 计算公式 / 评价标准 / 指标值 / 指标得分 / 模型指标得分 / 理由 -->
     <template v-else>
-      <vxe-column title="指标满分值" width="110" align="center">
+      <vxe-column
+        v-if="showFullScoreCol"
+        title="指标满分值"
+        width="110"
+        align="center"
+      >
         <template #default="{ row }">
           <span v-if="row.isLeaf === 1">{{ fullScoreFn(row) }}</span>
           <span v-else class="color-placeholder">—</span>
@@ -259,7 +265,20 @@
 
       <vxe-column title="指标值" min-width="260" align="center">
         <template #default="{ row }">
-          <template v-if="isQuantIndicatorFn(row)">
+          <div v-if="isQuantIndicatorFn(row)">
+            <!-- 原指标值：非手工填报始终展示；可调整时输入框在下方 -->
+            <el-tooltip
+              v-if="row.sourceType !== 3 && (row.displayFormula || row.relFormula)"
+              placement="top"
+              effect="dark"
+            >
+              <template #content>
+                <div>{{ row.displayFormula }}</div>
+              </template>
+              <span>{{ indicatorTextFn(row) }}</span>
+            </el-tooltip>
+            <span v-else-if="row.sourceType !== 3">{{ indicatorTextFn(row) }}</span>
+
             <!-- 可量化 + 手工填报：数字录入 -->
             <InputNumber
               v-if="row.sourceType === 3 && row.itemType === 21"
@@ -271,7 +290,7 @@
               v-model="row.value"
             />
 
-            <!-- 调整项=指标值：允许修改 -->
+            <!-- 调整项=指标值：在原值后允许修改 -->
             <InputNumber
               v-else-if="
                 row.modifyRank === 2 &&
@@ -284,21 +303,9 @@
               :d-num="digitsFn(row)"
               :disabled="ctx.readonly"
               v-model="row.value"
+              placeholder="请输入"
             />
-
-            <!-- 其余只读展示指标值 -->
-            <el-tooltip
-              v-else-if="row.displayFormula || row.relFormula"
-              placement="top"
-              effect="dark"
-            >
-              <template #content>
-                <div>{{ row.displayFormula }}</div>
-              </template>
-              <span>{{ indicatorTextFn(row) }}</span>
-            </el-tooltip>
-            <span v-else>{{ indicatorTextFn(row) }}</span>
-          </template>
+          </div>
           <template v-else-if="isSubModelFn(row)">
             <el-tooltip
               v-if="subModelFormulaFn(row)"
@@ -420,7 +427,8 @@ import {
   indicatorResultText,
   fullScoreText,
   hierarchySerial,
-  hierarchySerialPrefix
+  hierarchySerialPrefix,
+  isShowFullScore
 } from './helpers'
 
 export default {
@@ -496,6 +504,12 @@ export default {
     showRemarkCol() {
       return this.resolveShowFlag('showRemark')
     },
+    /** 当前层是否存在需要展示满分值的叶子指标 */
+    showFullScoreCol() {
+      return (this.nodes || []).some(
+        row => row && row.isLeaf === 1 && isShowFullScore(row)
+      )
+    },
     showModifyReasonCol() {
       return this.resolveShowFlag('showModifyReason')
     }

package/src/components/measureCalc/helpers.js

@@ -248,8 +248,14 @@ export function indicatorScoreText(row, modelWrap) {
   return N.div(N.mul(row.result, 100, digits + 2), row.weight, digits)
 }
 
+/** 是否展示满分值（showFullScore：1 展示；0 不展示；空值兼容旧数据按展示处理） */
+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)

package/src/components/measureCalc/statModelHelper.js

@@ -257,6 +257,32 @@ function resolveTableBlockMeta(treeData, pid, indicatorItems, modelWrap) {
   }
 }
 
+/** 节点是否展示满分值（0 不展示；空值兼容旧数据按展示） */
+function isShowFullScoreNode(row) {
+  return !!(row && row.showFullScore !== 0)
+}
+
+/** 某一统计项列是否需要「满分值」列（任一行开启则展示） */
+function shouldShowFullScoreCol(indicatorItems, statsName) {
+  return (indicatorItems || []).some(ind => {
+    const child = statItemChildren(ind).find(c => c.statsName === statsName)
+    return isShowFullScoreNode(child)
+  })
+}
+
+/** 构建只读满分值单元格 */
+function buildFullScoreCell(item) {
+  const score = item && (item.fullScore === 0 || item.fullScore) ? item.fullScore : ''
+  return {
+    ...item,
+    result: score,
+    value: score,
+    sourceType: '',
+    displayStyle: 0,
+    calcState: false
+  }
+}
+
 function groupIsLeaf2ByPid(nodes) {
   const map = new Map()
   nodes.forEach(n => {
@@ -297,6 +323,21 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
       firstStatChildren.forEach(item => {
         const statMeta = resolveStatMeta(statsResultList, item)
         if (!statMeta || !item.statsName) return
+        // 指标取数：按开关在指标值前插入满分值列
+        if (
+          statMeta.calType == 0 &&
+          shouldShowFullScoreCol(indicatorItems, item.statsName)
+        ) {
+          columns.push({
+            label: item.statsName + '满分值',
+            prop: item.statsName + '满分值',
+            slotName: item.statsName + '满分值',
+            disabled: true,
+            isFullScore: true,
+            minWidth: 120,
+            align: 'center'
+          })
+        }
         const label =
           statMeta.calType == 0 ? item.statsName + '指标值' : item.statsName
         columns.push({
@@ -347,6 +388,9 @@ export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
               } else {
                 item.value = resolveCellValue(item, optionList)
               }
+              if (statMeta.calType == 0 && isShowFullScoreNode(item)) {
+                listItem[item.statsName + '满分值'] = buildFullScoreCell(item)
+              }
               listItem[label] = item
               if (statMeta.calType == 0) {
                 const scoreVal =