@nstc-business/imes 1.0.31 → 1.0.33

package/package.json

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

package/src/components/measureCalc/MeasureEvalFlatTable.vue

@@ -2,6 +2,7 @@
   <div class="measure-eval-flat">
     <vxe-table
       border
+      class="v3-n20-table-pro"
       :data="rows"
       :row-config="{ keyField: '_rowKey' }"
       :scroll-y="{ enabled: false }"

package/src/components/measureCalc/MeasureQualAnalysis.vue

@@ -29,7 +29,7 @@
       <vxe-table
         v-show="isExpanded(index)"
         border
-        class="qual-table"
+        class="qual-table v3-n20-table-pro"
         :data="group.children"
         :row-config="{ keyField: '_rowKey' }"
         :scroll-y="{ enabled: false }"

package/src/components/measureCalc/MeasureStatFlatTable.vue

@@ -4,6 +4,7 @@
     <vxe-table
       v-else
       border
+      class="v3-n20-table-pro"
       :data="rows"
       :merge-cells="mergeCells"
       :row-config="{ keyField: '_rowKey' }"

package/src/components/measureCalc/MeasureTreeTable.vue

@@ -2,7 +2,7 @@
   <vxe-table
     border
     ref="xTable"
-    :class="['measure-tree-table', 'level-' + level]"
+    :class="['measure-tree-table', 'v3-n20-table-pro', 'level-' + level]"
     :row-config="{ keyField: '_rowKey' }"
     :data="nodes"
     :expand-config="{ lazy: false, visibleMethod: canExpand }"

package/src/components/measureCalc/helpers.js

@@ -154,16 +154,14 @@ export const SUB_MODEL_LABEL = '测算子模型'
 /** 子模型独立测算按钮文案 */
 export const SUB_MODEL_CALC_BTN = '子模型测算'
 
-/** 子模型测算结果展示（优先 resultText，否则格式化 result） */
+/** 子模型测算结果展示（计算/统计读 digits，评价分数+等级固定2位） */
 export function subModelResultText(row, modelWrap) {
   if (!row) return ''
-  if (row.resultText != null && row.resultText !== '') {
-    return row.resultText
-  }
-  if (row.result !== '' && row.result != null) {
-    return resultByShowStyle(row, modelWrap)
-  }
-  return ''
+  return formatDisplayModelResult(
+    { result: row.result, resultText: row.resultText },
+    modelWrap,
+    { modelType: row.itemType, thousands: row.showStyle === 2 }
+  )
 }
 
 export function isCalcModel(row) {
@@ -223,6 +221,31 @@ export function digitsCalc(row, modelWrap) {
  */
 export const SCORE_DIGITS = 2
 
+/**
+ * 模型结果小数位：读模型返回的 digits，缺省回退 2
+ * （计算模型用；对应后台全局计算位数配置）
+ */
+export function modelResultDigits(modelWrap) {
+  return modelWrap && modelWrap.digits != null ? modelWrap.digits : 2
+}
+
+/**
+ * 模型结果数值格式化：按模型 digits 四舍五入保留小数位（仅计算模型）
+ * @param {*} val
+ * @param {*} modelWrap
+ * @param {{ thousands?: boolean }} [options]
+ */
+export function formatModelResultText(val, modelWrap, options = {}) {
+  if (val === '' || val == null) return ''
+  const num = Number(val)
+  if (Number.isNaN(num)) return String(val)
+  let text = num.toFixed(modelResultDigits(modelWrap))
+  if (options.thousands) {
+    text = addThousands(text)
+  }
+  return text
+}
+
 /**
  * 得分数值格式化：四舍五入，固定保留 SCORE_DIGITS 位
  * @param {*} val
@@ -239,6 +262,61 @@ export function formatScoreText(val, options = {}) {
   return text
 }
 
+/**
+ * 解析模型种类：顶层 type(1/2/3) 或节点 itemType(12/11/13)
+ * @returns {'eval'|'calc'|'stat'|'other'}
+ */
+export function resolveModelKind(type) {
+  const t = Number(type)
+  if (t === 1 || t === ITEM_TYPE.EVAL_MODEL) return 'eval'
+  if (t === 2 || t === ITEM_TYPE.CALC_MODEL) return 'calc'
+  if (t === 3 || t === ITEM_TYPE.STAT_MODEL) return 'stat'
+  return 'other'
+}
+
+/**
+ * 测算结果展示：
+ * - 计算/统计模型：按模型 digits（后台全局计算位数）
+ * - 评价模型：分数固定 2 位；有等级则「分数（等级）」，等级为空只显示分数
+ * @param {{ result?: *, resultText?: * }} payload
+ * @param {*} modelWrap
+ * @param {{ modelType?: number|string, thousands?: boolean }} [options]
+ */
+export function formatDisplayModelResult(payload, modelWrap, options = {}) {
+  const result = payload && payload.result
+  const resultText = payload && payload.resultText
+  const modelType = options.modelType != null ? options.modelType : modelWrap && modelWrap.type
+  const kind = resolveModelKind(modelType)
+  const hasScore = result !== '' && result != null
+  const grade =
+    resultText !== '' && resultText != null ? String(resultText).trim() : ''
+
+  if (kind === 'eval') {
+    if (!hasScore && !grade) return ''
+    const parts = []
+    if (hasScore) {
+      parts.push(formatScoreText(result, { thousands: options.thousands }))
+    }
+    // 等级为空不展示；「未知」等非空等级文案仍展示
+    if (grade) {
+      parts.push(`（${grade}）`)
+    }
+    return parts.join('')
+  }
+
+  const raw = hasScore ? result : grade
+  if (raw === '' || raw == null) return ''
+  const text = String(raw).trim()
+  if (!/^-?\d+(\.\d+)?$/.test(text)) {
+    return String(raw)
+  }
+  // 计算/统计模型读 digits；其他固定 2 位
+  if (kind === 'calc' || kind === 'stat') {
+    return formatModelResultText(text, modelWrap, { thousands: options.thousands })
+  }
+  return formatScoreText(text, { thousands: options.thousands })
+}
+
 /** 模型指标得分 / 模型指标系数数值（权重之后的 result）；得分不读模型 digits */
 export function resultByShowStyle(row, modelWrap) {
   if (!row || (row.result !== 0 && (row.result === '' || row.result == null))) {
@@ -319,15 +397,13 @@ export function indicatorResultText(row, modelWrap) {
 /** 从子模型节点解析指标值展示文案 */
 export function resolveSubModelValueText(row, modelWrap) {
   if (!row) return ''
-  if (row.resultText != null && row.resultText !== '') {
-    return row.resultText
-  }
-  const text = indicatorResultText(row, modelWrap)
-  if (text) return text
-  if (row.result !== '' && row.result != null) {
-    return resultByShowStyle(row, modelWrap)
-  }
-  return ''
+  const modelResult = formatDisplayModelResult(
+    { result: row.result, resultText: row.resultText },
+    modelWrap,
+    { modelType: row.itemType, thousands: row.showStyle === 2 }
+  )
+  if (modelResult) return modelResult
+  return indicatorResultText(row, modelWrap)
 }
 
 /** 子模型指标值：子模型测算后展示计算结果（固化，避免父模型测算覆盖 result 后丢失） */

package/src/components/measureCalc/index.vue

@@ -191,6 +191,42 @@
       </div>
     </div>
     <calculate-detail-dialog ref="calculateDetailDialog" />
+    <el-dialog
+      title="选择打印"
+      :visible.sync="printDialogVisible"
+      width="480px"
+      append-to-body
+      @closed="onPrintDialogClosed"
+    >
+      <el-form label-width="90px">
+        <el-form-item label="打印选项" required>
+          <el-select
+            v-model="selectedTemplateName"
+            placeholder="请选择"
+            clearable
+            filterable
+            :loading="printTemplateLoading"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in printTemplateList"
+              :key="item.ptId || item.ptNo || item.ptName"
+              :label="item.ptName"
+              :value="item.ptName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" :loading="printLoading" @click="confirmPrintDownload('download')">
+          下载
+        </el-button>
+        <el-button type="primary" size="small" :loading="printLoading" @click="confirmPrintDownload('print')">
+          打印
+        </el-button>
+        <el-button size="small" @click="printDialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -216,6 +252,7 @@ import {
   subModelResultText as formatSubModelResult,
   saveSubModelValueText,
   formatScoreText,
+  formatDisplayModelResult,
   resolveCalcEchoValue,
   shouldApplyModifiedVal
 } from './helpers'
@@ -341,6 +378,10 @@ export default {
       loading: false,
       calcLoading: false,
       printLoading: false,
+      printDialogVisible: false,
+      printTemplateList: [],
+      selectedTemplateName: '',
+      printTemplateLoading: false,
       model: { type: 1, name: '', code: '', digits: 2, modelTreeVO: {} },
       sections: [],
       anchorTabs: [],
@@ -419,21 +460,14 @@ export default {
       if (this.model.version === '' || this.model.version == null) return '--'
       return `版本${this.model.version}`
     },
-    /** 测算结果展示：优先 resultText，统计模型计算模式可回退到 result；得分固定 2 位四舍五入 */
+    /** 测算结果：计算/统计读 digits；评价固定2位且有等级则「分数（等级）」 */
     displayResultText() {
-      const raw =
-        this.resultText !== '' && this.resultText != null
-          ? this.resultText
-          : this.calcResult !== '' && this.calcResult != null
-            ? this.calcResult
-            : null
-      if (raw === null || raw === '') return '--'
-      const text = String(raw).trim()
-      // 纯数字得分：固定 2 位；非数字文案原样展示
-      if (/^-?\d+(\.\d+)?$/.test(text)) {
-        return formatScoreText(text)
-      }
-      return String(raw)
+      const text = formatDisplayModelResult(
+        { result: this.calcResult, resultText: this.resultText },
+        this.model,
+        { modelType: this.model && this.model.type }
+      )
+      return text || '--'
     },
     /** 评价模型展示「模型得分」，计算模型展示「模型公式」 */
     formulaRowLabel() {
@@ -1082,6 +1116,42 @@ export default {
       }
     },
     async printFn() {
+      const logId = this.currentLogId()
+      const modelId = this.currentModelId()
+      if (!logId || !modelId) {
+        this.$message.warning('请先完成测算后再打印')
+        return
+      }
+      this.selectedTemplateName = ''
+      this.printDialogVisible = true
+      await this.loadPrintTemplates()
+    },
+    onPrintDialogClosed() {
+      this.selectedTemplateName = ''
+    },
+    async loadPrintTemplates() {
+      this.printTemplateLoading = true
+      try {
+        const ptType =
+          this.model && this.model.type != null && this.model.type !== '' ? String(this.model.type) : undefined
+        const res = await this.$axios.get(
+          '/imes/print-template/list',
+          ptType ? { ptType } : {},
+          { loading: false }
+        )
+        const list = Array.isArray(res) ? res : (res && res.data) || []
+        this.printTemplateList = Array.isArray(list) ? list : []
+      } catch (e) {
+        this.printTemplateList = []
+      } finally {
+        this.printTemplateLoading = false
+      }
+    },
+    async confirmPrintDownload(action) {
+      if (!this.selectedTemplateName) {
+        this.$message.warning('请选择打印选项')
+        return
+      }
       const logId = this.currentLogId()
       const modelId = this.currentModelId()
       if (!logId || !modelId) {
@@ -1095,24 +1165,47 @@ export default {
           {
             ...extra,
             logId,
-            modelId
+            modelId,
+            templateName: this.selectedTemplateName
           }
         ])
         if (res.code !== 0) {
-          // this.$message.error(res.msg || '打印失败')
           return
         }
-        printJS({
-          printable: res.data,
-          type: 'pdf',
-          base64: true
-        })
+        if (action === 'print') {
+          printJS({
+            printable: res.data,
+            type: 'pdf',
+            base64: true
+          })
+        } else {
+          this.downloadPdfBase64(res.data)
+        }
+        this.printDialogVisible = false
       } catch (e) {
-        // this.$message.error('打印异常')
+        // keep quiet consistent with previous print catch
       } finally {
         this.printLoading = false
       }
     },
+    downloadPdfBase64(base64) {
+      const pure = String(base64 || '').replace(/^data:application\/pdf;base64,/, '')
+      const binary = atob(pure)
+      const len = binary.length
+      const bytes = new Uint8Array(len)
+      for (let i = 0; i < len; i++) {
+        bytes[i] = binary.charCodeAt(i)
+      }
+      const blob = new Blob([bytes], { type: 'application/pdf' })
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.href = url
+      a.download = `${(this.model && this.model.code) || '测算结果'}.pdf`
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+      URL.revokeObjectURL(url)
+    },
     hasPrintObj(val) {
       return val && typeof val === 'object' && Object.keys(val).length > 0
     },

package/src/index.js

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