@nstc-business/imes 1.0.30 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "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 }"
@@ -173,7 +174,8 @@
       <vxe-column
         v-if="showModifyReasonCol"
         min-width="260"
-        align="center"
+        align="left"
+        header-align="center"
       >
         <template #header>
           <div>
@@ -187,6 +189,7 @@
         <template #default="{ row }">
           <el-input
             v-if="showManualReason(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: manualReasonRed(row) }"
@@ -199,6 +202,7 @@
           />
           <el-input
             v-if="isQualFn(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :show-overflow-tooltip="true"
@@ -211,6 +215,7 @@
           />
           <el-input
             v-else-if="showAdjustReason(row)"
+            class="reason-input"
             type="textarea"
             v-title
             :class="{ reasonRequireRed: adjustReasonRed(row) }"
@@ -411,6 +416,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/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 }"
@@ -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/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>
 
@@ -341,6 +377,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: [],
@@ -1082,6 +1122,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 +1171,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
     },