1123 14:06

111

src/api/systemManage.js

@@ -194,12 +194,12 @@ export function courseScheduleRewardsAdd (data) {
 }
 
 // 修改
-export function courseScheduleRewardsUpdate(data) {
-    return request({
-        url: api + `/courseScheduleRewards/update`,
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function courseScheduleRewardsUpdate (data) {
+  return request({
+    url: api + `/courseScheduleRewards/update`,
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 分页查询热词列表
@@ -235,4 +235,13 @@ export function hotWordLabelManageDel (data) {
     url: api + `/hotWordLabelManage/del/${data}`,
     method: 'post'
   })
+}
+
+// 根据机构编号获取学校列表
+export function getSchool (data) {
+  return request({
+    url: api + `/school/queryByOrganId`,
+    method: 'get',
+    params: data
+  })
 }

src/api/vipSeting.js

@@ -192,7 +192,7 @@ export function resetVipClass (data) {
   return request({
     url: api + '/vipGroupManage/classStartDateAdjust',
     method: 'POST',
-    params: data
+    data: qs.stringify(data)
   })
 }
 

src/views/teamBuild/teamSeting/components/setClass.vue

@@ -291,7 +291,7 @@ export default {
     })
     getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
-        this.teacherForm.name = res.data.musicGroup.directorUserId
+        res.data.musicGroup.directorUserId ? this.teacherForm.name = '' : this.teacherForm.name = res.data.musicGroup.directorUserId
       }
     })
 

src/views/teamDetail/components/resetClass.vue

@@ -261,11 +261,12 @@
                       prop="assistant">
           <el-select v-model="teacherForm.assistant"
                      filterable
+                     @change="setAssistant"
                      multiple>
-            <el-option v-for="(item,index) in teacherList"
+            <el-option v-for="(item,index) in cooperationList"
                        :key="index"
-                       :label="item.name"
-                       :value="item.userId"></el-option>
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="课程类型"
@@ -354,7 +355,7 @@
   </div>
 </template>
 <script>
-import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan } from '@/api/buildTeam'
+import { getAllClass, getAllSignClassandTeacher, getAllSignClass, removeSingleClass, getNoClassStudentAll, findSound, teamSoundStudent, findMusicGroupClassTeacher, revisionClassGroup, revisionAddClassGroup, getEmployeeOrgan, getTeacher } from '@/api/buildTeam'
 import { getClassAllStudent, removeStudents, addStudents } from '@/api/studentManager'
 import axios from 'axios'
 import qs from 'qs'
@@ -427,7 +428,8 @@ export default {
         { value: 'MIX', label: '合奏班' },
         { value: 'HIGH', label: '基础技能班' },
         { value: 'SNAP', label: '临时班' },
-      ]
+      ],
+      cooperationList: []
     }
   },
   created () {
@@ -470,13 +472,20 @@ export default {
       }
     })
     // 获取分部所有老师
-    getEmployeeOrgan().then(res => {
+    getTeacher().then(res => {
       if (res.code == 200) {
-
+        this.cooperationList = res.data;
       }
     })
   },
   methods: {
+    setAssistant (val) {
+      for (let i in val) {
+        if (val[i] == this.teacherForm.coreTeacher) {
+          val.splice(i, 1);
+        }
+      }
+    },
     changeMixClass (val) {
       // 根据合奏班id获取合奏班下的所有单技班
       this.getList(val);

src/views/teamDetail/components/studentList.vue

@@ -34,7 +34,7 @@
                      value="NORMAL"></el-option>
           <el-option label="请假"
                      value="LEAVE"></el-option>
-          <el-option label="退班"
+          <el-option label="退团"
                      value="QUIT"></el-option>
         </el-select>
       </el-form-item>
@@ -145,13 +145,12 @@
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">
-            <div>
-
-              <el-popover placement="top"
+            <div v-if="scope.row.studentStatus != 'QUIT'">
+              <!-- <el-popover placement="top"
                           v-model="scope.row.typeVisible">
-                <!-- <p style=" text-align: center;margin: 10px 0;">是否退团</p> -->
                 <el-input v-model="remark"
                           placeholder="请输入退团原因"></el-input>
+
                 <el-button type="text"
                            slot='reference'
                            class='chiose'>
@@ -165,7 +164,9 @@
                              size="mini"
                              @click="chioseType(scope.row)">确定</el-button>
                 </div>
-              </el-popover>
+              </el-popover> -->
+              <el-button type='text'
+                         @click="quieTeamMask(scope.row)">退团</el-button>
               <el-button type="text"
                          @click="lookClass(scope.row)">查看班级</el-button>
             </div>
@@ -370,6 +371,44 @@
         </el-form-item>
       </el-form>
     </el-dialog>
+    <!-- 退团弹窗 -->
+    <el-dialog title="退团信息确认"
+               width="640px"
+               :visible.sync="quitVisible">
+      <el-form :model="quitForm">
+        <el-form-item label="退还课程费用"
+                      prop="isRefundCourseFee">
+          <el-radio v-model="quitForm.isRefundCourseFee"
+                    :label="true">是</el-radio>
+          <el-radio v-model="quitForm.isRefundCourseFee"
+                    :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="退还乐器费用"
+                      prop="isRefundInstrumentFee">
+          <el-radio v-model="quitForm.isRefundInstrumentFee"
+                    :label="true">是</el-radio>
+          <el-radio v-model="quitForm.isRefundInstrumentFee"
+                    :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="退还教辅费用"
+                      prop="isRefundTeachingAssistantsFee">
+          <el-radio v-model="quitForm.isRefundTeachingAssistantsFee"
+                    :label="true">是</el-radio>
+          <el-radio v-model="quitForm.isRefundTeachingAssistantsFee"
+                    :label="false">否</el-radio>
+        </el-form-item>
+        <el-form-item label="退团原因">
+          <el-input type="textarea"
+                    v-model="quitForm.reason"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="quitVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="chioseType">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -385,6 +424,7 @@ export default {
   },
   data () {
     return {
+      quitVisible: false, // 退团信息确认的弹窗
       studentClassVisible: false, // 学员所在班级弹窗
       addStudentVisible: false, //新增学员弹窗
       topFrom: { // 顶部的禁选框集合
@@ -400,6 +440,12 @@ export default {
         isPay: '', // 是否缴费
 
       },
+      quitForm: { // 退团信息确认
+        isRefundCourseFee: null,
+        isRefundInstrumentFee: null,
+        isRefundTeachingAssistantsFee: null,
+        reason: ''
+      },
       classMask: {
         studentName: ''
       },
@@ -462,7 +508,8 @@ export default {
 
       },
       INSTRUMENTLIST: [], // 乐器列表
-      ACCESSORIESLIST: [] // 辅件列表
+      ACCESSORIESLIST: [], // 辅件列表
+      activeRow: null
     }
   },
   components: {
@@ -529,17 +576,36 @@ export default {
         }
       })
     },
-    chioseType (row) {
-      row.userId;
+    chioseType () {
+      let row = this.activeRow;
+      /**
+       * quitForm: { // 退团信息确认
+        isRefundCourseFee: null,
+        isRefundInstrumentFee: null,
+        isRefundTeachingAssistantsFee: null,
+        reason: ''
+      },
+       * 
+       */
       // 发请求 退团
-      StudentQuit({ musicGroupId: this.teamid, userId: row.userId, reason: this.remark }).then(res => {
-        this.remark = '';
+      StudentQuit({        musicGroupId: this.teamid, userId: row.userId,
+        reason: this.quitForm.reason,
+        isRefundCourseFee: this.quitForm.isRefundCourseFee,
+        isRefundInstrumentFee: this.quitForm.isRefundInstrumentFee,
+        isRefundTeachingAssistantsFee: this.quitForm.isRefundTeachingAssistantsFee      }).then(res => {
+        this.quitForm = { // 退团信息确认
+          isRefundCourseFee: null,
+          isRefundInstrumentFee: null,
+          isRefundTeachingAssistantsFee: null,
+          reason: ''
+        }
         if (res.code == 200) {
           this.$message.success('退团成功')
           this.getList();
+          this.quitVisible = false;
         }
       })
-      row.typeVisible = false;
+      // row.typeVisible = false;
     },
     //
     addStudent () {
@@ -651,6 +717,10 @@ export default {
         }
       })
     },
+    quieTeamMask (row) {
+      this.activeRow = row;
+      this.quitVisible = true;
+    },
     checkPhone (val) {
       console.log(val)
       var regu = /^1[3456789]\d{9}$/;

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -179,11 +179,12 @@
         </el-form-item>
         <!-- 新增教学点 -->
         <el-form-item label="教学点"
+                      prop="cooperation"
                       v-if='activeRow&&activeRow.teachMode == "OFFLINE"'>
           <el-select v-model="maskForm.cooperation">
             <el-option v-for='(item,index) in cooperationList'
                        :key="index"
-                       :value="id"
+                       :value="item.id"
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>
@@ -198,7 +199,7 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { queryByOrganId } from '@/api/systemManage'
+import { getSchool } from '@/api/systemManage'
 import { findVipGroupTeachingRecord, getStudyStudents, resetVipClass } from '@/api/vipSeting'
 export default {
   components: { pagination },
@@ -252,7 +253,7 @@ export default {
     // 获取vip教学记录
     this.getList()
     // 获取分部教学点
-    queryByOrganId({ organId: this.$store.getters.organ }).then(res => {
+    getSchool({ organId: this.$store.getters.organ }).then(res => {
       if (res.code == 200) {
         this.cooperationList = res.data;
       }
@@ -316,11 +317,12 @@ export default {
 
     },
     resetCourse () {
-      console.log(this.maskForm.timer);
+
       // 点击弹窗效验
       this.$refs['maskForm'].validate(valid => {
         if (valid) {
           // 效验成功
+          console.log(this.maskForm.cooperation)
           resetVipClass({ id: this.activeId, classDate: this.maskForm.date, startClassTime: this.maskForm.date + ' ' + this.maskForm.startTime, endClassTime: this.maskForm.date + ' ' + this.maskForm.endTime, schoolId: this.maskForm.cooperation }).then(
             res => {
               if (res.code == 200) {

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '大雅后台管理系统' // page title
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8080' // 乔
+// let target = 'http://47.99.212.176:8000' // 测试服
+let target = 'http://192.168.3.48:8080' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**