页面修改

src/api/users/user.js

@@ -11,3 +11,16 @@ export function resetPassword(data) {
         data
     })
 }
+
+/**
+ * 获取员工列表
+ * @param {查询参数} data 
+ */
+export function queryEmployee(data)
+{
+    return request({
+        url: '/user/GetEmployeeList',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

src/components/school/manager/manager-form.vue

@@ -25,10 +25,6 @@
             </q-uploader>
           </div>
         </div>
-        <div class="text-caption q-my-md q-px-xs text-grey-6">选择角色</div>
-        <div class="q-pa-md">
-          <q-option-group type="checkbox" :options="roleList" v-model="tempRole" emit-value map-options />
-        </div>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
@@ -45,10 +41,6 @@
     saveManager,
     queryManagerInfo
   } from '../../../api/school/index'
-  import {
-    queryRoleDropdown
-  }
-  from '../../../api/system/index'
   //部门
   import {
     getDeptTree
@@ -87,9 +79,7 @@
         },
         optionTitle: "",
         schoolList: [],
-        roleList: [], //角色列表
         saveLoading: false,
-        tempRole: [],
         DeptList: [], //部门列表
         PostList: [], //岗位列表
         returnString: [], //默认岗位
@@ -98,7 +88,6 @@
     created() {
       this.queryDeptTree();
       this.queryPostList();
-      this.getrolelist();
       this.getSchool();
     },
     mounted() {
@@ -135,20 +124,6 @@
           }
         })
       },
-      getrolelist() {
-        queryRoleDropdown({}).then(res => {
-          if (res.Code == 1) {
-            if (res.Data && res.Data.length > 0) {
-              res.Data.forEach(item => {
-                this.roleList.push({
-                  label: item.RoleName,
-                  value: item.RoleId
-                });
-              })
-            }
-          }
-        })
-      },
       initObj() {
         if (this.saveObj) {
           this.optionTitle = "修改管理者信息"
@@ -164,6 +139,9 @@
             this.objOption.Dept_Id = res.Data.Dept_Id;
             this.returnString.push(res.Data.Dept_Id.toString());
             this.tempRole = res.Data.RoleList;
+            if (this.objOption.Dept_Id && this.objOption.Dept_Id > 0) {
+              this.queryPostList();
+            }
             this.$forceUpdate();
           })
         } else {

src/pages/school/manager.vue

@@ -77,6 +77,9 @@
                 class="col-6 q-pb-lg" label="校区联系电话" :rules="[val => !!val || '请填写校区联系电话']" />
               <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Remark"
                 class="col-6 q-pb-lg q-pr-lg" label="校区备注" />
+              <selectTree v-if="DeptList&&DeptList.length>0" :treeData='DeptList' :defaultArray="returnString"
+                nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="所属部门"
+                @getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
               <div class="col-6">
                 <q-toggle size="md" label="校区状态" color="primary" :false-value="1" :true-value="0"
                   v-model="objOption.Status" />
@@ -101,10 +104,18 @@
     getSchoolPage,
     saveSchool
   } from '../../api/school/index'
+  //部门
+  import {
+    getDeptTree
+  } from '../../api/system/dept'
+  import selectTree from '../../components/common/select-tree'
   export default {
     meta: {
       title: "校区管理"
     },
+    components: {
+      selectTree
+    },
     data() {
       return {
         currentUrl: "",
@@ -124,6 +135,13 @@
             align: 'left',
             sortable: true
           },
+          {
+            name: 'DeptName',
+            label: '所属部门',
+            field: 'DeptName',
+            align: 'left',
+            sortable: true
+          },
           {
             name: 'SLinkMan',
             label: '负责人',
@@ -192,11 +210,25 @@
         StatusTemp: {},
         pageCount: 0,
         persistent: false,
-        objOption: {},
-        saveLoading: false
+        objOption: {
+          SId: 0,
+          SName: "",
+          SAddress: "",
+          SLinkMan: "",
+          SLinkTel: "",
+          SDomain: "",
+          SLogo: "",
+          Remark: "",
+          Status: '0',
+          Dept_Id: 0, //管理部门
+        },
+        saveLoading: false,
+        DeptList: [], //部门列表
+        returnString: [], //默认值
       }
     },
     created() {
+      this.queryDeptTree();
       this.StatusTemp = this.StatusOpts[0]
     },
     mounted() {
@@ -204,9 +236,25 @@
       this.getSchool()
     },
     methods: {
+      getChild(deptArray) {
+        var tempStr = "";
+        if (deptArray && deptArray != '') {
+          tempStr = deptArray;
+        }
+        this.objOption.Dept_Id = tempStr;
+      },
+      //获取部门结构树
+      queryDeptTree() {
+        getDeptTree({}).then(res => {
+          if (res.Code == 1) {
+            this.DeptList = res.Data;
+          }
+        })
+      },
       onItemClick() {
 
       },
+      //初始化对象
       initObj(id) {
         if (id) {
           let obj = this.data.filter(x => {
@@ -215,40 +263,42 @@
             }
             return false
           })
-          this.objOption = obj[0]
+          this.objOption = obj[0];
+          this.returnString.push(this.objOption.Dept_Id.toString());
         } else {
-          this.objOption = {
-            SId: 0,
-            SName: "",
-            SAddress: "",
-            SLinkMan: "",
-            SLinkTel: "",
-            SDomain: "",
-            SLogo: "",
-            Remark: "",
-            Status: '0'
-          }
+          this.objOption.SId = 0;
+          this.objOption.SName = "";
+          this.objOption.SAddress = "";
+          this.objOption.SLinkMan = "";
+          this.objOption.SLinkTel = "";
+          this.objOption.SDomain = "";
+          this.objOption.SLogo = "";
+          this.objOption.Remark = "";
+          this.objOption.Status = "0";
+          this.objOption.Dept_Id = 0;
         }
-        this.persistent = true
+        this.persistent = true;
       },
+      //重新查询
       resetSearch() {
         this.msg.pageIndex = 1
         this.loading = true
         this.msg.Status = this.StatusTemp ? this.StatusTemp.value : '-1'
         this.getSchool()
       },
+      //分页改变
       changePage(val) {
         this.msg.Status = this.StatusTemp ? this.StatusTemp.value : '-1'
         this.msg.pageIndex = val
         this.loading = true
         this.getSchool()
       },
+      //获取学校分页列表
       getSchool() {
         getSchoolPage(this.msg).then(res => {
           this.loading = false
           this.data = res.Data.PageData;
-          
-          this.pageCount = res.Data.PageCount
+          this.pageCount = res.Data.PageCount;
         }).catch(() => {
           this.loading = false
         })
@@ -256,6 +306,7 @@
       closeSaveForm() {
         this.persistent = false
       },
+      //保存校区
       saveSchool() {
         this.saveLoading = true
         this.$refs.SName.validate()