n20-common-lib 2.7.30 → 2.7.32

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -641,37 +641,41 @@ export default {
         return this.addErrFn()
       }
       let { isCheck, taskId, appNo, groupNo, typeCode, orderId } = this.$route.query
-      let params = {
-        plainText: '',
-        signText: '',
-        isCheck,
-        auditAdvanceDtos: [
-          {
-            appNo: appNo,
-            taskId,
-            groupNo,
-            typeCode,
-            isAgentcy,
-            isCheck,
-            businessId: orderId
+      if (isCheck === '1') {
+        let params = {
+          plainText: '',
+          signText: '',
+          isCheck,
+          auditAdvanceDtos: [
+            {
+              appNo: appNo,
+              taskId,
+              groupNo,
+              typeCode,
+              isAgentcy,
+              isCheck,
+              businessId: orderId
+            }
+          ]
+        }
+        const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
+        if (code === 200) {
+          this.promptType = data.promptType
+          switch (data.promptType) {
+            case '0':
+              this.approvalFn()
+              break
+            case '1':
+              this.verifyV = true
+              this.verifyMsg = data
+              break
+            case '2':
+              this.verifyV = true
+              break
           }
-        ]
-      }
-      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
-      if (code === 200) {
-        this.promptType = data.promptType
-        switch (data.promptType) {
-          case '0':
-            this.approvalFn()
-            break
-          case '1':
-            this.verifyV = true
-            this.verifyMsg = data
-            break
-          case '2':
-            this.verifyV = true
-            break
         }
+      } else {
+        this.approvalFn()
       }
     },
     onceCancelFn() {

package/src/components/FileUploadTable/index.vue

@@ -447,7 +447,9 @@ export default {
         return this.batchPrintMethod(this.selectionList)
       }
       const { code, data } = await axios.post(
-        apiPrefix ? apiPrefix + `/neams/eamsbaserecord/mergeDownladPdf` : `/neams/eamsbaserecord/mergeDownladPdf`,
+        this.apiPrefix
+          ? this.apiPrefix + `/neams/eamsbaserecord/mergeDownladPdf`
+          : `/neams/eamsbaserecord/mergeDownladPdf`,
         this.selectionList.map((res) => res.beid) || [],
         {
           responseType: 'blob'
@@ -551,8 +553,8 @@ export default {
         } else {
           // 下载
           let blob = await axios.get(
-            apiPrefix
-              ? apiPrefix + `/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`
+            this.apiPrefix
+              ? this.apiPrefix + `/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`
               : `/neams/eamsbaserecord/download/${row[this.keys.rowKey]}`,
             null,
             {