@nstc-business/imes 1.0.39 → 1.0.41

package/package.json

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

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="measure-eval-flat">
+    <!-- 横条放在表头上方：表格按内容撑高时，底部横条会落到页面可视区外，右侧列无法滚动 -->
     <vxe-table
       border
       class="v3-n20-table-pro"
       :data="rows"
       :row-config="{ keyField: '_rowKey' }"
       :scroll-y="{ enabled: false }"
+      :scrollbar-config="{ x: { position: 'top' } }"
     >
       <vxe-column v-if="showSerial" title="序号" width="72" align="center">
         <template #default="{ rowIndex }">{{ rowIndex + 1 }}</template>
@@ -245,6 +247,7 @@ import {
   showLevelSerial,
   isShowFullScore
 } from './helpers'
+import { fillQualReasonFromOption } from './qualReason'
 
 export default {
   name: 'MeasureEvalFlatTable',
@@ -337,6 +340,8 @@ export default {
       this.$set(target, 'scoreText', option.scoreText)
       this.$set(target, 'scoreValue', option.scoreValue)
       target.picker = option
+      fillQualReasonFromOption(target, option, true)
+      this.$set(target, 'reason', target.reason)
       this.syncQual(target, {
         itemID: target.itemID,
         scoreMapID: option.scoreMapID,

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -26,6 +26,7 @@
         </span>
       </div>
 
+      <!-- 横条放在表头上方：表格按内容撑高时，底部横条会落到页面可视区外，右侧列无法滚动 -->
       <vxe-table
         v-show="isExpanded(index)"
         border
@@ -33,6 +34,7 @@
         :data="group.children"
         :row-config="{ keyField: '_rowKey' }"
         :scroll-y="{ enabled: false }"
+        :scrollbar-config="{ x: { position: 'top' } }"
       >
         <vxe-column v-if="showSerial" title="序号" width="72" align="center">
           <template #default="{ rowIndex }">{{ rowIndex + 1 }}</template>
@@ -154,6 +156,7 @@ import {
   fullScoreText,
   isShowFullScore
 } from './helpers'
+import { fillQualReasonFromOption } from './qualReason'
 
 export default {
   name: 'MeasureQualAnalysis',
@@ -251,13 +254,15 @@ export default {
       const resolve = this.measureCtx().resolveLeafNode
       return resolve ? resolve(node) || node : node
     },
-    applyNodeSelection(node, option) {
+    applyNodeSelection(node, option, forceReason = false) {
       if (!node || !option) return
       this.$set(node, 'value', option)
       this.$set(node, 'scoreMapID', option.scoreMapID)
       this.$set(node, 'scoreText', option.scoreText)
       this.$set(node, 'scoreValue', option.scoreValue)
       this.$set(node, 'picker', option)
+      fillQualReasonFromOption(node, option, forceReason)
+      this.$set(node, 'reason', node.reason)
     },
     pushQualDraft(node, patch) {
       const sync = this.measureCtx().syncQualSelection
@@ -280,7 +285,7 @@ export default {
         item => item.scoreMapID == scoreMapID
       )
       if (!option) return
-      this.applyNodeSelection(target, option)
+      this.applyNodeSelection(target, option, true)
       this.$set(target, 'result', null)
       this.pushQualDraft(target, {
         itemID: target.itemID,
@@ -313,7 +318,7 @@ export default {
             const option = (node.optionList || []).find(
               o => o.scoreMapID == draft.scoreMapID
             )
-            if (option) this.applyNodeSelection(node, option)
+            if (option) this.applyNodeSelection(node, option, false)
           }
           if (draft.reason != null && draft.reason !== node.reason) {
             this.$set(node, 'reason', draft.reason)

package/src/components/measureCalc/MeasureStatFlatTable.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="measure-stat-flat">
     <div v-if="!rows.length" class="stat-empty">暂无统计数据</div>
+    <!-- 横条放在表头上方：表格按内容撑高时，底部横条会落到页面可视区外，右侧列无法滚动 -->
     <vxe-table
       v-else
       border
@@ -9,6 +10,7 @@
       :merge-cells="mergeCells"
       :row-config="{ keyField: '_rowKey' }"
       :scroll-y="{ enabled: false }"
+      :scrollbar-config="{ x: { position: 'top' } }"
     >
       <vxe-column field="pName" title="指标项" min-width="150" align="center" />
       <vxe-column field="statsName" title="统计项名称" min-width="150" align="center" />

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 横条放在表头上方：表格按内容撑高时，底部横条会落到页面可视区外，右侧列无法滚动 -->
   <vxe-table
     border
     ref="xTable"
@@ -7,6 +8,7 @@
     :data="nodes"
     :expand-config="{ lazy: false, visibleMethod: canExpand }"
     :scroll-y="{ enabled: false }"
+    :scrollbar-config="{ x: { position: 'top' } }"
   >
     <vxe-column v-if="hasContainer" type="expand" width="44">
       <template #content="{ row }">

package/src/components/measureCalc/helpers.qualReason.test.js

@@ -0,0 +1,58 @@
+/**
+ * 定性指标评价理由回填：选选项带到节点 reason；测算结果非空 reason 才覆盖
+ */
+const fs = require('fs')
+const path = require('path')
+
+const src = fs
+  .readFileSync(path.join(__dirname, 'qualReason.js'), 'utf8')
+  .replace(/export /g, '')
+const exported = {}
+new Function(
+  'exports',
+  src +
+    '\nexports.hasFilledReason = hasFilledReason' +
+    '\nexports.fillQualReasonFromOption = fillQualReasonFromOption' +
+    '\nexports.mergeCalcResultReason = mergeCalcResultReason'
+)(exported)
+
+const { hasFilledReason, fillQualReasonFromOption, mergeCalcResultReason } = exported
+
+function assert(cond, msg) {
+  if (!cond) throw new Error(msg)
+}
+
+assert(hasFilledReason('有内容') === true, '非空理由应为 true')
+assert(hasFilledReason('') === false, '空字符串应为 false')
+assert(hasFilledReason('  ') === false, '空白应为 false')
+assert(hasFilledReason(null) === false, 'null 应为 false')
+
+const option = { scoreMapID: 1, scoreText: '否', reason: '至少下调1级，最低调至CC级' }
+
+const emptyNode = { reason: '' }
+fillQualReasonFromOption(emptyNode, option, false)
+assert(emptyNode.reason === option.reason, '节点理由为空时应从选项带回，实际: ' + emptyNode.reason)
+
+const savedNode = { reason: '用户已保存的理由' }
+fillQualReasonFromOption(savedNode, option, false)
+assert(savedNode.reason === '用户已保存的理由', '回显时不应覆盖已有理由')
+
+const selectNode = { reason: '旧选项理由' }
+fillQualReasonFromOption(selectNode, option, true)
+assert(selectNode.reason === option.reason, '用户新选选项时应覆盖为当前选项理由')
+
+const noOptionReason = { reason: '' }
+fillQualReasonFromOption(noOptionReason, { reason: '' }, true)
+assert(noOptionReason.reason === '', '选项没有理由时不应写脏值')
+
+const target = { reason: '界面上已填' }
+mergeCalcResultReason(target, { reason: '测算日志理由' })
+assert(target.reason === '测算日志理由', '测算回写非空理由应覆盖')
+
+mergeCalcResultReason(target, { reason: '' })
+assert(target.reason === '测算日志理由', '测算回写空理由不应把界面理由冲掉')
+
+mergeCalcResultReason(target, {})
+assert(target.reason === '测算日志理由', '测算结果无 reason 字段时保持原值')
+
+console.log('helpers.qualReason.test.js ok')

package/src/components/measureCalc/index.vue

@@ -258,6 +258,7 @@ import {
 } from './helpers'
 import { preprocessStatIndicatorDeepList, mergeStatModelNode, statItemChildren } from './statModelHelper'
 import { withRequestTimestamp } from './api'
+import { fillQualReasonFromOption, mergeCalcResultReason } from './qualReason'
 import { formatFloat2 } from '../common'
 import { printJS } from 'n20-common-lib/src/plugins/Print'
 import calculateDetailDialog from '../calculateDetail/dialog.vue'
@@ -653,6 +654,8 @@ export default {
           this.$set(target, 'scoreText', selected.scoreText)
           this.$set(target, 'scoreValue', selected.scoreValue)
           this.$set(target, 'picker', selected)
+          fillQualReasonFromOption(target, selected, false)
+          this.$set(target, 'reason', target.reason)
         })
       }
       return selected || null
@@ -808,6 +811,7 @@ export default {
               const matched =
                 data.find(o => o.scoreMapID == row.scoreMapID) ||
                 data.find(o => o.scoreText == row.scoreText) ||
+                data.find(o => o.scoreText == row.indicatorValText) ||
                 data.find(o => o.scoreValue == row.indicatorResult)
               if (matched) {
                 this.$set(row, 'value', matched)
@@ -815,6 +819,8 @@ export default {
                 this.$set(row, 'scoreText', matched.scoreText)
                 this.$set(row, 'scoreValue', matched.scoreValue)
                 this.$set(row, 'picker', matched)
+                fillQualReasonFromOption(row, matched, false)
+                this.$set(row, 'reason', row.reason)
               }
             }
           } catch (e) {
@@ -1392,6 +1398,9 @@ export default {
           this.$set(target, key, source[key])
         }
       })
+      if (mergeCalcResultReason(target, source)) {
+        this.$set(target, 'reason', target.reason)
+      }
       // 未调整时后端 modifiedVal 常为 0，不能覆盖手工填报的指标值
       if (shouldApplyModifiedVal(target, source)) {
         this.$set(target, 'modifiedVal', source.modifiedVal)

package/src/components/measureCalc/qualReason.js

@@ -0,0 +1,29 @@
+/**
+ * 定性指标评价理由回填
+ * 时间：2026-09-21；人员：AI && 徐红飞；入参：节点/选项/测算结果；出参：是否写回；方法内容：选项理由带到评价理由，测算空值不覆盖
+ */
+
+export function hasFilledReason(val) {
+  return val != null && String(val).trim() !== ''
+}
+
+/**
+ * 把评分选项上的评价说明写到节点评价理由。
+ * force=true：用户刚选选项，用当前选项 reason 覆盖。
+ * force=false：回显/拉选项，仅当节点 reason 为空时补齐，避免冲掉日志里已保存的理由。
+ */
+export function fillQualReasonFromOption(row, option, force = false) {
+  if (!row || !option) return false
+  if (!hasFilledReason(option.reason)) return false
+  if (!force && hasFilledReason(row.reason)) return false
+  row.reason = option.reason
+  return true
+}
+
+/** 测算结果回写：仅非空 reason 覆盖，避免空串冲掉界面已填理由 */
+export function mergeCalcResultReason(target, source) {
+  if (!target || !source) return false
+  if (!hasFilledReason(source.reason)) return false
+  target.reason = source.reason
+  return true
+}