Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/system/role.js

@@ -128,5 +128,11 @@ export function findAllRole(query) {
     method: 'get',
     params:query
   })
+
 }
 
+export function findRoleByType(type) {    
+  return request({
+    url: '/system/role/getRoleByType/'+ type,
+    method: 'get',
+  })}

src/views/core/accessPlan/index.vue

@@ -111,7 +111,7 @@
         </el-form-item>
 
         <el-form-item label="调阅机构类型" prop="orgType">
-          <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择">
+          <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择" @change="changeSelect">
             <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
               :value="`${dict.value}`"></el-option>
           </el-select>
@@ -123,14 +123,14 @@
           </el-select>
         </el-form-item>
 
-      
-            <el-form-item label="计划状态" prop="planStatus">
-              <el-radio-group v-model="form.planStatus">
-                <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value">{{ dict.label
-                }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-         
+
+        <el-form-item label="计划状态" prop="planStatus">
+          <el-radio-group v-model="form.planStatus">
+            <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value">{{ dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
 
 
         <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
@@ -172,7 +172,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole } from "@/api/system/role";
+import { listRole, findRoleByType } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -180,8 +180,8 @@ import KFileUpload from "@/components/K-FileUpload/index.vue";
 
 export default {
   name: "Plan",
-  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable','plan_status'],
-  components:{
+  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status'],
+  components: {
     orgTree
   },
   data() {
@@ -295,6 +295,13 @@ export default {
       this.queryParams.orgId = data.id;
       this.handleQuery();
     },
+
+    changeSelect(val) {
+  
+      findRoleByType(val).then(response => {
+        this.roleList = response;
+      })
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then(response => {