n20-common-lib 2.14.9 → 2.14.11

package/package.json

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

package/src/components/AIButton/index.vue

@@ -8,7 +8,7 @@
         :drag="true"
         :file-name.sync="fileName"
         :file-url.sync="fileUrl"
-        action="/api/neams/eamsbaserecord/batchSavejson"
+        :action="apiPrefix ? apiPrefix + 'neams/eamsbaserecord/batchSavejson' : 'neams/eamsbaserecord/batchSavejson'"
         :on-success="onSuccess"
         :msg-type="null"
         :data="dataPorp"
@@ -29,6 +29,10 @@ export default {
   name: 'AiButton',
   components: { Dialog, clUpload },
   props: {
+    apiPrefix: {
+      type: String,
+      default: undefined
+    },
     AIOptions: {
       type: Object,
       default: () => ({})

package/src/components/ApprovalButtons/index.vue

@@ -811,13 +811,13 @@ export default {
       }
       this.showFlowDialog = await this.getIsShowRetraceFlow()
 
-      if (this.showFlowDialog) return
-
-      this.beforeFn(this.beforeReject, () => {
-        axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
-          this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至发起人'))
+      if (!this.showFlowDialog) {
+        this.beforeFn(this.beforeReject, () => {
+          axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至发起人'))
+          })
         })
-      })
+      }
     },
     handleIsJumpSave() {
       this.showFlowDialog = false