@lambo-design-mobile/workflow-approve 1.0.0-beta.24 → 1.0.0-beta.26

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 # Changelog
+## [1.0.0-beta.26](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.25...@lambo-design-mobile/workflow-approve@1.0.0-beta.26) (2026-03-30)
+
+
+### ✨ Features | 新功能
+
+* **审批组件:** 连续减签同一人失败问题修复 ([3815640](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/3815640a78b55b92aa9eb352d8e92f5d963f53b3))
+
+## [1.0.0-beta.25](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.24...@lambo-design-mobile/workflow-approve@1.0.0-beta.25) (2026-03-18)
+
+
+### ✨ Features | 新功能
+
+* **审批组件:** 选人框查询问题修复 ([7712bab](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/7712babcead1d9838ef17672370fe2a1a37f828d))
+* **审批组件:** 增加驳回判断优化 ([90c270b](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/90c270b13f13a44d83502c0081d885a8083be75e))
+
 ## [1.0.0-beta.24](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.23...@lambo-design-mobile/workflow-approve@1.0.0-beta.24) (2026-03-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.24",
+  "version": "1.0.0-beta.26",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -15,8 +15,8 @@
   "devDependencies": {
     "standard-version": "^9.5.0",
     "@lambo-design-mobile/lambo-scan-code": "^1.0.0-beta.1",
-    "@lambo-design-mobile/upload-file": "^1.0.0-beta.16",
-    "@lambo-design-mobile/shared": "^1.0.0-beta.21"
+    "@lambo-design-mobile/shared": "^1.0.0-beta.21",
+    "@lambo-design-mobile/upload-file": "^1.0.0-beta.16"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/FlowApproval.vue

@@ -692,9 +692,7 @@ export default {
   methods: {
     getAuditStatus,
     initData() {
-      if (!this.handleButtons){
-        this.getHandleButtons();
-      }
+      this.getHandleButtons();
       if (!this.isDetail) this.getTaskStatus();
       this.getProcessHistory();
       this.getNextNodes();
@@ -760,8 +758,8 @@ export default {
       getNodeData(this.procId, this.taskNode).then(resp => {
         if (resp.data.code === '200') {
           const data = resp.data.data[0]
-          this.handleButtons = data.handleButtons ? data.handleButtons : ["processTrace", "auditHistory", "auditOpinion", "attachmentFile", "auditTo30", "auditTo70", "auditTo40", "auditTo90", "auditTo80", "auditTo82", "auditTo50"];
-          this.coSignVotingTask = data.handleButtons && data.handleButtons.includes('coSignVoting')
+          this.handleButtons = this.handleButtons ? this.handleButtons : data.handleButtons ? data.handleButtons : ["processTrace", "auditHistory", "auditOpinion", "attachmentFile", "auditTo30", "auditTo70", "auditTo40", "auditTo90", "auditTo80", "auditTo82", "auditTo50"];
+          this.coSignVotingTask = this.handleButtons && this.handleButtons.includes('coSignVoting')
           this.nextAssigneeSelectionType = data.nextAssigneeSelectionType;
           this.passName = data.handleName;
           this.rejectName = data.rejectName;
@@ -1131,7 +1129,7 @@ export default {
       } else if (updateType === '83') {
         getUnapprovedListOfMultiNode(self.taskId).then(res => {
           if (res.data.code === '200') {
-            self.unapprovedAssigneeList = res.data.data.map(item => ({...item, userId: item.auditId, organName: item.auditUserOrgan ? item.auditUserOrgan.split(':')[1] : '未知部门'}))
+            self.unapprovedAssigneeList = res.data.data.map(item => ({...item, userName: item.auditName, userId: item.auditId, organName: item.auditUserOrgan ? item.auditUserOrgan.split(':')[1] : '未知部门'}))
             self.selectReductionUserPopupShow = true
           } else {
             Toast.fail(resp.data.message)
@@ -1265,7 +1263,7 @@ export default {
             } else {
               // 前序节点只有一个会签节点才可选择驳回人员
               self.showRejectToSelected = result.data.length === 1 && result.data[0].handleButtons?.includes('rejectToSelected')
-              self.nodeList = result.data
+              self.nodeList = Array.isArray(result.data) ? result.data : []
               self.radio = 0
               if (self.showRejectToSelected && !self.handleButtons?.includes('rejectProcessControl')) {
                 self.rejectAttributesBoxShow = true
@@ -1308,7 +1306,7 @@ export default {
       getProcessAttributes(self.procId, self.taskNode).then(resp => {
         if (resp.data.code === '200') {
           if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && (resp.data.data.multiNode || resp.data.data.preNodeGateway))) {
-            if (self.showRejectToSelected) {
+            if (self.showRejectToSelected && self.nodeList.length > 0) {
               self.rejectAttributesBoxShow = true
               return
             }
@@ -1659,6 +1657,11 @@ export default {
         self.getProcessAttributes(val)
       }
     },
+    selectReductionUserPopupShow(newVal) {
+      if (newVal) {
+        this.reductionUsers = [];
+      }
+    }
   }
 
 };

package/src/SelectHandle.vue

@@ -144,11 +144,15 @@ export default {
         this.personList.rows = this.userRangeList
         this.personList.total = this.userRangeList.length
         return
-      }
-      this.useUserTransferRange = false
-      if (this.orgList && this.orgList.length > 0){
-        this.organizeIdList = this.orgList.map(item => item.orgId)
-        this.orgTreeType = this.organTreeType;
+      }
+      this.useUserTransferRange = false
+      this.personList.total = 0;
+      this.personList.rows = [];
+      this.finished = false;
+      this.loading = false;
+      if (this.orgList && this.orgList.length > 0){
+        this.organizeIdList = this.orgList.map(item => item.orgId)
+        this.orgTreeType = this.organTreeType;
         this.searchForm = {
           ...this.searchForm,
           orgTreeType: this.organTreeType,
@@ -180,33 +184,43 @@ export default {
         })
       }
     },
-    handleLoad() {
-      console.log("触发加载")
-      this.loading = true;
-      if (this.useUserTransferRange){
-        this.personList.rows = this.searchForm.userName ? this.userRangeList.map(item => item.userName === this.searchForm.userName) : this.userRangeList
-        this.personList.total = this.personList.rows.length;
-        this.loading = false;
-        return
-      }
+    handleLoad() {
+      if (this.loading || this.finished) {
+        return
+      }
+      console.log("触发加载")
+      this.loading = true;
+      if (this.useUserTransferRange){
+        this.personList.rows = this.searchForm.userName ? this.userRangeList.map(item => item.userName === this.searchForm.userName) : this.userRangeList
+        this.personList.total = this.personList.rows.length;
+        this.finished = true;
+        this.loading = false;
+        return
+      }
       const offset = this.personList.rows.length;
       const limit = 10;
 
-      getUserList(offset, limit, this.searchForm).then(res => {
-        const result = res.data;
-        if (result.code === "1") {
-          //返回的数据添加到 personList 中
-          this.personList.rows = this.personList.rows.concat(result.data.rows);
-          this.personList.total = result.data.total;
-        }
-
-        this.loading = false;
-        this.finished = this.personList.rows.length >= this.personList.total;
-
-      }).catch(error => {
-        console.error('Error fetching data:', error);
-        this.loading = false;
-      });
+      getUserList(offset, limit, this.searchForm).then(res => {
+        const result = res.data;
+        if (result.code === "1") {
+          //返回的数据添加到 personList 中
+          const newRows = Array.isArray(result.data.rows) ? result.data.rows : [];
+          this.personList.rows = this.personList.rows.concat(newRows);
+          const total = Number(result.data.total);
+          if (!Number.isNaN(total)) {
+            this.personList.total = total;
+          }
+          const noMoreByPage = newRows.length < limit;
+          const noMoreByTotal = this.personList.total > 0 && this.personList.rows.length >= this.personList.total;
+          this.finished = noMoreByPage || noMoreByTotal;
+        }
+
+        this.loading = false;
+
+      }).catch(error => {
+        console.error('Error fetching data:', error);
+        this.loading = false;
+      });
     },
 
     extractUsers(permScope) {
@@ -240,11 +254,13 @@ export default {
     resetSearch() {
       this.initSearch()
     },
-    resetAndLoadPersonList() {
-      this.personList.total = 0;
-      this.personList.rows = [];
-      this.handleLoad();
-    },
+    resetAndLoadPersonList() {
+      this.personList.total = 0;
+      this.personList.rows = [];
+      this.finished = false;
+      this.loading = false;
+      this.handleLoad();
+    },
     handleSelect(handle) {
       if (handle === 'select') {
         // 触发自定义事件 'selectHandle'，并传递 this.checkResult

package/src/WorkflowDiagram.vue

@@ -85,7 +85,7 @@
 <script>
 import Viewer from "bpmn-js/lib/Viewer";
 import { Toast } from "vant";
-import {getHisAudit, getPrintData, printData, renderFutureNode} from "../api";
+import {getHisAudit, getPrintData, printData, renderFutureNode, getNodeData} from "../api";
 import ApprovalNodeCell from "./ApprovalNodeCell.vue";
 import { getAuditStatus } from './js/global';
 import FlowNodeCell from "./FlowNodeCell.vue";  // 根据路径修改
@@ -116,10 +116,18 @@ export default {
     },
     predictButtonEnabled: {
       type: Boolean,
-      default: false,
+      required: false,
     },
   },
   mounted() {
+    if (this.predictButtonEnabled == null && this.taskNode){
+      getNodeData(this.procId, this.taskNode).then(resp => {
+        if (resp.data.code === '200') {
+          const data = resp.data.data[0]
+          this.predictButtonEnabled = data.handleButtons && data.handleButtons.includes("predictiveRoute")
+        }
+      })
+    }
     this.getPrintData()
     // this.getHisAudit()
     this.onTrack()
@@ -630,7 +638,7 @@ export default {
 
         if (matchedRecords.length > 0) {
           const getTime = (record) => {
-            const timeStr = record.auditDate || record.createTime;
+            const timeStr = record.auditDate || record.startDate || record.createTime;
             return new Date(timeStr).getTime();
           };