n20-common-lib 2.3.6 → 2.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/ApprovalButtons/index.vue

@@ -81,6 +81,19 @@
           />
         </template>
       </div>
+      <el-form-item v-if="fileKit || fileKitT" label="附加上传">
+        <cl-upload
+          class="upload-224"
+          :file-name.sync="fileName"
+          multiple
+          :data="fileData"
+          :file-url.sync="fileUrl"
+          :on-success="onSuccess"
+          :on-remove="onRemove"
+          action="/api/neams/eamsbaserecord/batchSavejson"
+          msg-type="message"
+        />
+      </el-form-item>
     </el-form>
 
     <div class="text-c">
@@ -183,6 +196,27 @@ export default {
         return ['reject', 'rejectPre', 'approval', 'discard']
       }
     },
+    fileData: {
+      type: Object,
+      default: () => {
+        return {
+          data: JSON.stringify({
+            syscode: '010000000',
+            appno: 'abcd',
+            bussValue: '006001001',
+            cltno: '001',
+            creator: 'jz'
+          })
+        }
+      }
+    },
+    /**
+     * 是否上传审批附件
+     */
+    fileKit: {
+      type: Boolean,
+      default: false
+    },
     beforeRatify: {
       type: Function,
       default: undefined
@@ -221,7 +255,10 @@ export default {
       approvalToV: false,
       showApprovalTo: false,
       opiAndUser: false,
-      otherAtt: {}
+      otherAtt: {},
+      fileDtos: [],
+      fileName: '',
+      fileUrl: ''
     }
   },
   computed: {
@@ -236,6 +273,11 @@ export default {
           this.messageIn = val
         }
       }
+    },
+    fileKitT: {
+      get() {
+        return window.fileKit
+      }
     }
   },
   created() {
@@ -335,6 +377,7 @@ export default {
           formData: JSON.stringify(this.formData),
           signText: this.signText,
           isAgentcy: isAgentcy,
+          fileDtos: this.fileDtos,
           carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
           addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname })),
           addTaskType: this.addTaskType,
@@ -481,6 +524,20 @@ export default {
       }
 
       this.setAddtaskV = false
+    },
+    getFileDtos(fileList) {
+      return fileList.map((file) => {
+        return {
+          fileName: file.name,
+          beid: file.response?.data
+        }
+      })
+    },
+    onRemove(file, fileList) {
+      this.fileDtos = this.getFileDtos(fileList)
+    },
+    onSuccess(file, row, fileList) {
+      this.fileDtos = this.getFileDtos(fileList)
     }
   }
 }

package/src/components/ApprovalCard/index.vue

@@ -59,6 +59,51 @@
               <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
               <span>{{ item.suggestion }}</span>
             </div>
+            <div v-if="item.flowHisFileList" class="n20-description-c n20-description-bgc m-t p-a-s">
+              <span>{{ '附件信息' | $lc }}：</span>
+              <div class="flex-box">
+                <div
+                  v-for="(res, i) in item.flowHisFileList"
+                  :key="i"
+                  class="m-a-ss color-primary pointer"
+                  @click="preview(res)"
+                >
+                  {{ res.fileName }}
+                </div>
+              </div>
+              <Dialog
+                v-drag
+                class="p-a-0"
+                :title="'附件预览' | $lc"
+                :visible.sync="visibleP"
+                top="2vh"
+                width="96%"
+                :close-on-click-modal="false"
+                @close="closeSee"
+              >
+                <div v-if="visibleP" class="p-a" style="height: 82vh">
+                  <ViewerImg v-if="imgType.test(previewName)" :options="viewerOptions" style="height: 100%">
+                    <img :src="previewUrl" :alt="previewName" style="display: none" />
+                  </ViewerImg>
+                  <component
+                    :is="previewSameOrg ? 'object' : 'div'"
+                    v-else
+                    :key="previewUrl"
+                    :data="previewUrl"
+                    style="width: 100%; height: 100%"
+                  >
+                    <div class="flex-column flex-c flex-v" style="height: 100%">
+                      <i class="el-icon-s-release" style="font-size: 60px; color: #999"></i>
+                      <span style="margin-top: 16px">
+                        {{ '不支持在线预览，请' | $lc
+                        }}<el-link type="primary" @click="downFile(seeRow)">{{ '下载' | $lc }}</el-link
+                        >{{ '到本地查看' | $lc }}
+                      </span>
+                    </div>
+                  </component>
+                </div>
+              </Dialog>
+            </div>
           </template>
         </div>
       </el-timeline-item>
@@ -69,10 +114,22 @@
 <script>
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
+import Dialog from '../Dialog/index.vue'
+import 'viewerjs/dist/viewer.css'
+import importG from '../../utils/importGlobal.js'
+
+const ViewerImg = async function () {
+  let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
+  return component
+}
 if (!window._approvalExtend) window._approvalExtend = {}
 
 export default {
   name: 'ApprovalCard',
+  components: {
+    Dialog,
+    ViewerImg
+  },
   filters: {
     typeF(item, status, prefix = '') {
       let result = item.result
@@ -132,9 +189,37 @@ export default {
     }
   },
   data() {
+    this.viewerOptions = {
+      debug: true,
+      inline: true,
+      scalable: false, // 不显示水平(垂直)翻转
+      navbar: false,
+      button: false,
+      title: true,
+      toolbar: {
+        zoomIn: true,
+        zoomOut: true,
+        oneToOne: true,
+        reset: true,
+        rotateLeft: true,
+        rotateRight: true,
+        flipHorizontal: true,
+        flipVertical: true,
+        prev: false,
+        play: false,
+        next: false
+      }
+    }
     return {
       // 显示撤回意见,默认不显示
-      showCtdMsg: window._approvalExtend['card.countermand.suggestion'] === true
+      showCtdMsg: window._approvalExtend['card.countermand.suggestion'] === true,
+      visibleP: false,
+      previewUrl: '',
+      imgType: /\.(jpg|png|gif|svg)$/i,
+      previewName: '',
+      previewSameOrg: false,
+      seeTypes: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc)$/i,
+      seeRow: {}
     }
   },
   created() {
@@ -155,6 +240,7 @@ export default {
               assignee: item.assignee,
               suggestion: item.suggestion,
               roleName: item.roleName,
+              flowHisFileList: item.flowHisFileList || null, //附件信息
               ccUserName: item.ccUserName, // 抄送人
               addTaskName: item.addTaskName, // 加签审批人
               memberName: item.memberName // 审批人单位
@@ -187,6 +273,39 @@ export default {
           console.log(this.approvalData)
         })
     }
+  },
+  methods: {
+    async preview(row) {
+      this.visibleP = true
+      this.seeRow = row
+      const blob = await axios.get(`/api/onlinePreview?beid=${row.beid}`, {}, { responseType: 'blob' })
+      let url = URL.createObjectURL(blob)
+      this.previewUrl = url
+      this.previewName = row.fileName
+      this.previewSameOrg = this.seeTypes.test(row.fileName)
+    },
+    closeSee() {
+      this.previewUrl && URL.revokeObjectURL(this.previewUrl)
+      this.previewUrl = undefined
+      this.visibleP = false
+    },
+    async downFile(row) {
+      const blob = await axios.get(`/api/neams/eamsbaserecord/download/${row.beid}`, null, {
+        responseType: 'blob'
+      })
+      let url = URL.createObjectURL(blob)
+      if (url) {
+        let aDom = document.createElement('a')
+        aDom.href = url
+        aDom.download = row.fileName
+        aDom.click()
+
+        this.$nextTick(() => {
+          aDom = undefined
+          url && URL.revokeObjectURL(url)
+        })
+      }
+    }
   }
 }
 </script>