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

package/CHANGELOG.md

@@ -1,6 +1,107 @@
 # Changelog
-## [1.0.0-beta.2](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.1...@lambo-design-mobile/workflow-approve@1.0.0-beta.2) (2024-10-10)
+## [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)
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* **workflow-approve:** 修改 TodoListCard 组件中样品单号为申请编号 ([0b6a571](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/0b6a571f0592a775343b89908c6c0e58dc473250))
+
+## [1.0.0-beta.17](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.16...@lambo-design-mobile/workflow-approve@1.0.0-beta.17) (2025-04-17)
+
+## [1.0.0-beta.16](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.15...@lambo-design-mobile/workflow-approve@1.0.0-beta.16) (2025-04-11)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 优化批量审批功能 ([95989fc](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/95989fc8652a210321251f7191786e59fbbba966))
+
+## [1.0.0-beta.15](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.14...@lambo-design-mobile/workflow-approve@1.0.0-beta.15) (2025-03-19)
+
+## [1.0.0-beta.14](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.13...@lambo-design-mobile/workflow-approve@1.0.0-beta.14) (2025-03-18)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 初始化流程历史记录的展开项 ([3e653e7](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/3e653e7cbadcfead327f731eb73ac9235bf85430))
+
+## [1.0.0-beta.13](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.12...@lambo-design-mobile/workflow-approve@1.0.0-beta.13) (2025-03-18)
+
+## [1.0.0-beta.12](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.11...@lambo-design-mobile/workflow-approve@1.0.0-beta.12) (2025-03-18)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 优化 FlowApproval 组件底部按钮逻辑 ([e351b86](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/e351b86fab17bbd634e7b4f0320520bdcef1bac1))
+
+## [1.0.0-beta.11](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.10...@lambo-design-mobile/workflow-approve@1.0.0-beta.11) (2025-03-18)
+
+## [1.0.0-beta.10](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.9...@lambo-design-mobile/workflow-approve@1.0.0-beta.10) (2025-03-18)
+
+## [1.0.0-beta.9](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.8...@lambo-design-mobile/workflow-approve@1.0.0-beta.9) (2025-03-18)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 添加审批意见折叠功能 ([52d1709](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/52d170906d24b7ffb587f95807f2e81a7debb6fe))
+
+## [1.0.0-beta.8](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.7...@lambo-design-mobile/workflow-approve@1.0.0-beta.8) (2025-03-17)
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* **workflow-approve:** 修改 getNextNodes 请求方法为 POST ([5486961](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/54869618e32ee13f26dcef21507e2309d8ac2469))
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **workflow-approve:** 修复待办列表卡片中的表单链接错误 ([0575ae8](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/0575ae81a488766cdad79f335d24fa2ecf2450da))
+
+## [1.0.0-beta.7](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.6...@lambo-design-mobile/workflow-approve@1.0.0-beta.7) (2024-12-03)
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 优化审批页面功能 ([f18679c](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/f18679c7769644df4606d0832d6ec7c558dfe189))
+
+## [1.0.0-beta.6](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.5...@lambo-design-mobile/workflow-approve@1.0.0-beta.6) (2024-11-22)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **workflow-approve:** 选择处理人时重置用户ID ([d2c880e](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/d2c880ec9a4bde5a28c7451c0d4269a4587df4e5))
+
+
+### ✨ Features | 新功能
+
+* **workflow-approve:** 动态获取组织结构类型 ([b118a59](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/b118a5917fb77377401b199d321c4bc32954b2c2))
+
+## [1.0.0-beta.5](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.4...@lambo-design-mobile/workflow-approve@1.0.0-beta.5) (2024-11-18)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **@lambo-design-mobile/workflow-approve:** 修复流程审批中执行完成的参数传递问题 ([6d1fa59](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/6d1fa590cb665c848f1159de33085476ad2daf88))
+
+## [1.0.0-beta.4](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.3...@lambo-design-mobile/workflow-approve@1.0.0-beta.4) (2024-11-11)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **@lambo-design-mobile/workflow-approve:** 修复待办列表卡片组件中的 URL错误 ([8ca75a9](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/8ca75a9278313ebc4679b9e14546066085678e81))
+
+## [1.0.0-beta.3](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.2...@lambo-design-mobile/workflow-approve@1.0.0-beta.3) (2024-11-04)
+
+## [1.0.0-beta.2](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.1...@lambo-design-mobile/workflow-approve@1.0.0-beta.2) (2024-10-10)
+
 ## 1.0.0-beta.1 (2024-10-09)
 
 

package/api.js

@@ -52,9 +52,11 @@ export const getProcessTodoList = (offset, limit, searchForm = {}) => {
     const params = {
         offset: offset,
         limit: limit,
+        client: 'app',
         detailName: searchForm.detailName || '',
         applyId: searchForm.applyId || '',
-        startDate: searchForm.startDate || '',
+        startDateBegin: searchForm.startDateBegin || '',
+        startDateEnd: searchForm.startDateEnd || '',
         procName: searchForm.procName || '',
         taskName: searchForm.taskName || '',
         procType: searchForm.procType || '',
@@ -72,9 +74,11 @@ export const getProcessDoneList = (offset, limit, searchForm = {}) => {
     const params = {
         offset: offset,
         limit: limit,
+        client: 'app',
         detailName: searchForm.detailName || '',
         applyId: searchForm.applyId || '',
-        startDate: searchForm.startDate || '',
+        startDateBegin: searchForm.startDateBegin || '',
+        startDateEnd: searchForm.startDateEnd || '',
         procName: searchForm.procName || '',
         taskName: searchForm.taskName || '',
         procType: searchForm.procType || '',
@@ -165,7 +169,7 @@ export const getNextNodes = (procId, taskNode) => {
     };
     return ajax.request({
         url: config.smartFlowServerContext + "/manage/processTodo/getNextNodes",
-        method: 'get',
+        method: 'post',
         params: params,
     })
 }
@@ -243,14 +247,25 @@ export const batchApproval = (status, flowIds, auditOpinion) => {
     }));
 }
 
+export const getProcessType = (proType) => {
+    const params = {
+        proType: proType,
+    };
+    return ajax.request({
+        url: config.smartFlowServerContext + "/manage/processType/lists",
+        method: 'get',
+        params: params
+    })
+}
+
 export const getUserList = (offset, limit, searchForm = {}) => {
 
     // 处理 searchForm 的各个字段，确保即使未传值也有默认空字符串
     const params = {
         offset: offset,
         limit: limit,
-        orgTreeType: "00",
-        permScopeList: "all",
+        orgTreeType: searchForm.orgTreeType || '00',
+        permScopeList: searchForm.permScopeList || 'all',
         userId: searchForm.userId || '',
         userName: searchForm.userName || '',
         organId: searchForm.organId || '',
@@ -274,4 +289,45 @@ export const getOrgRootTree = () => {
         method: 'get',
         params: params,
     });
-}
+}
+
+export const getOrgSubNodes = (organCode) => {
+    const params = {
+        treeTypeId: "00",
+        organCode: organCode,
+    };
+    return ajax.request({
+        url: config.upmsServerContext + "/manage/ucOrgan/getOrgSubNodes",
+        method: 'get',
+        params: params,
+    });
+}
+
+export const getPosition = (positionId) => {
+    const params = {
+        positionId: positionId,
+    };
+    return ajax.request({
+        url: config.smartFlowServerContext + "/manage/position/get",
+        method: 'get',
+        params: params
+    })
+}
+
+export const getRole = (roleId) => {
+    return ajax.request({
+        url: config.upmsServerContext + "/manage/role/get/" + roleId,
+        method: 'get',
+    })
+}
+
+export const getOrgan = (organId) => {
+    const data = {
+        orgTreeType: "00",
+    };
+    return ajax.request({
+        url: config.upmsServerContext + "/manage/org/get/" + organId,
+        method: 'post',
+        data
+    })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.20",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -13,9 +13,9 @@
     "bpmn-js": "^7.3.1"
   },
   "devDependencies": {
+    "@lambo-design-mobile/upload-file": "^1.0.0-beta.14",
     "@lambo-design-mobile/lambo-scan-code": "^1.0.0-beta.1",
-    "@lambo-design-mobile/upload-file": "^1.0.0-beta.9",
-    "@lambo-design-mobile/shared": "^1.0.0-beta.8"
+    "@lambo-design-mobile/shared": "^1.0.0-beta.18"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/ApprovalNodeCell.vue

@@ -0,0 +1,115 @@
+<template>
+  <van-cell center>
+    <template v-slot:icon>
+      <div
+          v-if="['通过','流程发起','跳转指定节点'].includes(getAuditStatus(item.auditResult).text)"
+          class="completed-icon">
+        <van-icon class="iconfont" class-prefix='icon' :name=getAuditStatus(item.auditResult).icon
+                  size="28px" color="#fff"/>
+      </div>
+      <div v-else class="pending-icon">
+        <van-icon class="iconfont" class-prefix='icon' :name=getAuditStatus(item.auditResult).icon
+                  size="28px" color="#fff"/>
+      </div>
+    </template>
+    <template v-slot:title>
+      <div :style="{ color: getAuditStatus(item.auditResult).color }"
+           style="font-size: 16px;font-weight: bold;padding:5px 0;">
+        {{ Array.isArray(item.auditName) ? item.auditName[0] : item.auditName }}
+      </div>
+      <div>
+        <div v-if="foldingApprovalComments">
+          <span v-if="item.auditComment" @click="showAuditDetail(item.auditComment)">
+            审批意见 <van-icon name="comment-circle-o"/>
+          </span>
+        </div>
+        <div v-else >
+          <div v-if="item.auditComment">
+            意见: {{ item.auditComment }}
+          </div>
+        </div>
+      </div>
+    </template>
+    <template v-slot:label>
+      <div>{{ item.auditDate || item.createTime }}</div>
+    </template>
+    <template v-slot:default>
+                        <span :style="{ color: getAuditStatus(item.auditResult).color }">{{
+                            getAuditStatus(item.auditResult).text
+                          }}</span>
+    </template>
+  </van-cell>
+</template>
+
+<script>
+import {Dialog} from "vant";
+import {getAuditStatus} from "./js/global";
+
+export default {
+  name: "ApprovalNodeCell",
+  props: {
+    nodeDetail: {
+      type: Object,
+      required: true
+    },
+    foldingApprovalComments: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      item: this.nodeDetail
+    }
+  },
+  methods: {
+    getAuditStatus,
+    showAuditDetail(auditComment) {
+      Dialog.alert({
+        title: '审批意见',
+        message: auditComment,
+      }).then(() => {
+        // on close
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+.completed-icon {
+  width: 50px;
+  height: 50px;
+  background-clip: padding-box; /* 使背景不填充边框 */
+
+  border-radius: 50%;
+  margin-right: 1rem;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background: linear-gradient(90deg, #0096FF, #1677FF);
+  border: 0.3rem solid rgb(229, 244, 255); /* 半透明边框，颜色和背景色相同 */
+}
+
+.pending-icon {
+  width: 50px;
+  height: 50px;
+  background-clip: padding-box; /* 使背景不填充边框 */
+
+  border-radius: 50%;
+  margin-right: 1rem;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  background: linear-gradient(90deg, #FF7E00, #FFA200);
+  border: 0.4rem solid rgb(255, 245, 229); /* 半透明边框，颜色和背景色相同 */
+}
+
+::v-deep .van-cell__value {
+  flex: 0 auto;
+}
+</style>