@nstc-business/imes 1.0.13 → 1.0.15

package/package.json

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

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -58,6 +58,7 @@
 <script>
 import { buildStatModelTables, hasStatPivotNodes } from './statModelHelper'
 import { showLevelSerial } from './helpers'
+import { withRequestTimestamp } from './api'
 import MeasureStatCell from './MeasureStatCell.vue'
 
 export default {
@@ -103,10 +104,9 @@ export default {
       return (block.columns || []).filter(c => c.prop !== 'name')
     },
     async fetchScoreMap(itemID) {
-      const randomNumStr = `${Date.now()}${Math.floor(Math.random() * 1000000)}`
       try {
         const { code, data } = await this.$axios.post(
-          `/imes/v1/indicator/getScoreMap?randomNumStr=${randomNumStr}`,
+          withRequestTimestamp('/imes/v1/indicator/getScoreMap'),
           { id: itemID }
         )
         return code === 0 && Array.isArray(data) ? data : []

package/src/components/measureCalc/api.js

@@ -1,9 +1,18 @@
 import { axios } from 'n20-common-lib'
 
+export function withRequestTimestamp(url) {
+  const separator = url.includes('?') ? '&' : '?'
+  const randomNumStr = `${Date.now()}${Math.floor(Math.random() * 1000000)}`
+  return `${url}${separator}randomNumStr=${randomNumStr}`
+}
+
 /**
  * 获取不可量化指标的评分选项。
  * 返回完整响应，和 measureCalc 其余请求的调用方式保持一致。
  */
 export function getScoreMap(params) {
-  return axios.post('/imes/v1/indicator/getScoreMap', params)
+  return axios.post(
+    withRequestTimestamp('/imes/v1/indicator/getScoreMap'),
+    params
+  )
 }

package/src/components/measureCalc/helpers.js

@@ -9,7 +9,7 @@
  * modifyRank：0 不调整 1 调整指标得分 2 调整指标值
  */
 import { toFixedTrunc, addThousands } from '../common'
-import { statItemChildren } from './statModelHelper'
+import { resolveManualFillValue, statItemChildren } from './statModelHelper'
 
 export const ITEM_TYPE = {
   CALC_MODEL: 11,
@@ -362,6 +362,12 @@ export function normalizeTree(nodes, leafList = [], qualList = []) {
           node.modifiedResult = node.result
         }
       }
+      // 手工填报：输入框绑定 value，需从接口字段回填（旧版 itemDataFn 同逻辑）
+      if (node.sourceType === 3 && !isQualIndicator(node)) {
+        if (node.value === '' || node.value == null) {
+          node.value = resolveManualFillValue(node)
+        }
+      }
       if (node.modifyRank === 2 && !isQualIndicator(node)) {
         if (node.value === '' || node.value == null) {
           node.value = node.indicatorResult
@@ -377,10 +383,7 @@ export function normalizeTree(nodes, leafList = [], qualList = []) {
         if (!item.itemID) return
         if (!item._rowKey) item._rowKey = `mk_${_uid++}`
         if (item.sourceType === 3 && (item.value === '' || item.value == null)) {
-          item.value =
-            item.indicatorResult != null && item.indicatorResult !== ''
-              ? item.indicatorResult
-              : item.defaultVal ?? ''
+          item.value = resolveManualFillValue(item)
         }
         if (item.modifyRank === 2 && !isQualIndicator(item)) {
           if (item.value === '' || item.value == null) {

package/src/components/measureCalc/index.vue

@@ -247,6 +247,7 @@ import {
   mergeStatModelNode,
   statItemChildren
 } from './statModelHelper'
+import { withRequestTimestamp } from './api'
 import { formatFloat2 } from '../common'
 
 export default {
@@ -615,7 +616,7 @@ export default {
         this.loading = true
         try {
           const res = await this.$axios.post(
-            '/imes/v1/indicatorModel/getModelTree',
+            withRequestTimestamp('/imes/v1/indicatorModel/getModelTree'),
             { code, id, logId }
           )
           if (seq !== this.initSeq) return
@@ -731,12 +732,9 @@ export default {
     async fetchQualOptions() {
       await Promise.all(
         this.qualList.map(async row => {
-          const randomNumStr = `${Date.now()}${Math.floor(
-            Math.random() * 1000000
-          )}`
           try {
             const { code, data } = await this.$axios.post(
-              `/imes/v1/indicator/getScoreMap?randomNumStr=${randomNumStr}`,
+              withRequestTimestamp('/imes/v1/indicator/getScoreMap'),
               { id: row.itemID }
             )
             if (code === 0 && Array.isArray(data)) {
@@ -772,7 +770,7 @@ export default {
         this.cltLoading = true
         try {
           const res = await this.$axios.post(
-            '/custman-core/customer/findSimpleList',
+            withRequestTimestamp('/custman-core/customer/findSimpleList'),
             { keyword: query }
           )
           this.cltOptions = res.code == 200 ? res.data || [] : []
@@ -1041,7 +1039,10 @@ export default {
 
       this.calcLoading = true
       try {
-        const res = await this.$axios.post('/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) {
@@ -1115,7 +1116,10 @@ export default {
 
       this.$set(subModel, '_calcing', true)
       try {
-        const res = await this.$axios.post('/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)) {

package/src/components/measureCalc/statModelHelper.js

@@ -4,11 +4,29 @@
  * statCalResult 仅作辅助元数据（列配置/标题/合计），不作为是否行转列的判断条件
  */
 
+function hasFilledValue(val) {
+  return val !== '' && val != null && val !== undefined
+}
+
+/**
+ * 手工填报指标值回显：
+ * 优先 indicatorValText / indicatorResult（与旧版 itemDataFn 一致），
+ * 测算日志场景常只落 result，最后回退 defaultVal。
+ */
+export function resolveManualFillValue(item) {
+  if (!item) return ''
+  if (hasFilledValue(item.indicatorValText)) return item.indicatorValText
+  if (hasFilledValue(item.indicatorResult)) return item.indicatorResult
+  if (hasFilledValue(item.result)) return item.result
+  if (hasFilledValue(item.defaultVal)) return item.defaultVal
+  return item.defaultVal ?? ''
+}
+
 function resolveCellValue(item, optionList) {
   let value = ''
   switch (item.sourceType) {
     case 3:
-      value = item.indicatorResult
+      value = resolveManualFillValue(item)
       break
     case 0:
       value = {}
@@ -38,10 +56,7 @@ function resolveCellValue(item, optionList) {
 function applyCellValue(item, optionList) {
   if (item.sourceType === 3) {
     if (item.value === '' || item.value == null || item.value === undefined) {
-      item.value =
-        item.indicatorResult != null && item.indicatorResult !== ''
-          ? item.indicatorResult
-          : item.defaultVal ?? ''
+      item.value = resolveManualFillValue(item)
     }
     return
   }

package/src/index.js

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