gaoxiong пре 2 година
родитељ
комит
a0822bc137

+ 6 - 4
src/components/orgTreeSelect/index.vue

@@ -104,7 +104,7 @@ export default {
       sNodeList: [],
       //默认显示及展开的node
       nodes: [],
-      treeProps:{          
+      treeProps:{
           disabled: this.getNodedisabled,
           children: "children",
           label: "name",
@@ -154,7 +154,7 @@ export default {
       handler(n) {
         if (n) {
          this.treeProps.label=n.label;
-         this.treeProps.children=n.children;         
+         this.treeProps.children=n.children;
         }
       },
     }
@@ -187,11 +187,13 @@ export default {
     },
     getNodedisabled(node) {
       //console.log("getNodedisabled",node,this.enabledCheckOrgTypes)
-      if (this.enabledCheckOrgTypes) {        
+      return false;
+      if (this.enabledCheckOrgTypes) {
         if (Array.isArray(node)) {
+          debugger;
           if (this.params.enabledOrgTypeList.findIndex((x) => x === node.type) == -1) {
             return true;
-          } 
+          }
         }
         else {
           if (this.enabledCheckOrgTypes !== node.type) {

+ 0 - 1
src/views/system/user/index.vue

@@ -259,7 +259,6 @@
                   >编辑</el-button
                 >
                 <el-button
-                  v-if="!scope.row.source"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"

+ 1 - 1
src/views/system/workTimeSet/dialog.add.vue

@@ -176,6 +176,7 @@ export default {
     queryNode(nodes){
       console.log(JSON.parse(nodes),'nodes')
       this.orgIdList = JSON.parse(nodes).map(v=>{return v.id});
+      console.log(this.orgIdList);
     },
     add(){
       this.isShow = true;
@@ -323,7 +324,6 @@ export default {
         orgIdList:this.orgIdList,
         workTimeList:workTimeList
       }
-      debugger
       addWorkTimeDay(data).then(res=>{
         this.$emit("ok");
         this.handleClose();