Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/dept/invWarehouse.vue

src/views/system/dept/authDept.vue

@@ -103,7 +103,7 @@
         <el-form :model="formData" ref="dataForm" :rules="rules">
           <el-row>
             <el-form-item label="上级部门:" label-width="100px" v-if="formData.pid != 0">
-              <treeselect v-model="formData.pcode" :options="deptOptions" :normalizer="normalizer"
+              <treeselect v-model="formData.pcode"  :options="deptOptions" :normalizer="normalizer"
                           :disabled="isShow"
                           style="width: 90%"
                           placeholder="选择上级部门"/>
@@ -499,7 +499,7 @@ export default {
     subAddDeptDialog(row) {
       this.formName = "add";
       this.formVisible = true;
-      this.isShow = false;
+      this.isShow = true;
       this.formData = {
         pid: row.id,
         pcode: row.code,

src/views/system/dept/invWarehouse.vue

@@ -125,6 +125,7 @@
             <el-col :span="12" class="el-col">
               <el-form-item label="上级仓库" prop="parentCode">
                 <treeselect v-model="subData.parentCode" :options="invOptions" :normalizer="normalizer"
+                            :disabled="isShow"
                             style="width: 80%"
                             placeholder="选择上级仓库"/>