fix: 流程接口调整

main
wx-jincw 3 weeks ago
parent c6a9aac008
commit 04cf849507

@ -0,0 +1,5 @@
function deptTreeSelect() {
}

@ -120,8 +120,10 @@
</template> </template>
<script> <script>
import { listUser, deptTreeSelect } from "@/api/system/user"; import { deptTreeSelect } from "@/api/system/user";
import { listRole } from "@/api/system/role"; // import { listRole } from "@/api/system/role";
import { adminList as listUser, } from "@/api/systemadmin";
import { getRoleList as listRole } from "@/api/role";
import TreeSelect from "@/components/TreeSelect"; import TreeSelect from "@/components/TreeSelect";
const userTaskForm = { const userTaskForm = {
@ -250,11 +252,12 @@ export default {
getDeptOptions() { getDeptOptions() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!this.deptOptions || this.deptOptions.length <= 0) { if (!this.deptOptions || this.deptOptions.length <= 0) {
deptTreeSelect().then(response => { // deptTreeSelect().then(response => {
this.deptTempOptions = response.data; // this.deptTempOptions = response.data;
this.deptOptions = response.data; // this.deptOptions = response.data;
resolve() // resolve()
}) // })
reject()
} else { } else {
reject() reject()
} }

@ -208,6 +208,7 @@ import { detailProcess } from '@/api/workflow/process'
import Parser from '@/utils/generator/parser' import Parser from '@/utils/generator/parser'
import { complete, delegate, transfer, rejectTask, returnList, returnTask } from '@/api/workflow/task' import { complete, delegate, transfer, rejectTask, returnList, returnTask } from '@/api/workflow/task'
import { selectUser, deptTreeSelect } from '@/api/system/user' import { selectUser, deptTreeSelect } from '@/api/system/user'
import { adminList } from "@/api/systemadmin";
import ProcessViewer from '@/components/ProcessViewer' import ProcessViewer from '@/components/ProcessViewer'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
@ -330,14 +331,14 @@ export default {
}, },
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
getTreeSelect() { getTreeSelect() {
deptTreeSelect().then(response => { // deptTreeSelect().then(response => {
this.deptOptions = response.data; // this.deptOptions = response.data;
}); // });
}, },
/** 查询用户列表 */ /** 查询用户列表 */
getList() { getList() {
this.userLoading = true; this.userLoading = true;
selectUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { adminList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows; this.userList = response.rows;
this.total = response.total; this.total = response.total;
this.toggleSelection(this.userMultipleSelection); this.toggleSelection(this.userMultipleSelection);

Loading…
Cancel
Save