修改问题

dist/static/css/chunk-7a1b3ebc.5a0b0199.css

@@ -0,0 +1 @@
+.m-core[data-v-2c5c6151]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-2c5c6151]{width:180px}.m-core h4[data-v-2c5c6151]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-2c5c6151],.m-core .right[data-v-2c5c6151],.m-core .vipLeft[data-v-2c5c6151]{width:400px}.planList[data-v-2c5c6151]{padding:0 25px}.planList .planTop[data-v-2c5c6151]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-2c5c6151]{font-size:14px}.planList .planCore .row[data-v-2c5c6151]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px}.okBtn[data-v-2c5c6151]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

src/api/studentManager.js

@@ -65,3 +65,13 @@ export function studentWithdraw(data) {
     })
 }
 
+
+// 获取学员扣费记录列表
+export function queryStudentPayment(data) {
+    return request({
+        url: `/web-server/studentManage/queryStudentPayment`,
+        method: 'get',
+        params: data
+    })
+}
+

src/api/teacherManager.js

@@ -97,7 +97,7 @@ export function vipGroupSalarySet(data) {
     return request({
         url: '/web-server/teacherDefaultVipGroupSalary/set',
         method: 'post',
-        data: qs.stringify(data)
+        data: data
     })
 }
 
@@ -122,8 +122,9 @@ export function teacherSalaryBatchUpset(data) {
 // 课酬调整
 export function updateTeacherCoursesSalary(data) {
     return request({
-        url: '/web-server/course/updateTeacherCoursesSalary',
+        // url: '/web-server/courseSchedule/updateTeacherCoursesSalary',
+        url: '/api-student/course/updateTeacherCoursesSalary',
         method: 'post',
-        data: data
+        data: qs.stringify(data)
     })
 }

src/router/index.js

@@ -129,6 +129,7 @@ export const asyncRoutes = {
   vipNewActive: () => import('@/views/categroyManager/vipNewActive'),
   vipParameterManager: () => import('@/views/categroyManager/generalSettings/vipParameterManager'),
   globalConfig: () => import('@/views/categroyManager/globalConfig'),
+  buildVip: () => import('@/views/buildVip/index'),
   // 侧边栏管理
   setSilder: () => import('@/views/setSilder/addSilder'), 
 

src/views/categroyManager/insideSetting/branchManager.vue

@@ -85,7 +85,7 @@
         <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="COOPERATIO"></el-option>
+              <el-option label="合作" value="COOPERATION"></el-option>
               <el-option label="租赁" value="LEASE"></el-option>
           </el-select>
         </el-form-item>

src/views/studentManager/components/studentPayList.vue

@@ -26,21 +26,30 @@
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center'
                          label="上课时间">
+          <template slot-scope="scope">
+            {{ scope.row.classDate }} {{ scope.row.startClassTime }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          label="课程类型">
+          <template slot-scope="scope">
+            {{ scope.row.classGroupType | coursesType }}
+          </template>
         </el-table-column>
-        <el-table-column align='center'
+        <el-table-column align='center' prop="classGroupName"
                          label="班级名称">
         </el-table-column>
-        <el-table-column align='center'
+        <el-table-column align='center' prop="currentClassTimes"
                          label="当前课次">
         </el-table-column>
         <el-table-column align='center'
                          label="考勤状态">
+          <template>
+            
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          label="总计缴费">
@@ -52,12 +61,17 @@
                          label="课程余额">
         </el-table-column>
       </el-table>
+      <pagination :total="pageInfo.total"
+                :page.sync="pageInfo.page"
+                :limit.sync="pageInfo.limit"
+                :page-sizes="pageInfo.page_size"
+                @pagination="getList" />
     </div>
   </div>
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { findStudentAttendances } from '@/api/studentManager'
+import { queryStudentPayment } from '@/api/studentManager'
 export default {
   components: { pagination },
   data () {
@@ -96,17 +110,20 @@ export default {
       tableList: []
     }
   },
+  mounted() {
+    this.getList()
+  },
   methods: {
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-      // findStudentAttendances(params).then(res => {
-      //   if(res.code == 200) {
-      //     this.tableList = res.data.rows
-      //     this.pageInfo.total = res.data.total
-      //   }
-      // })
+      queryStudentPayment(params).then(res => {
+        if(res.code == 200) {
+          this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
+        }
+      })
     },
     onReSet() { // 重置搜索
       this.searchForm = {

src/views/studentManager/components/studentRecord.vue

@@ -41,7 +41,7 @@
     </div> -->
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'>
+      <el-table :data='tableList' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center' prop="courseDate"
                          label="上课时间">
         </el-table-column>

src/views/studentManager/components/teamAndcourse.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="tabTopWrap">
-      <el-table :data='musicGroupInfo'>
+      <el-table :data='musicGroupInfo' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center' prop="musicGroupId"
                          label="乐团编号">
         </el-table-column>
@@ -86,7 +86,7 @@
       </div>
     </div> -->
     <div v-if="coursesShow" class="tableWrap">
-      <el-table :data='coursesInfo'>
+      <el-table :data='coursesInfo' :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align='center' prop="classGroupId"
                          label="编号">
         </el-table-column>

src/views/studentManager/index.vue

@@ -61,37 +61,14 @@ export default {
   name: 'studentDetail',
   data () {
     return {
-      activeIndex: '4',
-      acitveStatus: [false, false, false, true, false, false, false]
+      activeIndex: '5',
+      acitveStatus: [false, false, false, false, true, false, false]
     }
   },
   methods: {
     handleClick (val) {
       this.activeIndex = val.name
       this.acitveStatus[val.name - 1] = true
-      // switch(val.name) {
-      //   case '1':
-      //     this.activeStatus[0] = true
-      //   break;
-      //   case '2':
-      //     this.activeStatus[1] = true
-      //   break;
-      //   case '3':
-      //     this.activeStatus[2] = true
-      //   break;
-      //   case '4':
-      //     this.activeStatus[3] = true
-      //   break;
-      //   case '5':
-      //     this.activeStatus[4] = true
-      //   break;
-      //   case '5':
-      //     this.activeStatus[4] = true
-      //   break;
-      //   case '5':
-      //     this.activeStatus[4] = true
-      //   break;
-      // }
     }
   }
 }

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

@@ -3,7 +3,9 @@
     <!-- <h4>单次课次参考时长：30min</h4> -->
     <div class="tableList">
       <div class="left">
-        <h3>单次课次参考时长：30min</h3>
+        <h3>单次课次参考时长：30min
+          <el-button @click="onMusicGroupSave2()" type="text">保存</el-button>
+        </h3>
         <el-table :data='teamTable'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column label="乐团课课酬课时结算">
@@ -21,11 +23,6 @@
               <el-input v-model="scope.row.assistantTeacherSalary" placeholder="请输入课酬"></el-input>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" width="100px">
-            <template slot-scope="scope">
-              <el-button @click="onMusicGroupSave2(scope.row)" type="text">保存</el-button>
-            </template>
-          </el-table-column> -->
         </el-table>
 
         <h3>单次课次参考时长：30min
@@ -45,11 +42,6 @@
               <el-input v-model="scope.row.offlineClassesSalary" placeholder="请输入内容"></el-input>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" width="100px">
-            <template slot-scope="scope">
-              <el-button @click="onVIPSave(scope.row)" type="text">保存</el-button>
-            </template>
-          </el-table-column> -->
         </el-table>
       </div>
       <div class="right">
@@ -76,14 +68,6 @@
               <el-input v-model="scope.row.assistantTeacherSalary" placeholder="请输入课酬"></el-input>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" width="100px">
-            <template slot-scope="scope">
-              <el-button @click="onMusicGroupSave(scope.row)" type="text">保存</el-button>
-            </template>
-          </el-table-column> -->
-          <!-- <template slot="append" style="text-align: right;">
-            <el-button @click="onMusicGroupSave(scope.row)" type="text">保存</el-button>
-          </template> -->
         </el-table>
         
       </div>
@@ -98,7 +82,25 @@ export default {
   data () {
     return {
       teacherId: this.$route.query.teacherId,
-      teamTable: [],
+      teamTable: [{
+        assistantTeacherSalary: null,
+        courseScheduleType: "SINGLE",
+        mainTeacherSalary: null,
+        settlementType: "FIXED_SALARY",
+        userId: this.$route.query.teacherId
+      },{
+        assistantTeacherSalary: null,
+        courseScheduleType: "HIGH",
+        mainTeacherSalary: null,
+        settlementType: "FIXED_SALARY",
+        userId: this.$route.query.teacherId
+      },{
+        assistantTeacherSalary: null,
+        courseScheduleType: "MIX",
+        mainTeacherSalary: null,
+        settlementType: "FIXED_SALARY",
+        userId: this.$route.query.teacherId
+      }],
       vipTable: [],
       musicGroupTable: [],
       ruleList: [],
@@ -114,12 +116,15 @@ export default {
       vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
         if (res.code == 200 && res.data.length > 0) {
           // this.vipList = res.data
-          let vipData = res.data
-          let tempArray = []
+          // let vipData = res.data
+          let vipData = []
           res.data.forEach(item => {
-            console.log(item)
-            tempArray.push({
-              // offlineClassesSalary: 
+            vipData.push({
+              offlineClassesSalary: item.offlineClassesUnitPrice,
+              onlineClassesSalary: item.onlineClassesUnitPrice,
+              vipGroupCategoryId: item.id,
+              vipGroupCategoryName: item.name,
+              userId: this.teacherId
             })
           })
           // VIP课列表
@@ -143,7 +148,9 @@ export default {
         settlementType: 'FIXED_SALARY'
       }).then(res => {
         if(res.code == 200) {
-          this.teamTable = res.data.rows
+          // this.teamTable = res.data.rows
+          let rows = res.data.rows
+          this.teacherSalaryMoney(rows)
         }
       })
 
@@ -196,35 +203,34 @@ export default {
       })
     },
     vipListCompare(vipData, rows) { // vip 做对比
-      console.log('start------------------')
-      console.log(vipData)
-      console.log(rows)
-      console.log('end------------------')
-      if(!vipData) { // 判断是否有数据
-        this.vipTable = rows
+      if(!rows) { // 判断是否有数据
+        this.vipTable = vipData
         return
       }
       let result = []
       vipData.forEach(item => {
-        if(rows) { // 判断是否已经设置的课程
-          rows.forEach(c => {
-            if(item.id == c.vipGroupCategoryId) {
-              result.push({
-                id: c.id,
-                vipGroupCategoryName: c.vipGroupCategoryName,
-                offlineClassesSalary: c.offlineClassesSalary,
-                onlineClassesSalary: c.onlineClassesSalary
-              })
-            }
-          })
-        } else {
-          result.push({
-            vipGroupCategoryName: item.name,
-            offlineClassesSalary: item.offlineClassesUnitPrice,
-            onlineClassesSalary: item.onlineClassesUnitPrice
-          })
-        }
+        rows.forEach(c => {
+          if(item.vipGroupCategoryId == c.vipGroupCategoryId) {
+            item.checked = true
+            result.push({
+              vipGroupCategoryName: c.vipGroupCategoryName,
+              offlineClassesSalary: c.offlineClassesSalary,
+              onlineClassesSalary: c.onlineClassesSalary,
+              vipGroupCategoryName: c.vipGroupCategoryName,
+              userId: c.userId
+            })
+          }
+        })
       })
+      if(result.length > 0) {
+        vipData.forEach(item => {
+          if(!item.checked) {
+            result.push(item)
+          }
+        })
+      } else {
+        result.vipData
+      }
       this.vipTable = result
     },
     teacherSalaryList(domain, rows) {
@@ -261,15 +267,49 @@ export default {
       } else {
         result = domain
       }
-      // console.log(result)
       this.musicGroupTable = result
     },
-    onVIPSave(row) { // vip保存
-      vipGroupSalarySet({
-        id: row.id,
-        offlineClassesSalary: row.offlineClassesSalary,
-        onlineClassesSalary: row.onlineClassesSalary
-      }).then(res => {
+    teacherSalaryMoney(rows) {
+      // 判断是否有数据
+      if(!rows || rows.length <= 0) return
+      let teamTable = this.teamTable
+      let result = []
+      teamTable.forEach(item => {
+        rows.forEach(c => {
+          if(item.courseScheduleType == c.courseScheduleType) {
+            item.checked = true
+            result.push({
+              mainTeacherSalary: c.mainTeacherSalary,
+              assistantTeacherSalary: c.assistantTeacherSalary,
+              courseScheduleType: c.courseScheduleType,
+              userId: this.teacherId,
+              settlementType: 'GRADIENT_SALARY'
+            })
+          }
+        })
+      })
+      if(result.length > 0) {
+        teamTable.forEach(item => {
+          if(!item.checked) {
+            result.push(item)
+          }
+        })
+      } else {
+        result = teamTable
+      }
+      this.teamTable = result
+    },
+    onVIPSave() { // vip保存
+      let checkStatus = true
+      this.vipTable.forEach(item => {
+        if(item.offlineClassesSalary < 0 && item.onlineClassesSalary < 0) {
+          this.$message('输入课酬不能为负数')
+          checkStatus = false
+        }
+      })
+      // 判断输入的值是否正确
+      if(!checkStatus) return false
+      vipGroupSalarySet(this.vipTable).then(res => {
         if(res.code == 200) {
           this.$message({
             message: '保存成功',
@@ -278,7 +318,7 @@ export default {
         }
       })
     },
-    onMusicGroupSave(row) {
+    onMusicGroupSave() {
       let musicGroupTable = this.musicGroupTable
       let checkStatus = true
       musicGroupTable.forEach(item => {
@@ -289,7 +329,6 @@ export default {
       })
       // 判断输入的值是否正确
       if(!checkStatus) return false
-      // return 
       teacherSalaryBatchUpset(musicGroupTable).then(res => {
         if(res.code == 200) {
           this.$message({
@@ -299,12 +338,18 @@ export default {
         }
       })
     },
-    onMusicGroupSave2(row) {
-      teacherSalaryBatchUpset([{
-        id: row.id,
-        mainTeacherSalary: row.mainTeacherSalary,
-        assistantTeacherSalary: row.assistantTeacherSalary
-      }]).then(res => {
+    onMusicGroupSave2() {
+      let teamTable = this.teamTable
+      let checkStatus = true
+      teamTable.forEach(item => {
+        if(item.assistantTeacherSalary < 0 || item.mainTeacherSalary < 0) {
+          this.$message('输入课酬不能为负数')
+          checkStatus = false
+        }
+      })
+      // 判断输入的值是否正确
+      if(!checkStatus) return false
+      teacherSalaryBatchUpset(teamTable).then(res => {
         if(res.code == 200) {
           this.$message({
             message: '保存成功',

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

@@ -34,8 +34,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="教学点1">
-                <el-input disabled v-model="topForm.teacherSchools[0]"></el-input>
+              <el-form-item label="教学点">
+                <el-input disabled v-model="topForm.teacherSchools"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -46,17 +46,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="教学点2">
-                <el-input disabled v-model="topForm.teacherSchools[1]"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="流动范围">
                 <el-input disabled v-model="topForm.flowOrganRange"></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="8">
               <el-form-item label="老师简介">
                 <el-input disabled type='textarea'
@@ -112,14 +105,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          
-          
-          
-          
-          
-          
-          
-          
         </el-form>
       </div>
       <div class="right">
@@ -139,9 +124,7 @@ export default {
   data () {
     return {
       teacherId: this.$route.query.teacherId,
-      topForm: {
-        teacherSchools: ["", ""]
-      }
+      topForm: {}
     }
   },
   mounted() {
@@ -153,6 +136,7 @@ export default {
         if(res.code == 200) {
           let tempData = res.data
           tempData.subjectName = this.joinArray(tempData.subjectName)
+          tempData.teacherSchools = this.joinArray(tempData.teacherSchools) // 教学点
           tempData.entryDate = this.formatTimer(tempData.entryDate)
           tempData.jobNature = this.jobNature(tempData.jobNature)
           tempData.birthdate = this.jobNature(tempData.birthdate)

src/views/teacherManager/teacherDetail/index.vue

@@ -60,8 +60,8 @@ export default {
   data () {
     return {
       teacherName: this.$route.query.teacherName,
-      activeName: "7",
-      activeStatus: [false, false, false, false, false, false, false, true]
+      activeName: "0",
+      activeStatus: [true, false, false, false, false, false, false, false]
     }
   },
   methods: {

src/views/vipClass/vipList.vue

@@ -206,7 +206,7 @@ export default {
       })
     },
     gotoBuildVip () {
-      this.$router.push({ path: '/vipBuild/baseVip' })
+      this.$router.push({ path: '/business/buildVip' })
     }
 
   },