Merge remote-tracking branch 'origin/master'

src/views/system/userManage/userManageAdd.vue

@@ -21,9 +21,8 @@
           <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
             <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
               :value="form.sysStaffOrg.orgName"></el-option>
-            <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
-              :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true' :props="defaultProps"
-              @check-change="checkchange">
+            <el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId"
+              :default-expand-all='true' :check-strictly='true' :props="defaultProps" @check-change="checkchange">
             </el-tree>
           </el-select>
           <el-checkbox class="checkbox" style="margin-left: 15px;" v-model="manageType"
@@ -255,7 +254,7 @@
 
 
         if (this.form.sid) {
-          userUpdatauserUpdata(this.form).then(res => {
+          userUpdata(this.form).then(res => {
             if (res.code == '200') {
               this.$message({
                 message: res.msg,

src/views/system/userManage/userManageList.vue

@@ -132,7 +132,7 @@
             <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
               <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
                 :value="form.sysStaffOrg.orgName"></el-option>
-              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+              <el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid"
                 :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
                 :props="defaultProps" @check-change="checkchange">
               </el-tree>
@@ -146,7 +146,6 @@
               @change="roleChange">
               <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>
             </el-select>
-
           </div>
         </div>
 
@@ -343,6 +342,14 @@
 
         }
 
+      },
+      nodeClick(val) {
+        console.log("nodeClick", val);
+        this.form.sysStaffOrg.orgSid = val.sid
+        this.form.sysStaffOrg.orgName = val.name
+        this.form.sysStaffOrg.orgCode = val.orgCode
+        this.$refs.Tree.visible = false
+
       },
       checkchange(data, checked, indeterminate) {
 
@@ -490,6 +497,7 @@
         });
       },
       save() {
+        this.form.orgSid = this.form.orgSid == '' ? window.sessionStorage.getItem('orgSid') : this.form.orgSid
         userUpdata(this.form).then(res => {
           if (res.code == '200') {
             this.$message({