Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/views/core/task/index.vue

@@ -262,6 +262,7 @@ export default {
         taskName: null,
         cycle: null,
         dateRange: [],
+        planStartTime:null,
         status: null,
         roleId: null,
         checkSub: true,
@@ -379,8 +380,9 @@ export default {
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;
-      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
-      this.queryParams.dateRange = [];
+      this.queryParams.dateRange = ['',''];
+      this.queryParams.planStartTime=null;
+      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
       this.handleQuery();
     },
     // 多选框选中数据

src/views/resumptionEvaluate/evaluate/index.vue

@@ -114,7 +114,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="handleAdd"
-                  v-hasPermi="['system:user:add']"
+                  v-hasPermi="['core:evaluatePlan:add']"
                   >新增</el-button
                 >
               </el-col>

src/views/system/dept/index.vue

@@ -502,7 +502,7 @@ export default {
           { required: true, message: "机构名称不能为空", trigger: "blur" },
         ],
         type: [
-          { required: true, message: "机构类型不能为空", trigger: "blur" },
+          { required: true, message: "机构类型不能为空", trigger: "change" },
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" },