|
|
@@ -24,7 +24,7 @@
|
|
|
placeholder="学员(乐团)编号"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item prop="organId">
|
|
|
+ <el-form-item prop="organId">
|
|
|
<el-select
|
|
|
class="multiple"
|
|
|
style="width: 180px !important"
|
|
|
@@ -90,7 +90,11 @@
|
|
|
scope.row.user.username
|
|
|
}}</copy-text>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="organName" label="所属分部"> </el-table-column>
|
|
|
+ <el-table-column prop="organName" label="所属分部">
|
|
|
+ <div slot-scope="scope">{{
|
|
|
+ scope.row.musicGroup.organName
|
|
|
+ }}</div>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="musicGroupId" label="所属乐团">
|
|
|
<copy-text slot-scope="scope">{{
|
|
|
scope.row.musicGroup.name
|
|
|
@@ -299,7 +303,7 @@ import { withdrawalStatus } from "@/constant";
|
|
|
const initSearch = {
|
|
|
search: "",
|
|
|
status: null,
|
|
|
- organId: "",
|
|
|
+ organId:''
|
|
|
};
|
|
|
export default {
|
|
|
components: { pagination, quitModal, quitOnlyModal, visit },
|
|
|
@@ -338,7 +342,7 @@ export default {
|
|
|
isDisabled: false,
|
|
|
};
|
|
|
},
|
|
|
- async mounted() {
|
|
|
+ async mounted() {
|
|
|
let isSuperAdmin = this.$store.getters.isSuperAdmin;
|
|
|
let roles = this.$store.getters.roles;
|
|
|
await this.$store.dispatch("setBranchs");
|
|
|
@@ -351,8 +355,8 @@ export default {
|
|
|
this.isManage = false;
|
|
|
}
|
|
|
}
|
|
|
- if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
|
|
|
- this.isManage = "super";
|
|
|
+ if(roles.indexOf(3) != -1&&roles.indexOf(4) != -1){
|
|
|
+ this.isManage = "super";
|
|
|
}
|
|
|
this.FetchList();
|
|
|
},
|
mo