修改api路径

src/api/silder.js

@@ -5,7 +5,7 @@ import qs from 'qs'
 // 增加菜单栏
 export function addSilder (data) {
   return request({
-    url: '/api-auth/menu/add',
+    url: '/auth-server/menu/add',
     method: 'put',
     data
   })
@@ -14,7 +14,7 @@ export function addSilder (data) {
 // 查询菜单栏
 export function getSilder (data) {
   return request({
-    url: '/api-auth/menu/findByUser',
+    url: '/auth-server/menu/findByUser',
     method: 'get',
     params: data
   })
@@ -22,14 +22,14 @@ export function getSilder (data) {
 // 删除菜单
 export function deleteSilder (id) {
   return request({
-    url: `/api-auth/menu/del/${id}`,
+    url: `/auth-server/menu/del/${id}`,
     method: 'DELETE'
   })
 }
 // 修改菜单
 export function resetSilder (data) {
   return request({
-    url: `/api-auth//menu/update`,
+    url: `/auth-server//menu/update`,
     method: 'PUT',
     data
   })

src/api/systemManage.js

@@ -107,7 +107,7 @@ export function employeeUpdate(data) {
 // 获取用户角色列表
 export function getUserRole(data) {
     return request({
-        url: `/api-auth/role/queryPage`,
+        url: `/auth-server/role/queryPage`,
         method: 'get',
         params: data
     })
@@ -125,7 +125,7 @@ export function employeeOperate(data) {
 // 分页查询角色列表
 export function roleQueryPage(data) {
     return request({
-        url: `/api-auth/role/queryPage`,
+        url: `/auth-server/role/queryPage`,
         method: 'get',
         params: data
     })
@@ -134,7 +134,7 @@ export function roleQueryPage(data) {
 // 根据角色编号查询拥有的菜单列表
 export function roleGetMenus(data) {
     return request({
-        url: `/api-auth/role/getMenus`,
+        url: `/auth-server/role/getMenus`,
         method: 'get',
         params: data
     })
@@ -143,7 +143,7 @@ export function roleGetMenus(data) {
 // 根据权限id查询角色
 export function getRoleInfo(data) {
     return request({
-        url: `/api-auth/role/${data.id}`,
+        url: `/auth-server/role/${data.id}`,
         method: 'get'
     })
 }
@@ -151,7 +151,7 @@ export function getRoleInfo(data) {
 // 修改角色
 export function roleUpdate(data) {
     return request({
-        url: `/api-auth/role/update`,
+        url: `/auth-server/role/update`,
         method: 'post',
         data: data
     })
@@ -160,7 +160,7 @@ export function roleUpdate(data) {
 // 添加角色
 export function roleAdd(data) {
     return request({
-        url: `/api-auth/role/add`,
+        url: `/auth-server/role/add`,
         method: 'post',
         data: data
     })

src/api/teacherManager.js

@@ -117,4 +117,13 @@ export function teacherSalaryBatchUpset(data) {
         method: 'post',
         data: data
     })
+}
+
+// 课酬调整
+export function updateTeacherCoursesSalary(data) {
+    return request({
+        url: '/web-server/course/updateTeacherCoursesSalary',
+        method: 'post',
+        data: data
+    })
 }

src/api/user.js

@@ -3,7 +3,7 @@ import qs from 'qs'
 
 export function login (data) {
   return request({
-    url: '/api-auth/usernameLogin',
+    url: '/auth-server/usernameLogin',
     // url: '/user/login',
     method: 'post',
     data: qs.stringify(data)
@@ -12,14 +12,14 @@ export function login (data) {
 
 export function getInfo () {
   return request({
-    url: '/api-auth/api/queryUserInfo',
+    url: '/auth-server/api/queryUserInfo',
     method: 'get'
   })
 }
 // 登出
 export function logout (data) {
   return request({
-    url: '/api-auth/exit',
+    url: '/auth-server/exit',
     method: 'post',
     data: qs.stringify(data)
   })

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

@@ -137,23 +137,25 @@ export default {
         if(res.code == 200 && res.data.length > 0) {
           let domain = []
           res.data.forEach(item => {
-              let paramName
+              let courseScheduleType
               if(item.paramName == 'sigle_gradient_settlement_rule') {
-                  paramName = "SINGLE"
+                  courseScheduleType = "SINGLE"
               }
               if(item.paramName == "max_gradient_settlement_rule") {
-                  paramName = "MIX"
+                  courseScheduleType = "MIX"
               }
               if(item.paramName == "high_gradient_settlement_rule") {
-                  paramName = "HIGH"
+                  courseScheduleType = "HIGH"
               }
               if(item.paranValue) {
                 let value = JSON.parse(item.paranValue)
                 value.forEach(type => {
                   domain.push({
-                    paramName: paramName,
-                    max: type.max,
-                    min: type.min
+                    courseScheduleType: courseScheduleType,
+                    durationMax: type.max,
+                    durationMin: type.min,
+                    mainTeacherSalary: 0,
+                    assistantTeacherSalary: 0
                   })
                 })
               }

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

@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button @click="settlementStatus = true" type="text">课酬调整</el-button>
+            <el-button @click="onUpdate(scope.row)" type="text">课酬调整</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -86,16 +86,16 @@
     </div>
     <el-dialog title="课酬调整" :visible.sync="settlementStatus" @close="onFormClose('ruleForm')" width="500px">
       <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="课酬调整为" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" type="number" autocomplete="off"></el-input>
+        <el-form-item label="课酬调整为" prop="salary" :label-width="formLabelWidth">
+          <el-input v-model="form.salary" type="number" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="课时补贴调整为" prop="name" :label-width="formLabelWidth">
-          <el-input v-model="form.name" type="number" autocomplete="off"></el-input>
+        <el-form-item label="课时补贴调整为" prop="subsidy" :label-width="formLabelWidth">
+          <el-input v-model="form.subsidy" type="number" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="调整范围" prop="name" :label-width="formLabelWidth">
-          <el-radio-group v-model="form.radio">
-            <el-radio :label="3">仅限本次</el-radio>
-            <el-radio :label="6">之后剩余课次</el-radio>
+        <el-form-item label="调整范围" prop="scope" :label-width="formLabelWidth">
+          <el-radio-group v-model="form.scope">
+            <el-radio label="one">仅限本次</el-radio>
+            <el-radio label="all">之后剩余课次</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -107,7 +107,7 @@
   </div>
 </template>
 <script>
-import { teacherQueryCloses, sumTeacherNoPay } from '@/api/teacherManager'
+import { teacherQueryCloses, sumTeacherNoPay, updateTeacherCoursesSalary } from '@/api/teacherManager'
 import pagination from '@/components/Pagination/index'
 import store from '@/store'
 import { courseType, attendance } from '@/utils/searchArray'
@@ -140,12 +140,15 @@ export default {
       formLabelWidth: '120px',
       settlementStatus: false,
       form: {
-        name: null,
-        radio: 3,
+        courseScheduleId: null,
+        salary: null,
+        subsidy: null,
+        scope: 'one',
       },
       rules: {
-        name: [{required: true, message: '请输入分部名称', trigger: 'blur'}],
-        radio: [{required: true, message: '请选择调整范围', trigger: 'change'}],
+        salary: [{required: true, message: '请输入课酬', trigger: 'blur'}],
+        subsidy: [{required: true, message: '请输入课时补贴', trigger: 'blur'}],
+        scope: [{required: true, message: '请选择调整范围', trigger: 'change'}],
       }
     }
   },
@@ -161,19 +164,10 @@ export default {
     onSettlementSubmit(formName) {
       this.$refs[formName].validate(valid => {
         if(!valid) return
-        this.form.areaId = this.form.city
-        if(this.formActionTitle == 'create') {
-          if(this.form.id) { // 判断有没有Id，如果有则删除
-            delete this.form.id
-          }
-          branchAdd(this.form).then(res => {
-            this.messageTips('添加', res)
-          })
-        } else if(this.formActionTitle == 'update') {
-          branchUpdate(this.form).then(res => {
-            this.messageTips('修改', res)
-          })
-        }
+        this.form.teacherId = this.teacherId
+        updateTeacherCoursesSalary(this.form).then(res => {
+          this.messageTips('修改', res)
+        })
       })
     },
     messageTips(title, res) {
@@ -212,6 +206,10 @@ export default {
     onFormClose(formName) { // 关闭弹窗重置验证
       this.$refs[formName].resetFields()
     },
+    onUpdate(row) {
+      this.form.courseScheduleId = row.courseScheduleId
+      this.settlementStatus = true
+    },
     onReSet() { 
       this.courseDate = null
       this.searchForm = {