修复部分bug

src/components/orgTreeSelect/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!--  弹出框  -->
-  <el-popover placement="bottom-start" trigger="hover" :disabled="disabled" v-model="visible">
+  <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
     <div slot="reference" class="tags-box" :class="!disabled|| 'tags-box-disabled'">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
@@ -20,7 +20,7 @@
         </el-select>
       </el-col>
       <el-col :span="10" :xs="24">
-        <el-checkbox v-if="queryForm.type" :disabled="disable" v-model="checked">按过滤机构类型勾选</el-checkbox>
+        <el-checkbox v-if="checkShow" :disabled="!queryForm.type" v-model="checked">按过滤机构类型勾选</el-checkbox>
       </el-col>
     </el-row>
     <!--  机构树   -->
@@ -67,6 +67,10 @@ export default {
       default: false,
       required: false,
     },
+    checkShow: {
+      type: Boolean,
+      default: false,
+    },
     queryData: {
       type: Number,
       default: null,
@@ -227,6 +231,7 @@ export default {
     handleNodeClick() {
     },
     onCheck(data, checked, tree) {
+      console.log(1111123213123)
       if (this.checked) {
         let checkNodes = this.$refs.tree.getCheckedNodes();
         let type = this.queryForm.type;
@@ -248,16 +253,14 @@ export default {
         recursionFn(data.children);
         let arr = checkNodes.filter(v => {
           return v.type == this.queryForm.type
-        }
-        );
+        });
         this.$refs.tree.setCheckedNodes(arr);
         this.sNodeList = this.$refs.tree.getCheckedNodes();
-        return
+      }else {
+        this.sNodeList = this.$refs.tree.getCheckedNodes();
       }
-      // debugger;
-      this.sNodeList = this.$refs.tree.getCheckedNodes();
-      this.$emit("selectNode", this.sNodeList);
       let arr = this.sNodeList.map(v=>{return v.id});
+      this.$emit("selectNode", this.sNodeList);
       this.$emit("selectNodeId", arr);
     },
 

src/views/system/user/index.vue

@@ -244,7 +244,7 @@
                   type="text"
                   icon="el-icon-plus"
                   @click="handleExtend(scope.row)"
-                  v-hasPermi="['system:user:extend']" 
+                  v-hasPermi="['system:user:extend']"
                   v-if="check==true"   >补充信息</el-button
                 >
                 <el-button
@@ -637,7 +637,7 @@ export default {
   },
   mounted() {
     this.getAllRoles();
-    
+
   },
   watch: {
     'form.orgId'(newValue) {

src/views/system/workTimeSet/dialog.template.vue

@@ -10,7 +10,7 @@
             label-position="left">
           <el-form-item>
             <span slot="label"> <span style="color: red"> * </span>机构 </span>
-            <org-tree-select v-model="formData.orgIds" :disabled="disabled" ></org-tree-select>
+            <org-tree-select v-model="formData.orgIds" :checkShow="true" :disabled="disabled" ></org-tree-select>
           </el-form-item>
           <el-form-item >
             <span slot="label"> <span style="color: red"> * </span>生效日期 </span>