From b083467f5552863b614c33c6fdec53521e0986f6 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 25 Feb 2022 16:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/list/staff.vue     | 16 ++++++++--------
 src/pages/system/list/staffSide.vue |  2 +-
 src/setting.js                      |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index f9b204a..a813050 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -73,7 +73,7 @@
     }">
                     <el-cascader
                         v-model="item.cascaderValue"
-                        :options="majorList"
+                        :options="orgList"
                         style="width: 100%"
                     ></el-cascader>
                 </el-form-item>
@@ -160,7 +160,7 @@ export default {
             isAdd: false,
             teacherVisible: false,
             roleList: [], // 角色列表
-            majorList: [], // 员工组织架构列表
+            orgList: [], // 员工组织架构列表
             teacherForm: {
                 accountId: "",
                 account: "",
@@ -303,8 +303,8 @@ export default {
             this.isDetail = false;
             this.isAdd = true;
             this.teacherVisible = true;
-            this.majorList = this.$refs.getSelectData.majorList;
-            // console.log(JSON.stringify(this.majorList));
+            this.orgList = this.$refs.org.orgList;
+            // console.log(JSON.stringify(this.orgList));
         },
         getStaffDetail(accountId) { // 获取员工详情
             this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
@@ -331,14 +331,14 @@ export default {
             this.isDetail = false;
             this.isAdd = false;
             this.teacherVisible = true;
-            this.majorList = this.$refs.getSelectData.majorList;
+            this.orgList = this.$refs.org.orgList;
             this.getStaffDetail(row.accountId);
         },
         showTeacher(row) { // 处理查看
             this.isDetail = true;
             this.isAdd = false;
             this.teacherVisible = true;
-            this.majorList = this.$refs.getSelectData.majorList;
+            this.orgList = this.$refs.org.orgList;
             this.getStaffDetail(row.accountId);
         },
         accountChange() { // 切换账号
@@ -600,10 +600,10 @@ export default {
 <style lang="scss" scoped>
 .wrap {
     display: flex;
-    padding: 24px;
+    padding: 0 24px;
     .side {
         width: 300px;
-        padding-right: 10px;
+        padding: 24px 10px 24px 0;
         margin-right: 24px;
         border-right: 1px solid rgba(0, 0, 0, 0.06);
     }
diff --git a/src/pages/system/list/staffSide.vue b/src/pages/system/list/staffSide.vue
index 80fc210..fb3cd74 100644
--- a/src/pages/system/list/staffSide.vue
+++ b/src/pages/system/list/staffSide.vue
@@ -41,7 +41,7 @@
             </org-tree>
         </div>
 
-        <el-dialog :title="Form.staffArchitectureId ? '编辑专业' : '新增专业'" :visible.sync="majorVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
+        <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'" :visible.sync="majorVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
             <el-form ref="Form" :model="Form" :rules="rules">
                 <el-form-item prop="staffArchitectureName">
                     <el-input placeholder="请输入专业名称" v-model="Form.staffArchitectureName"></el-input>
diff --git a/src/setting.js b/src/setting.js
index e2a5417..cdbd4cd 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -40,8 +40,8 @@ if (isHh) {
     jumpPath = "http://192.168.31.154:8087/";
     bankPath = `http://192.168.31.125:8093`
     // host = "http://www.occupationlab.com:9000/";//线上
-    host = "http://39.108.250.202:9000/"; // 中台测试服
-    // host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://192.168.31.151:9000/"; // 榕
     // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";
 } else {