调整检查计划

src/views/check/dialog.edit.vue

@@ -64,14 +64,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="6" v-if="id ? false : true">
               <el-form-item
                 prop="buildTaskNow"
                 label="立即生效:"
                 v-if="NowBuild()"
               >
                 <el-checkbox
-                  :disabled="id ? true : false"
                   v-model="formData.buildTaskNow"
                   size="medium"
                   @change="handleCheckboxChange"
@@ -138,7 +137,6 @@
             <el-col :span="6">
               <el-form-item prop="roleIds" label="检查角色:">
                 <el-select
-                  @visible-change="getRolesByOrg"
                   label="检查角色"
                   v-model="formData.roleIds"
                   placeholder="请选择检查角色"
@@ -149,7 +147,7 @@
                   <el-option
                     v-for="item in planRoles"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.roleName"
                     :value="item.id"
                   >
                   </el-option>
@@ -312,7 +310,7 @@ import OrgTree from "@/components/orgTree";
 import korgTree from "@/components/k-orgTree";
 import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
-import { findAllRole } from "@/api/system/role";
+import { findAllRole,findRoleByType } from "@/api/system/role";
 import { getLabel } from "@/views/commonOption";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
 export default {
@@ -381,6 +379,8 @@ export default {
     cleanExecOrgList() {
       this.execOrgIds = null;
       this.formData.execOrgList = [];
+      this.formData.roleIds=[];
+      this.getRolesByOrg();
     },
     cleanCheckOrgList() {
       this.checkOrgIds = null;
@@ -432,11 +432,12 @@ export default {
       };
     },
     getRolesByOrg() {
-      let params = {
-        orgType: null,
-      };
-      findAllRole(params).then((res) => {
-        this.planRoles = res.data;
+      // let params = {
+      //   orgType: null,
+      // };
+      findRoleByType(this.formData.execOrgType).then((res) => {
+        console.log(res,"res")
+        this.planRoles = res;
       });
     },
     handleChange(value) {

src/views/check/task/index.vue

@@ -62,7 +62,7 @@
 
           <el-form-item
             class="searchTitle"
-            label="任务开始时间"
+            label="开始日期"
             prop="planStartTime"
           >
             <el-date-picker

src/views/resumption/plan/dialog.edit.vue

@@ -100,10 +100,10 @@
                 ></el-switch> -->
               <!-- </el-form-item> -->
             <!-- </el-col> -->
-            <el-col :span="6">
-              <el-form-item prop="buildTaskNow" label="立即生效:">
+            <el-col :span="6" v-if="id ? false : true">
+              <el-form-item prop="buildTaskNow" label="立即生效:" >
                 <el-checkbox
-                  :disabled="id ? true : false"
+                  
                   v-model="formData.buildTaskNow"
                   size="medium"
                   @change="handleCheckboxChange"
@@ -637,6 +637,8 @@ export default {
       }
     },
     onOrgTypeChanged() {
+      this.formData.roleList =[];
+      this.tableData = [];
       this.getRolesByOrg();
     },
     async show(id, other = {}) {

src/views/system/user/index.vue

@@ -77,7 +77,7 @@
           <el-form-item label="管理人员" prop="isLock">
             <el-switch
               v-model="queryParams.onlyManager"
-              active-text="是"
+              active-text=""
               @change="handleQuery"
             >
             </el-switch>
@@ -150,7 +150,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExportManager"
-              v-hasPermi="['system:user:export']"
+              v-hasPermi="['system:user:exportManager']"
               >导出管理人员</el-button
             >
           </el-col>