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

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 # Changelog
+## [1.0.0-beta.28](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.27...@lambo-design-mobile/workflow-approve@1.0.0-beta.28) (2026-06-30)
+
+
+### ✨ Features | 新功能
+
+* **审批组件:** 待办列表增加转办按钮 ([b065d49](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/b065d492c7dbef054dff327d803f179a9b9421d6))
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.26",
+  "version": "1.0.0-beta.28",
   "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/shared": "^1.0.0-beta.21",
-    "@lambo-design-mobile/upload-file": "^1.0.0-beta.16"
+    "@lambo-design-mobile/shared": "^1.0.0-beta.22",
+    "@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;
@@ -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 = '';
@@ -1820,6 +1859,7 @@ export default {
   display: flex;
   border-bottom: 1px solid #ebedf0;
   font-size: 14px;
+  padding-left: 5px;
 }
 
 .table-header > div,

package/src/FlowBaseList.vue

@@ -45,13 +45,14 @@
                 :finished="finished"
                 finished-text="没有更多了"
                 @load="handleLoad">
-        <TodoListCard ref="todoListCard" :selected-task="selectedTask" :todo-list="listData.rows" :result.sync="checkResult"
-                      :business-approval-router-name="businessApprovalRouterName"
-                      :business-details-router-name="businessDetailsRouterName"
-                      :process-approval-router-name="processApprovalRouterName"
-                      :process-details-router-name="processDetailsRouterName"/>
-      </van-list>
-    </div>
+        <TodoListCard ref="todoListCard" :selected-task="selectedTask" :todo-list="listData.rows" :result.sync="checkResult"
+                      :business-approval-router-name="businessApprovalRouterName"
+                      :business-details-router-name="businessDetailsRouterName"
+                      :process-approval-router-name="processApprovalRouterName"
+                      :process-details-router-name="processDetailsRouterName"
+                      @refresh="resetAndLoadList"/>
+      </van-list>
+    </div>
     <div v-if="checkResult.length > 0" class="custom-bottom-bar">
       <div class="bar-item">
         <van-checkbox v-model="batchSelectChecked" @change="batchSelect" style="justify-content: center;"

package/src/SelectHandle.vue

@@ -143,16 +143,17 @@ export default {
         this.userRangeList = this.userList.map(item => { return{...item, organName: item.organName || item.deptName} })
         this.personList.rows = this.userRangeList
         this.personList.total = this.userRangeList.length
+        this.finished = true;
         return
-      }
-      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.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,
@@ -184,43 +185,43 @@ export default {
         })
       }
     },
-    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
-      }
+    handleLoad() {
+      if (this.loading || this.finished) {
+        return
+      }
+      console.log("触发加载")
+      this.loading = true;
+      if (this.useUserTransferRange){
+        this.personList.rows = this.searchForm.userName ? this.userRangeList.filter(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 中
-          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;
-      });
+      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) {
@@ -254,13 +255,13 @@ export default {
     resetSearch() {
       this.initSearch()
     },
-    resetAndLoadPersonList() {
-      this.personList.total = 0;
-      this.personList.rows = [];
-      this.finished = false;
-      this.loading = false;
-      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/TodoListCard.vue

@@ -36,6 +36,9 @@
         <van-cell v-if="selectedTask === 'pending'" :key="selectedTask" title=" ">
           <template #right-icon>
             <div class="button-group">
+              <van-button class="button" size="small" plain type="info" @click="derive(item)">
+                转办
+              </van-button>
               <van-button class="button" size="small" plain type="info" @click="handleItem(item)">
                 {{ item.handleName || (item.handleType === '20' ? '审批' : '办理') }}
               </van-button>
@@ -44,14 +47,22 @@
         </van-cell>
       </van-cell-group>
     </van-checkbox-group>
+    <van-popup v-if="selectUserPopupShow" v-model="selectUserPopupShow" closeable round position="bottom" :style="{ height: '80%' }">
+      <div class="select-user-popup-body">
+        <select-handle title="指定办理人" :procType="selectUserPopupParams.procType" :organ-tree-type="selectUserPopupParams.organTreeType"
+                       :org-list="selectUserPopupParams.orgList" :user-list="selectUserPopupParams.userList" @selectHandle="handleSelectResult"></select-handle>
+      </div>
+    </van-popup>
   </div>
 </template>
 <script>
-import {getNodeData} from "../api";
-import {Notify} from "vant";
+import {getNodeData, audit, getTransferRange} from "../api";
+import {Notify, Toast} from "vant";
+import SelectHandle from "./SelectHandle.vue";
 
 export default {
   name: 'TodoListCard',
+  components: {SelectHandle},
   props: {
     todoList: {},
     selectedTask: {
@@ -85,6 +96,19 @@ export default {
       localTodoList: this.todoList,
       detailsVisible: {}, // 用于跟踪每个项目的详细内容是否可见
       localResult: this.result,  // 使用 localResult 来绑定 van-checkbox-group
+      selectUserPopupShow: false,  // 转办弹框
+      selectUserPopupParams: {
+        procType: '',
+        class: '',
+        userList: [],
+        orgList: [],
+        organTreeType: '',
+        procId: '',
+        taskNode: '',
+        applyId: '',
+        taskId: '',
+        instanceId: '',
+      },
     }
   },
   watch: {
@@ -182,10 +206,124 @@ export default {
     toggleDetails(index) {
       this.$set(this.detailsVisible, index, !this.detailsVisible[index]);
     },
+    // 转办
+    async derive(item) {
+      this.resetTransferPopupData();
+      this.selectUserPopupParams.procType = item.procType
+      this.selectUserPopupParams.procId = item.procId
+      this.selectUserPopupParams.taskNode = item.taskNode
+      this.selectUserPopupParams.applyId = item.applyId
+      this.selectUserPopupParams.taskId = item.taskId
+      this.selectUserPopupParams.instanceId = item.procInstanceId || item.instanceId
+      const success = await this.fetchTransferRange();
+      if (success) {
+        this.selectUserPopupShow = true;
+      }
+    },
+    resetTransferPopupData() {
+      this.selectUserPopupParams = {
+        procType: '',
+        class: '',
+        userList: [],
+        orgList: [],
+        organTreeType: '',
+        procId: '',
+        taskNode: '',
+        applyId: '',
+        taskId: '',
+        instanceId: '',
+      };
+    },
+    async fetchTransferRange() {
+      try {
+        const params = {
+          procType: this.selectUserPopupParams.procType,
+          procId: this.selectUserPopupParams.procId,
+          taskNode: this.selectUserPopupParams.taskNode,
+          applyId: this.selectUserPopupParams.applyId,
+          taskId: this.selectUserPopupParams.taskId,
+          instanceId: this.selectUserPopupParams.instanceId,
+          actionType: 'auditTo82',
+        };
+        const res = await getTransferRange(params);
+        const result = res.data;
+        if (result.code == 200) {
+          this.selectUserPopupParams.organTreeType = result.data.organTreeType;
+          this.selectUserPopupParams.userList = result.data.userList;
+          this.selectUserPopupParams.orgList = result.data.orgList;
+          return true;
+        } else {
+          console.warn('获取选择人员范围失败，返回码:', result.code);
+          return false;
+        }
+      } catch (err) {
+        console.error('获取选择人员范围异常', err);
+        return false;
+      }
+    },
+    handleSelectResult(checkResult) {
+      const self = this
+      console.log('Selected result:', checkResult);
+      let auditParams = {
+        procId: self.selectUserPopupParams.procId,
+        applyId: self.selectUserPopupParams.applyId,
+        taskId: self.selectUserPopupParams.taskId,
+        auditResult: '82',
+        selectedUserId: checkResult[0].userId,
+      }
+      self.auditRequest(auditParams);
+      self.selectUserPopupShow = false;
+    },
+    auditRequest(auditParams) {
+      let self = this
+      Toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true,
+        message: '处理中',
+      })
+      //确认执行审批逻辑
+      audit(auditParams).then((resp) => {  // 使用箭头函数
+        let result = resp.data
+        if (result.code === '200') {
+          Toast.success(result.message);
+        } else {
+          Toast.fail(result.message);
+        }
+        this.selectUserPopupShow = false;
+        this.$emit('refresh');
+      })
+    },
   }
 }
 </script>
 <style scoped>
+.select-user-popup-body {
+  height: 100%;
+  overflow: hidden;
+}
+
+::v-deep .select-user-popup-body > * {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  min-height: 0;
+}
+
+::v-deep .select-user-popup-body #headTitle {
+  flex: 0 0 auto;
+}
+
+::v-deep .select-user-popup-body #listContent {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+::v-deep .select-user-popup-body .custom-bottom-bar {
+  position: relative;
+  flex-shrink: 0;
+}
 
 .button-group {
   display: flex;