教育计划 角色与机构类型关联 代码提交

src/api/core/edu/plan.js

@@ -53,11 +53,14 @@ export function listPlanRole(query) {
 }
 
 //获取教育培训计划角色列表
-export function roleList() {
+export function roleList(query) {
+  console.log("queryquery",query)
   return request({
     url: '/system/role/all',
     method: 'get',
-    params: null
+    params: {
+      orgType: query
+    }
   })
 }
 

src/views/core/edu/plan/index.vue

@@ -22,7 +22,7 @@
         <el-form-item label="计划周期" prop="planCycle">
           <el-select v-model="queryParams.planCycle" placeholder="请选择计划周期" clearable>
             <el-option
-              v-for="dict in dict.type.plan_cycle"
+              v-for="dict in dict.type.edu_plan_cycle"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -123,7 +123,7 @@
         </el-table-column>
         <el-table-column label="计划周期" align="center" prop="planCycle">
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.plan_cycle" :value="scope.row.planCycle"/>
+            <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
           </template>
         </el-table-column>
         <el-table-column prop="planRoleNameList" label="培训角色">
@@ -201,7 +201,7 @@
             <el-form-item label="计划周期" prop="planCycle">
               <el-select v-model="form.planCycle" placeholder="请选择计划周期">
                 <el-option
-                  v-for="dict in dict.type.plan_cycle"
+                  v-for="dict in dict.type.edu_plan_cycle"
                   :key="dict.value"
                   :label="dict.label"
                   :value="parseInt(dict.value)"
@@ -259,7 +259,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="培训机构类型" prop="execOrgType">
-              <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型">
+              <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()">
                 <el-option
                   v-for="dict in dict.type.sys_org_type"
                   :key="dict.value"
@@ -320,7 +320,7 @@ import {formatTime} from "@/utils/ruoyi";
 
 export default {
   name: "Plan",
-  dicts: ['plan_cycle', 'sys_org_type', 'plan_status'],
+  dicts: ['plan_cycle', 'sys_org_type', 'plan_status','edu_plan_cycle'],
   components: {OrgTree},
   data() {
     return {
@@ -395,8 +395,8 @@ export default {
       });
     },
     //初始化所有角色数据
-    initRoleList() {
-      roleList({}).then(response => {
+    initRoleList(query) {
+      roleList(query).then(response => {
         this.roleList = response.data;
       });
     },
@@ -433,6 +433,10 @@ export default {
     checkCreateByTopOrg(row) {
       return row.createByTopOrg !== 1
     },
+    execOrgTypeChanged(row){
+      console.log("this.form.execOrgType",this.form.execOrgType);
+      this.initRoleList(this.form.execOrgType);
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then(response => {