n20-common-lib 2.7.29 → 2.7.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.29",
+  "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,12 +640,22 @@ 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`, params)
       if (code === 200) {
@@ -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('批准')