Merge remote-tracking branch 'origin/dev' into dev

src/components/orgTree/index.vue

@@ -20,6 +20,7 @@
         :filter-node-method="filterNode"
         ref="tree"
         node-key="id"
+        class="el-tree-ex"
         :default-expanded-keys="defaultKeys"
         :default-checked-keys="defaultKeys"
         @node-click="handleNodeClick"
@@ -85,6 +86,9 @@ export default {
         this.defaultKeys.push(response.data[0].id);
         this.$emit('defaultKey',response.data[0].id);
         this.defaultKey = response.data[0].id;
+        setTimeout(() => {
+          this.$refs.tree.setCurrentKey(response.data[0].id)
+        }, 100);        
       });
     },
     // 筛选节点
@@ -100,6 +104,11 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang='scss' scoped>
+  .el-tree-ex {
+    overflow: auto;
+    ::v-deep .is-current > .el-tree-node__content {
+      background-color: #d1e0f1 !important;
+    }   
+  }
 </style>

src/views/system/dept/dialog.edit.vue

@@ -72,7 +72,8 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否可用" prop="isLock">
-                <el-switch v-model="form.isLock"> </el-switch>
+                <el-switch v-model="form.isLock" :active-value="0"
+          :inactive-value="1"> </el-switch>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -80,7 +81,8 @@
                 label="加钞间出入口远程控制"
                 prop="cashAddingRoomRemoteControl"
               >
-                <el-switch v-model="form.cashAddingRoomRemoteControl">
+                <el-switch v-model="form.cashAddingRoomRemoteControl" :active-value="1"
+          :inactive-value="0">
                 </el-switch>
               </el-form-item>
             </el-col>
@@ -432,9 +434,9 @@ export default {
     },
 
     async show(row) {
-        this.form={};
-        this.id=0;
-        this.constructionList=[];
+      this.form = {};
+      this.id = 0;
+      this.constructionList = [];
       if (row != 0) {
         // console.log(row)
         this.orgid = row.orgid;
@@ -472,12 +474,10 @@ export default {
           : 0;
         console.log(this.form);
         addOrUpdate(this.form).then((data) => {
-            this.$modal.msgSuccess("添加成功");
-this.onHide();
-            
+          this.$modal.msgSuccess("添加成功");
+          this.onHide();
         });
         // this.$emit("success");
-        
       });
     },