@lambo-design-mobile/workflow-approve 1.0.0-beta.25 → 1.0.0-beta.27

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 # Changelog
+## [1.0.0-beta.27](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.26...@lambo-design-mobile/workflow-approve@1.0.0-beta.27) (2026-06-08)
+
+
+### ✨ Features | 新功能
+
+* **审批组件:** 调整默认审批意见 ([665c68b](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/665c68b120ac122e801ab69bd1fd7aea6b58bb99))
+* **审批组件:** 增加允许驳回至转办人功能 ([064d884](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/064d8840510094c42d499e8f8e322df6b9519081))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.25",
+  "version": "1.0.0-beta.27",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -14,9 +14,9 @@
   },
   "devDependencies": {
     "standard-version": "^9.5.0",
+    "@lambo-design-mobile/shared": "^1.0.0-beta.21",
     "@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/upload-file": "^1.0.0-beta.18"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/FlowApproval.vue

@@ -285,11 +285,18 @@
               <van-radio :name='index'/>
             </div>
           </div>
+          <div v-if="showRejectOption" class="reject-attribute">
+            <div :style="{ width: rejectAttributeTitleWidth }">驳回给：</div>
+            <van-radio-group v-model="rejectToTakeOver">
+              <van-radio name="original">原办理人</van-radio>
+              <van-radio name="actual">实际办理人</van-radio>
+            </van-radio-group>
+          </div>
           <div v-if="showRejectToSelected" class="table-row">
-            <van-field @click="handleSelectRejectUser" label="选择驳回人员" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
+            <van-field @click="handleSelectRejectUser" label="选择驳回人员：" :label-width="rejectAttributeTitleWidth" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
           </div>
           <div v-if="showProcessControl" class="reject-attribute">
-            <div>驳回的节点通过后：</div>
+            <div :style="{ width: rejectAttributeTitleWidth }">驳回的节点通过后：</div>
             <van-radio-group v-model="rejectAttribute">
               <van-radio v-for="(item, index) in rejectAttributeList" :key="index" :name="item.type">{{ item.name }}</van-radio>
             </van-radio-group>
@@ -300,13 +307,20 @@
     <van-dialog v-model="rejectAttributesBoxShow" @confirm="processRejectNode()" @close="rejectAttributesDialogShowClose()"
                 title="驳回设置" show-cancel-button>
       <div v-if="showProcessControl" class="reject-attribute">
-        <div>驳回的节点通过后：</div>
+        <div :style="{ width: rejectAttributeTitleWidth }">驳回的节点通过后：</div>
         <van-radio-group v-model="rejectAttribute">
           <van-radio v-for="(item, index) in rejectAttributeList" :key="index" :name="item.type">{{ item.name }}</van-radio>
         </van-radio-group>
       </div>
+      <div v-if="showRejectOption" class="reject-attribute">
+        <div :style="{ width: rejectAttributeTitleWidth }">驳回给：</div>
+        <van-radio-group v-model="rejectToTakeOver">
+          <van-radio name="original">原办理人</van-radio>
+          <van-radio name="actual">实际办理人</van-radio>
+        </van-radio-group>
+      </div>
       <div v-if="showRejectToSelected" class="reject-attribute">
-        <van-field @click="handleSelectRejectUser" label="选择驳回人员" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
+        <van-field @click="handleSelectRejectUser" label="选择驳回人员：" :label-width="rejectAttributeTitleWidth" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
       </div>
     </van-dialog>
     <van-popup v-if="selectRejectUserPopupShow" v-model="selectRejectUserPopupShow" closeable round position="bottom"
@@ -355,6 +369,18 @@ export default {
     config() {
       return config
     },
+    rejectAttributeTitleWidth(){
+      if (this.showProcessControl) {
+        return '145px';
+      }
+      if (this.showRejectToSelected) {
+        return '100px';
+      }
+      if (this.showRejectOption) {
+        return '75px';
+      }
+      return 'auto';
+    },
     showAuditOpinion(){
       return this.handleButtons && (this.handleButtons.includes('auditOpinion') ||  this.handleButtons.includes('appointHandler') ||  this.handleButtons.includes('attachmentFile'))
     },
@@ -575,7 +601,12 @@ export default {
     foldingApprovalComments: {
       type: Boolean,
       default: false
-    }
+    },
+    //默认是否驳回给转办人
+    defaultRejectToTakeOver: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -677,8 +708,10 @@ export default {
       },
       showRejectToSelected: false,
       showProcessControl: false,
+      showRejectOption: false,
       rejectAttributesBoxShow: false,
       rejectAttribute: 'inSequence',
+      rejectToTakeOver: this.defaultRejectToTakeOver ? 'actual' : 'original',
       rejectAttributeList: [],
       taskAuditUserList: [],
       rejectUserList: [],
@@ -761,7 +794,7 @@ export default {
           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.passName = data.handleName === '审批' ? '通过' : data.handleName;
           this.rejectName = data.rejectName;
           if (data.hasOwnProperty('isSequential')) {
             this.curNodeType = data.isSequential ? NodeType.SequentialMultiNode : NodeType.MultiNode;
@@ -1129,7 +1162,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 +1298,8 @@ export default {
               self.showRejectToSelected = result.data.length === 1 && result.data[0].handleButtons?.includes('rejectToSelected')
               self.nodeList = Array.isArray(result.data) ? result.data : []
               self.radio = 0
-              if (self.showRejectToSelected && !self.handleButtons?.includes('rejectProcessControl')) {
+              self.showRejectOption = Array.isArray(result.data) && result.data.some(item => item.taskTakedOver && (item.taskTakedOver === true || item.taskTakedOver === 'true'))
+              if ((self.showRejectToSelected || self.showRejectOption) && !self.handleButtons?.includes('rejectProcessControl')) {
                 self.rejectAttributesBoxShow = true
               } else {
                 self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.auditRequest(self.auditParams)
@@ -1306,7 +1340,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 && self.nodeList.length > 0) {
+            if ((self.showRejectToSelected && self.nodeList.length > 0) || self.showRejectOption) {
               self.rejectAttributesBoxShow = true
               return
             }
@@ -1381,6 +1415,7 @@ export default {
       if (self.rejectUsers.id !== 'all'){
         auditParams.rejectUsers = self.rejectUsers.id
       }
+      auditParams.rejectToTakeOver = self.rejectToTakeOver && self.rejectToTakeOver != 'original'
       self.showToastLoading('处理审批中');
       //确认执行审批逻辑
       audit(auditParams).then((resp) => {  // 使用箭头函数
@@ -1463,6 +1498,8 @@ export default {
       this.targetTaskNodeProcessControl = currentRow.processControl
       this.rejectUsers = { name: '全部办理人', id: 'all' }
       this.showRejectToSelected = currentRow.rejectToSelected
+      this.rejectToTakeOver = this.defaultRejectToTakeOver ? 'actual' : 'original'
+      this.showRejectOption = currentRow.taskTakedOver && (currentRow.taskTakedOver === true || currentRow.taskTakedOver === 'true')
     },
     processJumpSpecifiedNode() {
       const self = this;
@@ -1511,6 +1548,8 @@ export default {
     rejectAttributesDialogShowClose(){
       //重置
       this.showRejectToSelected = false
+      this.showRejectOption = false
+      this.rejectToTakeOver = this.defaultRejectToTakeOver ? 'actual' : 'original'
       this.showProcessControl = false
       this.rejectAttributesBoxShow = false
       this.auditResult = '';
@@ -1657,6 +1696,11 @@ export default {
         self.getProcessAttributes(val)
       }
     },
+    selectReductionUserPopupShow(newVal) {
+      if (newVal) {
+        this.reductionUsers = [];
+      }
+    }
   }
 
 };
@@ -1815,6 +1859,7 @@ export default {
   display: flex;
   border-bottom: 1px solid #ebedf0;
   font-size: 14px;
+  padding-left: 5px;
 }
 
 .table-header > div,

package/src/WorkflowDiagram.vue

@@ -638,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();
           };