|
|
@@ -328,7 +328,7 @@ import { mapState, mapMutations } from "vuex";
|
|
|
import DialogEdit from "./dialog.edit";
|
|
|
import * as api from "@/api/resumption/plan";
|
|
|
import { statusOptions, getLabel } from "./../../commonOption";
|
|
|
-import { listRole } from "@/api/system/role";
|
|
|
+import { allRole } from "@/api/system/role";
|
|
|
export default {
|
|
|
name: "resumptionplan",
|
|
|
dicts: [
|
|
|
@@ -368,6 +368,7 @@ export default {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
checkSub:true,
|
|
|
+ roleList:[],
|
|
|
...query,
|
|
|
},
|
|
|
pageData: [],
|
|
|
@@ -409,17 +410,20 @@ export default {
|
|
|
this.loading = false;
|
|
|
})
|
|
|
},
|
|
|
- getRolesByOrg() {
|
|
|
- let params = {
|
|
|
- // orgId:this.queryParams.orgId
|
|
|
- };
|
|
|
- listRole(params).then((res) => {
|
|
|
+ async getRolesByOrg() {
|
|
|
+
|
|
|
+ await allRole().then((res) => {
|
|
|
// console.info(res);
|
|
|
- this.resumptionRoles = res.rows;
|
|
|
+ this.resumptionRoles = res.data;
|
|
|
});
|
|
|
},
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
+ this.queryParams.roleList=[];
|
|
|
+ if(this.queryParams.resumptionRole!=null&&this.queryParams.resumptionRole!=''){
|
|
|
+ this.queryParams.roleList.push(this.queryParams.resumptionRole);
|
|
|
+ }
|
|
|
+
|
|
|
console.info(this.dict.type);
|
|
|
api
|
|
|
.list(this.queryParams)
|