@lambo-design-mobile/workflow-approve 1.0.0-beta.20 → 1.0.0-beta.22

package/CHANGELOG.md

@@ -1,11 +1,25 @@
 # Changelog
-## [1.0.0-beta.20](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.19...@lambo-design-mobile/workflow-approve@1.0.0-beta.20) (2025-08-21)
+## [1.0.0-beta.22](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.21...@lambo-design-mobile/workflow-approve@1.0.0-beta.22) (2026-01-29)
 
 
 ### ✨ Features | 新功能
 
-* **workflow-approve:** 发起时间支持范围筛选 ([831f12d](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/831f12dae1b9ecdb7bab2ba666a568183a747ae2))
+* **审批组件:** 功能增加和调整 ([7dff512](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/7dff5124e43a3a7bb9145d4ed518a3507e2603f4))
 
+## [1.0.0-beta.21](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.20...@lambo-design-mobile/workflow-approve@1.0.0-beta.21) (2025-10-15)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **odoListCard:** 更新TodoListCard字段排序&按钮展示逻辑增强 ([1fe525e](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/1fe525e4bec424fe95f4f69e4893a455ce1f7a00))
+
+## [1.0.0-beta.20](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.19...@lambo-design-mobile/workflow-approve@1.0.0-beta.20) (2025-08-21)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 发起时间支持范围筛选 ([831f12d](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/831f12dae1b9ecdb7bab2ba666a568183a747ae2))
+
 ## [1.0.0-beta.19](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.18...@lambo-design-mobile/workflow-approve@1.0.0-beta.19) (2025-05-14)
 
 ## [1.0.0-beta.18](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.17...@lambo-design-mobile/workflow-approve@1.0.0-beta.18) (2025-04-25)

package/api.js

@@ -122,6 +122,19 @@ export const getProcessHis = (applyId, instanceId, procId, taskId) => {
     })
 }
 
+// 获取操作按钮
+export const getHandleButtons = (procId, taskNode) => {
+    const params = {
+        procId: procId,
+        taskNode: taskNode,
+    }
+    return ajax.request({
+        url: config.smartFlowServerContext + "/manage/approvalCenter/getNodeData",
+        method: 'post',
+        params: params,
+    })
+}
+
 
 // 获取流程图xml
 export const printData = (applyId, instanceId, procId) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-beta.22",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -13,9 +13,10 @@
     "bpmn-js": "^7.3.1"
   },
   "devDependencies": {
-    "@lambo-design-mobile/upload-file": "^1.0.0-beta.14",
+    "standard-version": "^9.5.0",
     "@lambo-design-mobile/lambo-scan-code": "^1.0.0-beta.1",
-    "@lambo-design-mobile/shared": "^1.0.0-beta.18"
+    "@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/ApprovalNodeCell.vue

@@ -17,6 +17,11 @@
            style="font-size: 16px;font-weight: bold;padding:5px 0;">
         {{ Array.isArray(item.auditName) ? item.auditName[0] : item.auditName }}
       </div>
+      <div class="organ-detail">
+          <span>
+             部门: {{ Array.isArray(item.auditOrganName) ? item.auditOrganName[0] : item.auditOrganName }}
+          </span>
+      </div>
       <div>
         <div v-if="foldingApprovalComments">
           <span v-if="item.auditComment" @click="showAuditDetail(item.auditComment)">
@@ -109,6 +114,12 @@ export default {
   border: 0.4rem solid rgb(255, 245, 229); /* 半透明边框，颜色和背景色相同 */
 }
 
+.organ-detail {
+  font-size: small;
+  color: grey;
+  margin-bottom: 2px
+}
+
 ::v-deep .van-cell__value {
   flex: 0 auto;
 }

package/src/FlowApproval.vue

@@ -7,7 +7,7 @@
       <slot name="business-content"/>
       <van-tab title="流程信息">
         <div style="padding: 0 10px">
-          <div v-if="!isDetail">
+          <div v-if="!isDetail && showAuditOpinion">
             <div class="title-info">
               <van-icon class="info-icon" style="background-color: #0d88ff" name="cluster-o"/>
               审批信息
@@ -15,6 +15,7 @@
             <div class="approvalForm-section">
               <van-cell-group>
                 <van-field
+                    v-if="handleButtons && handleButtons.includes('auditOpinion')"
                     v-model="approvalForm.auditOpinion"
                     rows="3"
                     autosize
@@ -29,7 +30,7 @@
                 />
                 <div v-if="approvalForm.nextNode!==''">
                   <van-cell title="下一环节" :value="approvalForm.nextNode"/>
-                  <div v-if="handleButtons.includes('appointHandler')">
+                  <div v-if="handleButtons && handleButtons.includes('appointHandler')">
                     <van-cell @click="nextNodePopupShow = true" title="办理人员" value-class="approvalForm-value"
                               :value="approvalForm.handlingPersonnel">
                       <template #right-icon>
@@ -39,7 +40,7 @@
                   </div>
                   <div class="van-hairline--bottom"></div>
                 </div>
-                <div v-if="handleButtons.includes('attachmentFile')">
+                <div v-if="handleButtons && handleButtons.includes('attachmentFile')">
                   <upload-file :multiple="true"
                                :oss-server-context="config.smartFlowServerContext"
                                :oss-file-put-url="config.ossFilePutUrl"
@@ -69,7 +70,7 @@
               </van-collapse>
             </div>
           </div>
-          <div v-if="handleButtons.includes('attachmentFile')">
+          <div v-if="handleButtons && handleButtons.includes('attachmentFile')">
             <div class="title-info">
               <van-icon class="info-icon" style="background-color: #029ea0" name="link-o"/>
               查看附件
@@ -114,23 +115,23 @@
     <!-- 底部按钮 等其他内容 -->
     <div>
       <van-popup v-model="popupShow" style="padding-top: 40px" closeable round position="bottom">
-        <div v-if="handleButtons.includes('auditTo70')" class="popup-option" @click="audit('70')">
+        <div v-if="handleButtons && handleButtons.includes('auditTo70')" class="popup-option" @click="audit('70')">
           {{ getAuditButtonStatus(70) }}
         </div>
-        <div v-if="handleButtons.includes('auditTo40')" class="popup-option highlighted"
+        <div v-if="handleButtons && handleButtons.includes('auditTo40')" class="popup-option highlighted"
              @click="audit('40')">
           {{ getAuditButtonStatus(40) }}
         </div>
-        <div v-if="handleButtons.includes('auditTo90')" class="popup-option" @click="audit('90')">
+        <div v-if="handleButtons && handleButtons.includes('auditTo90')" class="popup-option" @click="audit('90')">
           {{ getAuditButtonStatus(90) }}
         </div>
-        <div v-if="handleButtons.includes('auditTo80')" class="popup-option" @click="audit('80')">
+        <div v-if="handleButtons && handleButtons.includes('auditTo80')" class="popup-option" @click="audit('80')">
           {{ getAuditButtonStatus(80) }}
         </div>
-        <div v-if="handleButtons.includes('auditTo82')" class="popup-option" @click="audit('82')">
+        <div v-if="handleButtons && handleButtons.includes('auditTo82')" class="popup-option" @click="audit('82')">
           {{ getAuditButtonStatus(82) }}
         </div>
-        <div v-if="handleButtons.includes('auditTo50')" class="popup-option" @click="audit('50')">
+        <div v-if="handleButtons && handleButtons.includes('auditTo50')" class="popup-option" @click="audit('50')">
           {{ getAuditButtonStatus(50) }}
         </div>
       </van-popup>
@@ -181,7 +182,7 @@
                      :value="(item.candidateGroups?.organs ?? []).map(organ => organ.name).join(',')">
           </van-field>
         </div>
-        <div v-if="handleButtons.includes('appointTimeoutTime')">
+        <div v-if="handleButtons && handleButtons.includes('appointTimeoutTime')">
           <van-cell center title="停留时间">
             <template #default>
               <div style="display: flex; align-items: center;">
@@ -296,6 +297,7 @@ import {
   getNodesBehind,
   getPosition,
   getPreNode,
+  getHandleButtons,
   getProcessHis,
   getProcessType, getRole
 } from "../api";
@@ -314,6 +316,9 @@ export default {
   computed: {
     config() {
       return config
+    },
+    showAuditOpinion(){
+      return this.handleButtons && (this.handleButtons.includes('auditOpinion') ||  this.handleButtons.includes('appointHandler') ||  this.handleButtons.includes('attachmentFile'))
     }
   },
   components: {ApprovalNodeCell, SelectNormalList, SelectOrganize, Tree, SelectHandle, UploadFile},
@@ -429,6 +434,9 @@ export default {
   methods: {
     getAuditStatus,
     initData() {
+      if (!this.handleButtons){
+        this.getHandleButtons();
+      }
       this.getProcessHistory();
       this.getNextNodes();
       this.getAttachmentList();
@@ -440,14 +448,14 @@ export default {
     // 计算有多少个可见的handleButtons
     getVisibleButtonsCount() {
       return ['auditTo70', 'auditTo40', 'auditTo90', 'auditTo80', 'auditTo82', 'auditTo50']
-          .filter(btn => this.handleButtons.includes(btn))
+          .filter(btn => this.handleButtons && this.handleButtons.includes(btn))
           .length;
     },
 
     // 获取唯一按钮的文本
     getSingleButtonText() {
       const buttonIds = ['auditTo70', 'auditTo40', 'auditTo90', 'auditTo80', 'auditTo82', 'auditTo50'];
-      const singleButtonId = buttonIds.find(btn => this.handleButtons.includes(btn));
+      const singleButtonId = buttonIds.find(btn => this.handleButtons && this.handleButtons.includes(btn));
       if (singleButtonId) {
         const statusId = parseInt(singleButtonId.replace('auditTo', ''));
         return this.getAuditButtonStatus(statusId);
@@ -458,13 +466,20 @@ export default {
     // 处理唯一按钮的点击
     handleSingleButton() {
       const buttonIds = ['auditTo70', 'auditTo40', 'auditTo90', 'auditTo80', 'auditTo82', 'auditTo50'];
-      const singleButtonId = buttonIds.find(btn => this.handleButtons.includes(btn));
+      const singleButtonId = buttonIds.find(btn => this.handleButtons && this.handleButtons.includes(btn));
       if (singleButtonId) {
         const statusId = singleButtonId.replace('auditTo', '');
         this.audit(statusId);
       }
     },
 
+    getHandleButtons() {
+      getHandleButtons(this.procId, this.taskNode).then(resp => {
+        if (resp.data.code === '200') {
+          this.handleButtons = resp.data.data[0]?.handleButtons;
+        }
+      })
+    },
     getProcessHistory() {
       getProcessHis(this.applyId, this.instanceId, this.procId, this.taskId).then(resp => {
         if (resp.data.code === '200') {
@@ -741,7 +756,7 @@ export default {
           Toast({message: '请输入审批意见', duration: '500'});
           return
         } else {
-          this.auditParams.auditOpinion = this.getAuditButtonStatus(self.auditResult);
+          this.auditParams.auditOpinion = this.getAuditButtonStatus(this.auditResult);
         }
       }
 

package/src/TodoListCard.vue

@@ -23,21 +23,21 @@
                   :arrow-direction="detailsVisible[index] ? 'down' : ''"
                   :value="item.procName"></van-cell>
         <div v-if="detailsVisible[index]">
-          <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
-                    title="当前环节"
-                    :value="item.taskName"></van-cell>
           <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false" title="申请人"
                     :value="item.applyUser ? item.applyUser.split(':')[1] : '未定义'"></van-cell>
+          <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
+                    :title="selectedTask === 'pending' ? '发起时间':'审批时间' "
+                    :value="selectedTask === 'pending' ? formatDate(item.startDate) :formatDate(item.auditDate)">
+          </van-cell>
         </div>
-        <van-cell title-class="list-title" value-class="list-value" class="custom-cell"
-                  :title="selectedTask === 'pending' ? '发起时间':'审批时间' "
-                  :value="selectedTask === 'pending' ? formatDate(item.startDate) :formatDate(item.auditDate)">
-        </van-cell>
+        <van-cell title-class="list-title" value-class="list-value" class="custom-cell" :border="false"
+                  title="当前环节"
+                  :value="item.taskName"></van-cell>
         <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="handleItem(item)">
-                {{ item.handleName || item.handleType === '20' ? '审批' : '办理' }}
+                {{ item.handleName || (item.handleType === '20' ? '审批' : '办理') }}
               </van-button>
             </div>
           </template>

package/src/WorkflowDiagram.vue

@@ -25,24 +25,49 @@
         <van-empty description="暂无审批记录"/>
       </div>
       <!--审批详情弹出框-->
-      <van-dialog v-model="showTaskNodeDetail" title="审批详情">
-        <van-cell-group>
-          <van-field readonly input-align="right" label="审批节点：" :value="nodeDetail.taskName" />
-          <van-field readonly input-align="right" label="审批人：" :value="nodeDetail.auditName" />
-          <van-field readonly input-align="right" label="申请人：" :value="nodeDetail.applyUser ? nodeDetail.applyUser.split(':')[1] : '未定义'" />
-          <van-field readonly input-align="right" :label="nodeDetail.auditDate ? '审批时间：':'发起时间：' "
-                     :value="nodeDetail.auditDate ? nodeDetail.auditDate : nodeDetail.createTime" />
+      <van-dialog
+          v-model="showTaskNodeDetail"
+          :title="nodeDetailTitle"
+          :close-on-popstate="true"
+      >
+        <!-- 当前记录内容 -->
+        <van-cell-group inset v-if="currentRecord">
+          <van-field readonly input-align="right" label="审批节点：" :value="currentRecord.taskName" />
+          <van-field readonly input-align="right" label="审批人：" :value="currentRecord.auditName" />
+          <van-field readonly input-align="right" label="申请人："
+                     :value="currentRecord.applyUser ? currentRecord.applyUser.split(':')[1] : '未定义'" />
+          <van-field readonly input-align="right"
+                     :label="currentRecord.auditDate ? '审批时间：' : '发起时间：'"
+                     :value="currentRecord.auditDate || currentRecord.createTime" />
           <van-cell title="审批结果：" class="custom-cell" :border="false">
-            <template v-slot:default>
-              <van-tag :type="getAuditStatus(nodeDetail.auditResult).type">
-                {{ getAuditStatus(nodeDetail.auditResult).text }}
+            <template #default>
+              <van-tag :type="getAuditStatus(currentRecord.auditResult).type">
+                {{ getAuditStatus(currentRecord.auditResult).text }}
               </van-tag>
             </template>
           </van-cell>
-          <van-cell v-if="nodeDetail.auditComment" class="custom-cell"
-                    :border="false" title="审批意见："
-                    :value="nodeDetail.auditComment"></van-cell>
+          <van-cell v-if="currentRecord.auditComment" class="custom-cell" :border="false"
+                    title="审批意见：" :value="currentRecord.auditComment" />
         </van-cell-group>
+
+        <!-- 包含多条审批意见时可切换展示 -->
+        <div v-show="nodeDetailsList.length > 1" class="dialog-footer-arrows">
+          <van-button
+              round
+              size="small"
+              :disabled="currentIndex <= 0"
+              @click="prevRecord"
+              icon="arrow-left"
+          />
+          <span class="record-counter">{{ currentIndex + 1 }} / {{ nodeDetailsList.length }}</span>
+          <van-button
+              round
+              size="small"
+              :disabled="currentIndex >= nodeDetailsList.length - 1"
+              @click="nextRecord"
+              icon="arrow"
+          />
+        </div>
       </van-dialog>
     </div>
   </div>
@@ -76,22 +101,32 @@ export default {
   },
   mounted() {
     this.getPrintData()
-    this.getHisAudit()
+    // this.getHisAudit()
     this.onTrack()
   },
   data() {
     return {
       showTaskNodeDetail: false,
-      nodeDetail: {},
+      nodeDetailsList: [],
+      currentIndex: 0,
       auditData: [],
     }
   },
+  computed: {
+    currentRecord() {
+      return this.nodeDetailsList[this.currentIndex];
+    },
+    nodeDetailTitle() {
+      return this.nodeDetailsList.length > 1 ? `审批详情（ ${this.currentIndex + 1}/ ${this.nodeDetailsList.length}）` : '审批详情'
+    }
+  },
   methods: {
     getAuditStatus,
     getPrintData() {
       getPrintData(this.applyId, this.procId).then(resp => {
         if (resp.data.code === '200') {
           this.tableData = resp.data.data
+          this.auditData = resp.data.data
         }
       })
     },
@@ -226,17 +261,32 @@ export default {
       const eventBus = this.bpmnViewer.get('eventBus');
       eventBus.on('element.click', (event) => {
         const elementId = event.element.id;
-        // 假设 this.tableData 包含了所有节点的详细信息
-        for (const item of this.tableData) {
-          if (item.taskNode === elementId) {
-            console.log(item);
-            this.showTaskNodeDetail = true;
-            this.nodeDetail = item;
-            break;
-          }
+        let matchedRecords = this.tableData.filter(item => item.taskNode === elementId);
+
+        if (matchedRecords.length > 0) {
+          const getTime = (record) => {
+            const timeStr = record.auditDate || record.createTime;
+            return new Date(timeStr).getTime();
+          };
+
+          matchedRecords.sort((a, b) => getTime(a) - getTime(b));
+
+          this.nodeDetailsList = matchedRecords;
+          this.currentIndex = matchedRecords.length - 1;
+          this.showTaskNodeDetail = true;
         }
       });
     },
+    prevRecord() {
+      if (this.currentIndex > 0) {
+        this.currentIndex--;
+      }
+    },
+    nextRecord() {
+      if (this.currentIndex < this.nodeDetailsList.length - 1) {
+        this.currentIndex++;
+      }
+    },
   }
 }
 </script>
@@ -320,4 +370,16 @@ export default {
   flex: 0 auto;
 }
 
+.dialog-footer-arrows {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 16px;
+}
+
+.dialog-footer-arrows .record-counter {
+  font-size: 14px;
+  color: #666;
+  margin: 0 12px;
+}
 </style>