@nstc-business/imes 1.0.29 → 1.0.31

package/package.json

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

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -173,7 +173,8 @@
       <vxe-column
         v-if="showModifyReasonCol"
         min-width="260"
-        align="center"
+        align="left"
+        header-align="center"
       >
         <template #header>
           <div>
@@ -187,6 +188,7 @@
         <template #default="{ row }">
           <el-input
             v-if="showManualReason(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: manualReasonRed(row) }"
@@ -199,6 +201,7 @@
           />
           <el-input
             v-if="isQualFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :show-overflow-tooltip="true"
@@ -211,6 +214,7 @@
           />
           <el-input
             v-else-if="showAdjustReason(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: adjustReasonRed(row) }"
@@ -411,6 +415,17 @@ export default {
 .full-w {
   width: 100%;
 }
+.reason-input {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+
+  ::v-deep .el-textarea__inner {
+    width: 100%;
+    box-sizing: border-box;
+    resize: vertical;
+  }
+}
 .select-top {
   margin-top: 2px;
   height: 14px;

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -202,7 +202,8 @@
       <vxe-column
         v-if="showModifyReasonCol"
         min-width="260"
-        align="center"
+        align="left"
+        header-align="center"
       >
         <template #header>
           <div>
@@ -216,6 +217,7 @@
         <template #default="{ row }">
           <el-input
             v-if="showManualModifiedReasonFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: manualReasonRequireRedFn(row) }"
@@ -228,6 +230,7 @@
           />
           <el-input
             v-if="showAdjustModifiedReasonFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: adjustReasonRequireRedFn(row) }"
@@ -376,7 +379,8 @@
       <vxe-column
         v-if="showModifyReasonCol"
         min-width="260"
-        align="center"
+        align="left"
+        header-align="center"
       >
         <template #header>
           <div>
@@ -390,6 +394,7 @@
         <template #default="{ row }">
           <el-input
             v-if="showManualModifiedReasonFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: manualReasonRequireRedFn(row) }"
@@ -402,6 +407,7 @@
           />
           <el-input
             v-if="showAdjustModifiedReasonFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: adjustReasonRequireRedFn(row) }"
@@ -750,6 +756,17 @@ export default {
 .full-w {
   width: 100%;
 }
+.reason-input {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+
+  ::v-deep .el-textarea__inner {
+    width: 100%;
+    box-sizing: border-box;
+    resize: vertical;
+  }
+}
 .row-serial {
   color: #606266;
   font-variant-numeric: tabular-nums;

package/src/components/measureCalc/helpers.js

@@ -505,3 +505,30 @@ export function normalizeTree(nodes, leafList = [], qualList = []) {
   })
   return { leafList, qualList }
 }
+
+function hasEchoValue(val) {
+  return val !== '' && val != null && val !== undefined
+}
+
+/**
+ * 测算结果回写到输入框的值。
+ * 手工填报必须回显 indicatorResult；不能用 modifiedVal。
+ * 后端日志在未调整时会把 null 格式化成 0，若写回 value 会把已填指标值冲成 0。
+ * 时间：2026-09-05；人员：AI && 徐红飞；入参：target/source 节点；出参：回显值或 undefined；方法内容：按取数来源/调整项选择回显字段
+ */
+export function resolveCalcEchoValue(target, source) {
+  if (!target || !source) return undefined
+  if (target.sourceType === 3 && !isQualIndicator(target)) {
+    if (hasEchoValue(source.indicatorResult)) return source.indicatorResult
+    return undefined
+  }
+  if (target.itemType !== 22 && Number(target.modifyRank) === 2 && hasEchoValue(source.modifiedVal)) {
+    return source.modifiedVal
+  }
+  return undefined
+}
+
+/** 非「调整指标值」时，日志里的 modifiedVal=0 不是真实调整，不能覆盖到节点 */
+export function shouldApplyModifiedVal(target, source) {
+  return !!(target && source && Number(target.modifyRank) === 2 && hasEchoValue(source.modifiedVal))
+}

package/src/components/measureCalc/index.vue

@@ -215,7 +215,9 @@ import {
   isStatRootModel as checkStatRootModel,
   subModelResultText as formatSubModelResult,
   saveSubModelValueText,
-  formatScoreText
+  formatScoreText,
+  resolveCalcEchoValue,
+  shouldApplyModifiedVal
 } from './helpers'
 import { preprocessStatIndicatorDeepList, mergeStatModelNode, statItemChildren } from './statModelHelper'
 import { withRequestTimestamp } from './api'
@@ -1290,7 +1292,6 @@ export default {
         'calcLogs',
         'relFormula',
         'displayFormula',
-        'modifiedVal',
         'modifiedResult'
       ]
       fields.forEach(key => {
@@ -1298,8 +1299,13 @@ export default {
           this.$set(target, key, source[key])
         }
       })
-      if (target.itemType !== 22 && (source.modifiedVal || source.modifiedVal === 0)) {
-        this.$set(target, 'value', source.modifiedVal)
+      // 未调整时后端 modifiedVal 常为 0，不能覆盖手工填报的指标值
+      if (shouldApplyModifiedVal(target, source)) {
+        this.$set(target, 'modifiedVal', source.modifiedVal)
+      }
+      const echoValue = resolveCalcEchoValue(target, source)
+      if (echoValue !== undefined) {
+        this.$set(target, 'value', echoValue)
       }
     },