@lambo-design-mobile/workflow-approve 1.0.0-beta.4 → 1.0.0-beta.6

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 # Changelog
+## [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)
 
 

package/api.js

@@ -260,7 +260,7 @@ export const getUserList = (offset, limit, searchForm = {}) => {
     const params = {
         offset: offset,
         limit: limit,
-        orgTreeType: "00",
+        orgTreeType: searchForm.orgTreeType || '00',
         permScopeList: searchForm.permScopeList || 'all',
         userId: searchForm.userId || '',
         userName: searchForm.userName || '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design-mobile/workflow-approve",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "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.9",
     "@lambo-design-mobile/lambo-scan-code": "^1.0.0-beta.1",
-    "@lambo-design-mobile/shared": "^1.0.0-beta.12"
+    "@lambo-design-mobile/shared": "^1.0.0-beta.12",
+    "@lambo-design-mobile/upload-file": "^1.0.0-beta.9"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/FlowApproval.vue

@@ -24,12 +24,14 @@
                 />
                 <div v-if="approvalForm.nextNode!==''">
                   <van-cell title="下一环节" :value="approvalForm.nextNode"/>
-                  <van-cell @click="nextNodePopupShow = true" title="办理人员" value-class="approvalForm-value"
-                            :value="approvalForm.handlingPersonnel">
-                    <template #right-icon>
-                      <van-icon name="friends-o" size="16" style="line-height: inherit;padding-left: 5px"/>
-                    </template>
-                  </van-cell>
+                  <div v-if="handleButtons.includes('appointHandler')">
+                    <van-cell @click="nextNodePopupShow = true" title="办理人员" value-class="approvalForm-value"
+                              :value="approvalForm.handlingPersonnel">
+                      <template #right-icon>
+                        <van-icon name="friends-o" size="16" style="line-height: inherit;padding-left: 5px"/>
+                      </template>
+                    </van-cell>
+                  </div>
                   <div class="van-hairline--bottom"></div>
                 </div>
                 <div v-else>
@@ -237,17 +239,17 @@
               </div>
             </template>
           </van-cell>
+          <van-field
+              readonly
+              clickable
+              input-align="right"
+              name="picker"
+              :value="(handleTypeList.find(handleType => handleType.value === item.processing) || {}).label"
+              label="处理方式"
+              placeholder="点击选择处理方式"
+              @click="$set(showPicker, index, true)"
+          />
         </div>
-        <van-field
-            readonly
-            clickable
-            input-align="right"
-            name="picker"
-            :value="(handleTypeList.find(handleType => handleType.value === item.processing) || {}).label"
-            label="处理方式"
-            placeholder="点击选择处理方式"
-            @click="$set(showPicker, index, true)"
-        />
         <van-popup v-model="showPicker[index]" position="bottom">
           <van-picker
               show-toolbar
@@ -364,7 +366,11 @@ export default {
     processTraceRouterName: {
       type: String,
       required: true,
-    }
+    },
+    activeFirstTab: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -461,7 +467,7 @@ export default {
           this.nextNodeProcessedData = this.processData(result.data);
           this.approvalForm.nextNode = result.data.map(node => node.name).join(',');
           this.approvalForm.handlingPersonnel = result.data
-              .map(node => node.assignee?.name || '未指定')
+              .map(node => node.assignee?.name || '候选人')
               .join(',');
         }
       })
@@ -621,7 +627,7 @@ export default {
         }, {});
         this.approvalForm.nodeConfigMaps = JSON.stringify(params)
         this.approvalForm.handlingPersonnel = this.nextNodeProcessedData
-            .map(node => node.assignee?.name || '未指定')
+            .map(node => node.personType === "assignee" ?  node.assignee?.name : '候选人')
             .join(',');
         this.nextNodePopupShow = false;
       } else {
@@ -846,7 +852,7 @@ export default {
               this.executionCompleted(true, result.data.processInstanceId, taskIds, auditResult, self.taskId);
             }
           } else {
-            this.executionCompleted(true, null, null);
+            this.executionCompleted(true, null, null, auditResult, self.taskId);
           }
           Toast.success(result.message);
         } else if (result.code === '20002') {
@@ -983,12 +989,16 @@ export default {
     },
   },
   activated() {
-    this.updateActiveTab();
+    if (!this.activeFirstTab) {
+      this.updateActiveTab();
+    }
   },
   mounted() {
     this.initData()
     // 默认选中最后一个tab页
-    this.updateActiveTab();
+    if (!this.activeFirstTab) {
+      this.updateActiveTab();
+    }
   }
 
 };

package/src/SelectHandle.vue

@@ -98,6 +98,7 @@ export default {
       searchFilterBadge: false,
       searchForm: {
         userId: '',
+        orgTreeType: '',
         userName: '',
         permScopeList: '',
         organId: '',
@@ -125,6 +126,7 @@ export default {
         if (result.code === 1) {
           this.searchForm.organId = result.data[0].organId;
           this.searchForm.organTitle = result.data[0].organName;
+          this.searchForm.userId = '';
         }
         this.handleLoad()
       })
@@ -136,8 +138,8 @@ export default {
 
       getProcessType(this.procType).then(res => {
 
+        this.searchForm.orgTreeType = res.data.data.rows[0].organTreeType;
         const userArray = this.extractUsers(res.data.data.rows[0].permScope);
-        console.log(userArray)
         if (userArray.length > 0) {
           this.searchForm.permScopeList = userArray.join(',')
         }