修改问题

src/App.vue

@@ -195,10 +195,10 @@ input[type="number"] {
   background-color: #fff;
   padding: 18px 60px 40px;
   // height: calc(100vh- 80px) !important;
-  height: calc(100vh - 70px);
+  // height: calc(100vh - 70px);
   width: 100;
   min-width: 1440px;
-  overflow: auto;
+  // overflow: auto;
   .m-core {
     margin-top: 10px;
     background-color: #fff;

src/api/teamServer.js

@@ -6,6 +6,6 @@ export function getTeamList (data) {
   return request({
     url: '/web-server/musicGroup/queryPage',
     method: 'get',
-    params: qs.stringify(data)
+    params: data
   })
 }

src/layout/components/Sidebar/SidebarItem.vue

@@ -22,7 +22,7 @@
               :title="item.meta.title" />
       </template>
       <sidebar-item v-for="child in item.children"
-                    :key="child.path"
+                    :key="child.id"
                     :is-nest="true"
                     :item="child"
                     :base-path="resolvePath(child.path)"
@@ -65,6 +65,7 @@ export default {
   },
   mounted () {
     this.onlyOneChild = null
+    console.log(this.item)
   }
   ,
   methods: {

src/views/categroyManager/insideSetting/branchManager.vue

@@ -46,12 +46,12 @@
           <el-table-column align='center' prop='mobileNo'
                            label="手机号">
           </el-table-column>
-          <el-table-column align='center' prop='ownershipType'
+          <!-- <el-table-column align='center' prop='ownershipType'
                            label="权属类型">
             <template slot-scope="scope">
               {{ scope.row.ownershipType | branchType }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align='center'
                            label="操作" width='100'>
             <template slot-scope="scope">
@@ -82,13 +82,13 @@
         <el-form-item label="手机号" prop="mobileNo" :label-width="formLabelWidth">
           <el-input v-model.number="form.mobileNo" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="权属类型" prop="ownershipType" :label-width="formLabelWidth">
+        <!-- <el-form-item label="权属类型" prop="ownershipType" :label-width="formLabelWidth">
           <el-select v-model="form.ownershipType">
               <el-option label="自有" value="OWN"></el-option>
               <el-option label="合作" value="COOPERATION"></el-option>
               <el-option label="租赁" value="LEASE"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="teachingStatus = false">取 消</el-button>
@@ -131,7 +131,7 @@ export default {
         linkman: null, // 来源
         job: null,  // 费用
         mobileNo: null, 
-        ownershipType: null,
+        // ownershipType: null,
         organId: store.getters.organ
       },
       rules: {
@@ -142,7 +142,7 @@ export default {
           {required: true, message: '请输入手机号', trigger: 'blur'},
           { type: 'number', message: '手机号必须为数字'},
         ],
-        ownershipType: [{ required: true, message: '请选择权属类型', trigger: 'change' }]
+        // ownershipType: [{ required: true, message: '请选择权属类型', trigger: 'change' }]
       },
       
     }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -78,8 +78,8 @@
           </el-select>
           <!-- collapse-tags -->
         </el-form-item>
-        <el-form-item label="所属部门" prop="organIdList" :label-width="formLabelWidth">
-          <el-select v-model="form.organIdList" multiple>
+        <el-form-item label="所属部门" prop="organIdLists" :label-width="formLabelWidth">
+          <el-select v-model="form.organIdLists" multiple>
             <el-option v-for="item in branchList" :key="item.value" 
               :label="item.label" :value="item.value"></el-option>
           </el-select>
@@ -139,7 +139,7 @@ export default {
         gender: null,
         phone: null,
         roleIds: [],
-        organIdList: [],
+        organIdLists: [],
         jobNature: null,
         entryDate: null,
       },
@@ -148,7 +148,7 @@ export default {
         gender: [{required: true, message: '请选择性别', trigger: 'change'}],
         phone: [{ type: 'number', required: true, message: '手机号输入有误', trigger: 'blur'}],
         roleIds: [{type: 'array', required: true, message: '请选择分类', trigger: 'change'}],
-        organIdList: [{type: 'array', required: true, message: '请选择所属部门', trigger: 'change'}],
+        organIdLists: [{type: 'array', required: true, message: '请选择所属部门', trigger: 'change'}],
         jobNature: [{required: true, message: '请选择工作类型', trigger: 'change'}],
         entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur'}],
       }
@@ -163,8 +163,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.form.organId = this.organId
-          this.form.organIdList = this.form.organIdList.join(',')
-          // this.form.roleIds = this.form.roleIds.join(',')
+          this.form.organIdList = this.form.organIdLists.join(',')
           if(this.formActionTitle == 'create') {
             if(this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
@@ -243,7 +242,7 @@ export default {
           gender: data.gender,
           phone: Number(data.phone),
           roleIds: data.roleIds,
-          organIdList: data.organIdList ? data.organIdList : [],
+          organIdLists: data.organIdList ? data.organIdList : [],
           jobNature: data.jobNature,
           entryDate: data.entryDate
         }
@@ -255,7 +254,7 @@ export default {
         gender: null,
         phone: null,
         roleName: null,
-        organIdList: [],
+        organIdLists: [],
         jobNature: null,
         entryDate: null
       }

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -58,7 +58,7 @@
         </el-table-column>
         <el-table-column label="当前课次" prop="currentClassTimes">
         </el-table-column>
-        <el-table-column label="考情状态">
+        <el-table-column label="考勤状态">
           <template slot-scope="scope">
             {{ scope.row.signInStatus | attendanceType }}
           </template>

src/views/teamDetail/teamList.vue

@@ -216,9 +216,13 @@ export default {
     pagination
   },
   mounted () {
-    getTeamList().then(res => {
+    getTeamList({
+      rows: this.rules.limit,
+      page: this.rules.page
+    }).then(res => {
       if (res.code == 200) {
-        this.tableData = res.data.rows;
+        this.tableData = res.data.rows
+        this.rules.total = res.data.total
       }
     })
   },