n20-common-lib 2.7.28 → 2.7.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.28",
+  "version": "2.7.30",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -124,10 +124,12 @@
       </el-form-item>
     </el-form>
     <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
-      <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '加 签' | $lc }}</el-button>
+      <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
+        '加 签' | $lc
+      }}</el-button>
     </div>
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
+      <el-button type="primary" @click="checkFlowFn">{{ '批 准' | $lc }}</el-button>
       <el-button type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
       <el-button plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
       <el-button plain @click="rejectFn">{{ '驳回至发起人' | $lc }}</el-button>
@@ -139,7 +141,9 @@
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
-      <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
+      <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
+        '批 准' | $lc
+      }}</el-button>
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">{{
         '批准并审批下一条' | $lc
       }}</el-button>
@@ -624,6 +628,9 @@ export default {
         })
       })
     },
+    onContinue() {
+      this.approvalFn()
+    },
     async checkFlowFn() {
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
@@ -633,14 +640,24 @@ export default {
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }
-      let { isCheck } = this.$route.query
+      let { isCheck, taskId, appNo, groupNo, typeCode, orderId } = this.$route.query
       let params = {
         plainText: '',
         signText: '',
         isCheck,
-        auditAdvanceDtos: this.getParam()
+        auditAdvanceDtos: [
+          {
+            appNo: appNo,
+            taskId,
+            groupNo,
+            typeCode,
+            isAgentcy,
+            isCheck,
+            businessId: orderId
+          }
+        ]
       }
-      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`)
+      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
       if (code === 200) {
         this.promptType = data.promptType
         switch (data.promptType) {
@@ -662,7 +679,6 @@ export default {
     },
     // 审批
     approvalFn() {
-      this.checkFlowFn()
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')

package/src/components/FileUploadTable/index.vue

@@ -98,7 +98,7 @@
               :data="row['_fileData'] || fileData"
               :msg-type="null"
               :show-clear="false"
-              :action="action"
+              :action="apiPrefix ? apiPrefix + action : action"
               :multiple="multiple"
               :headers="headers"
               :disabled="!row[keys.type] || row._typeDisabled"
@@ -231,7 +231,7 @@
         :auto-upload="false"
         :multiple="true"
         :show-file-list="true"
-        :action="action"
+        :action="apiPrefix ? apiPrefix + action : action"
         :data="fileData"
         :headers="headers"
         :accept="fileAccept"
@@ -257,14 +257,14 @@
 </template>
 
 <script>
-import { $lc } from '../../utils/i18n/index'
 import dayjs from 'dayjs'
-import axios from '../../utils/axios'
-import Upload from '../Upload/index.vue'
-import Dialog from '../Dialog/index.vue'
 import cloneDeep from 'lodash/cloneDeep'
 import 'viewerjs/dist/viewer.css'
+import axios from '../../utils/axios'
+import { $lc } from '../../utils/i18n/index'
 import importG from '../../utils/importGlobal.js'
+import Dialog from '../Dialog/index.vue'
+import Upload from '../Upload/index.vue'
 
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
@@ -321,10 +321,18 @@ export default {
       type: String,
       default: '/bems/1.0/attach'
     },
+    batchPrintMethod: {
+      type: Function,
+      default: undefined
+    },
     headers: {
       type: Object,
       default: undefined
     },
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
     seePrefix: {
       type: String,
       default: undefined
@@ -435,8 +443,11 @@ export default {
           showClose: true
         })
       }
-      const { code, data } = await this.$axios.post(
-        `/neams/eamsbaserecord/mergeDownladPdf`,
+      if (this.batchPrintMethod) {
+        return this.batchPrintMethod(this.selectionList)
+      }
+      const { code, data } = await axios.post(
+        apiPrefix ? apiPrefix + `/neams/eamsbaserecord/mergeDownladPdf` : `/neams/eamsbaserecord/mergeDownladPdf`,
         this.selectionList.map((res) => res.beid) || [],
         {
           responseType: 'blob'
@@ -539,9 +550,15 @@ export default {
           }
         } else {
           // 下载
-          let blob = await axios.get(`/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`, null, {
-            responseType: 'blob'
-          })
+          let blob = await axios.get(
+            apiPrefix
+              ? apiPrefix + `/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`
+              : `/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`,
+            null,
+            {
+              responseType: 'blob'
+            }
+          )
           let name = row[this.keys.name] || blob.name
           return {
             url: URL.createObjectURL(blob),