@lambo-design-mobile/workflow-approve 1.0.0-beta.29 → 1.0.0-beta.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/api.js +11 -0
- package/package.json +1 -1
- package/src/SelectHandle.vue +39 -16
- package/src/SelectOrganize.vue +40 -16
- package/src/TodoListCard.vue +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
# Changelog
|
|
2
|
+
## [1.0.0-beta.30](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.29...@lambo-design-mobile/workflow-approve@1.0.0-beta.30) (2026-07-08)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### ✨ Features | 新功能
|
|
6
|
+
|
|
7
|
+
* **审批组件:** 待办列表转办取人规则调整 ([51a4f0a](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/commit/51a4f0ab195d8c9e899515a6b99af8a33f0704d5))
|
|
8
|
+
|
|
2
9
|
## [1.0.0-beta.29](http://git.inspur.com/ecbh/lambo-design/lambo-design/-/compare/@lambo-design-mobile/workflow-approve@1.0.0-beta.28...@lambo-design-mobile/workflow-approve@1.0.0-beta.29) (2026-06-30)
|
|
3
10
|
|
|
4
11
|
|
package/api.js
CHANGED
|
@@ -307,6 +307,17 @@ export const getOrgRootTree = (organTreeType) => {
|
|
|
307
307
|
});
|
|
308
308
|
}
|
|
309
309
|
|
|
310
|
+
export const getBizOrgRootTree = (organTreeType) => {
|
|
311
|
+
const params = {
|
|
312
|
+
bizOrganTreeType: organTreeType,
|
|
313
|
+
};
|
|
314
|
+
return ajax.request({
|
|
315
|
+
url: config.smartFlowServerContext + "/manage/bizorgan/getOrgRootTree",
|
|
316
|
+
method: 'get',
|
|
317
|
+
params: params,
|
|
318
|
+
});
|
|
319
|
+
}
|
|
320
|
+
|
|
310
321
|
export const getOrgSubNodes = (organCode) => {
|
|
311
322
|
const params = {
|
|
312
323
|
orgTreeType: "00",
|
package/package.json
CHANGED
package/src/SelectHandle.vue
CHANGED
|
@@ -64,14 +64,14 @@
|
|
|
64
64
|
</div>
|
|
65
65
|
|
|
66
66
|
<van-popup v-model="searchOrganShow" closeable round position="bottom" :style="{ height: '80%' }">
|
|
67
|
-
<select-organize :all-organize="true" :treetype-id="orgTreeType" :organize-id-list="organizeIdList" :show-check-box="false" @handleSelect="onSelect" ></select-organize>
|
|
67
|
+
<select-organize :all-organize="true" :treetype-id="orgTreeType" :org-root-with-permit="orgRootWithPermit" :organize-id-list="organizeIdList" :show-check-box="false" @handleSelect="onSelect" ></select-organize>
|
|
68
68
|
</van-popup>
|
|
69
69
|
</div>
|
|
70
70
|
</template>
|
|
71
71
|
|
|
72
72
|
<script>
|
|
73
73
|
import SelectHandleCard from "./SelectHandleCard.vue";
|
|
74
|
-
import {getOrgRootTree, getProcessType, getUserList, getTransferRange} from "../api";
|
|
74
|
+
import {getOrgRootTree, getProcessType, getUserList, getTransferRange, getBizOrgRootTree} from "../api";
|
|
75
75
|
import Tree from "./tree/Tree.vue";
|
|
76
76
|
import SelectOrganize from "./SelectOrganize.vue";
|
|
77
77
|
|
|
@@ -87,6 +87,11 @@ export default {
|
|
|
87
87
|
type: String,
|
|
88
88
|
required: true
|
|
89
89
|
},
|
|
90
|
+
// 根组织获取规则,为true表示用登录人权限范围
|
|
91
|
+
orgRootWithPermit: {
|
|
92
|
+
type: Boolean,
|
|
93
|
+
default: true
|
|
94
|
+
},
|
|
90
95
|
multiSelect: { // 新增一个 prop 来控制是否开启多选模式
|
|
91
96
|
type: Boolean,
|
|
92
97
|
default: false
|
|
@@ -166,27 +171,45 @@ export default {
|
|
|
166
171
|
getProcessType(this.procType).then(res => {
|
|
167
172
|
this.orgTreeType = res.data.data.rows[0].organTreeType;
|
|
168
173
|
const permScope = res.data.data.rows[0].permScope || 'all'
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
174
|
+
if (this.orgRootWithPermit){
|
|
175
|
+
getOrgRootTree(this.orgTreeType).then(res => {
|
|
176
|
+
const orgResult = res.data;
|
|
177
|
+
if (orgResult.code === 200) {
|
|
178
|
+
this.searchForm = {
|
|
179
|
+
...this.searchForm,
|
|
180
|
+
orgTreeType: this.orgTreeType,
|
|
181
|
+
permScopeList: permScope,
|
|
182
|
+
organId: orgResult.data[0].organId,
|
|
183
|
+
organTitle: orgResult.data[0].organName,
|
|
184
|
+
userId: ''
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
this.handleLoad()
|
|
188
|
+
})
|
|
189
|
+
} else {
|
|
190
|
+
getBizOrgRootTree(this.orgTreeType).then(res => {
|
|
191
|
+
const orgResult = res.data;
|
|
192
|
+
if (orgResult.code === 200) {
|
|
193
|
+
this.searchForm = {
|
|
194
|
+
...this.searchForm,
|
|
195
|
+
orgTreeType: this.orgTreeType,
|
|
196
|
+
permScopeList: permScope,
|
|
197
|
+
organId: orgResult.data[0].bizOrganId,
|
|
198
|
+
organTitle: orgResult.data[0].bizOrganName,
|
|
199
|
+
userId: ''
|
|
200
|
+
}
|
|
179
201
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}
|
|
202
|
+
this.handleLoad()
|
|
203
|
+
})
|
|
204
|
+
}
|
|
205
|
+
|
|
183
206
|
}).catch(error => {
|
|
184
207
|
console.error(error)
|
|
185
208
|
})
|
|
186
209
|
}
|
|
187
210
|
},
|
|
188
211
|
handleLoad() {
|
|
189
|
-
if (this.
|
|
212
|
+
if (this.finished) {
|
|
190
213
|
return
|
|
191
214
|
}
|
|
192
215
|
console.log("触发加载")
|
package/src/SelectOrganize.vue
CHANGED
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
|
|
28
28
|
<script>
|
|
29
29
|
import Tree from "./tree/Tree.vue";
|
|
30
|
-
import {getOrgan, getOrgRootTree, getOrgSubNodes} from "../api";
|
|
30
|
+
import {getOrgan, getOrgRootTree, getOrgSubNodes, getBizOrgRootTree} from "../api";
|
|
31
31
|
|
|
32
32
|
export default {
|
|
33
33
|
name: "CustomTree",
|
|
@@ -47,6 +47,11 @@ export default {
|
|
|
47
47
|
type: Array,
|
|
48
48
|
default: () => []
|
|
49
49
|
},
|
|
50
|
+
// 根组织获取规则,为true表示用登录人权限范围
|
|
51
|
+
orgRootWithPermit: {
|
|
52
|
+
type: Boolean,
|
|
53
|
+
default: true
|
|
54
|
+
},
|
|
50
55
|
treetypeId: {
|
|
51
56
|
type: String,
|
|
52
57
|
default: ''
|
|
@@ -163,21 +168,40 @@ export default {
|
|
|
163
168
|
});
|
|
164
169
|
});
|
|
165
170
|
} else {
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
171
|
+
if (this.orgRootWithPermit){
|
|
172
|
+
getOrgRootTree(this.treetypeId).then((res) => {
|
|
173
|
+
const result = res.data;
|
|
174
|
+
if (result.code === 200) {
|
|
175
|
+
this.organizeData = result.data.map((item) => {
|
|
176
|
+
return {
|
|
177
|
+
children: [],
|
|
178
|
+
title: item.organName,
|
|
179
|
+
id: item.organCode,
|
|
180
|
+
parentId: item.parentId,
|
|
181
|
+
checked: false,
|
|
182
|
+
expand: false
|
|
183
|
+
};
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
} else {
|
|
188
|
+
getBizOrgRootTree(this.treetypeId).then((res) => {
|
|
189
|
+
const result = res.data;
|
|
190
|
+
if (result.code === 200) {
|
|
191
|
+
this.organizeData = result.data.map((item) => {
|
|
192
|
+
return {
|
|
193
|
+
children: [],
|
|
194
|
+
title: item.bizOrganName,
|
|
195
|
+
id: item.bizOrganCode,
|
|
196
|
+
parentId: item.parentId,
|
|
197
|
+
checked: false,
|
|
198
|
+
expand: false
|
|
199
|
+
};
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
|
|
181
205
|
}
|
|
182
206
|
}
|
|
183
207
|
};
|
package/src/TodoListCard.vue
CHANGED
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
</van-checkbox-group>
|
|
50
50
|
<van-popup v-if="selectUserPopupShow" v-model="selectUserPopupShow" closeable round position="bottom" :style="{ height: '80%' }">
|
|
51
51
|
<div class="select-user-popup-body">
|
|
52
|
-
<select-handle title="指定办理人" :procType="selectUserPopupParams.procType" :organ-tree-type="selectUserPopupParams.organTreeType"
|
|
52
|
+
<select-handle title="指定办理人" :procType="selectUserPopupParams.procType" :organ-tree-type="selectUserPopupParams.organTreeType" :org-root-with-permit="false"
|
|
53
53
|
:org-list="selectUserPopupParams.orgList" :user-list="selectUserPopupParams.userList" @selectHandle="handleSelectResult"></select-handle>
|
|
54
54
|
</div>
|
|
55
55
|
</van-popup>
|
|
@@ -297,18 +297,18 @@ export default {
|
|
|
297
297
|
}
|
|
298
298
|
</script>
|
|
299
299
|
<style scoped>
|
|
300
|
-
.select-user-popup-body {
|
|
301
|
-
height: 100%;
|
|
302
|
-
overflow: visible;
|
|
303
|
-
}
|
|
304
|
-
|
|
305
|
-
::v-deep .select-user-popup-body > * {
|
|
306
|
-
height: 100%;
|
|
307
|
-
display: flex;
|
|
308
|
-
flex-direction: column;
|
|
309
|
-
overflow: visible;
|
|
310
|
-
min-height: 0;
|
|
311
|
-
}
|
|
300
|
+
.select-user-popup-body {
|
|
301
|
+
height: 100%;
|
|
302
|
+
overflow: visible;
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
::v-deep .select-user-popup-body > * {
|
|
306
|
+
height: 100%;
|
|
307
|
+
display: flex;
|
|
308
|
+
flex-direction: column;
|
|
309
|
+
overflow: visible;
|
|
310
|
+
min-height: 0;
|
|
311
|
+
}
|
|
312
312
|
|
|
313
313
|
::v-deep .select-user-popup-body #headTitle {
|
|
314
314
|
flex: 0 0 auto;
|