Browse Source

1227 16:03

111
mo 5 năm trước cách đây
mục cha
commit
3424508c35

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-3e699cc0.b1174fc4.css → dist/static/css/chunk-41cff220.2ca06bb5.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.vipwrap[data-v-de5bbc76]{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:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-de5bbc76]{margin-right:20px}.resetClassForm[data-v-de5bbc76] .el-date-editor.el-input,.resetClassForm[data-v-de5bbc76] .el-date-editor.el-input__inner{width:180px!important}[data-v-de5bbc76] .el-date-editor.el-input,[data-v-de5bbc76] .el-date-editor.el-input__inner{width:100px!important}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.vipwrap[data-v-adf84bbc]{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:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-adf84bbc]{margin-right:20px}.resetClassForm[data-v-adf84bbc] .el-date-editor.el-input,.resetClassForm[data-v-adf84bbc] .el-date-editor.el-input__inner{width:180px!important}[data-v-adf84bbc] .el-date-editor.el-input,[data-v-adf84bbc] .el-date-editor.el-input__inner{width:100px!important}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/app.7f764d86.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-3e699cc0.b78845bb.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-41cff220.ff6a3c73.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-b1e176fc.8e4ffa36.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-b1e176fc.abdc8c73.js


+ 18 - 5
src/views/teamDetail/components/studentSignin.vue

@@ -21,8 +21,12 @@
                           end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label='课程名称'>
-          <el-input v-model="searchForm.courseName"></el-input>
+        <el-form-item label='班级名称'>
+          <el-select v-model="searchForm.className">
+            <el-option v-for='(item,index) in classList'
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label='学生名字'>
           <el-input v-model="searchForm.studentName"></el-input>
@@ -103,10 +107,12 @@ export default {
         times: [],
         courseName: '',
         studentName: '',
-        sign: ''
+        sign: '',
+        className: ''
       },
 
-      teamid: ''
+      teamid: '',
+      classList: []
     }
   },
   created () {
@@ -122,6 +128,11 @@ export default {
   mounted () {
     this.getList();
     // 获取乐团所有班级
+    getMusicGroupAllClass({ musicGroupId: this.teamid }).then(res => {
+      if (res.code == 200) {
+        this.classList = res.data;
+      }
+    })
   },
   methods: {
     search () {
@@ -166,7 +177,9 @@ export default {
       let userName = this.searchForm.studentName || null
       let signStatus = this.searchForm.sign || null
       let musicGroupId = this.teamid
-      getStudentRecord({ musicGroupId, page: this.rules.page, rows: this.rules.limit, startTime, endTime, courseScheduleName, userName, signStatus }).then(res => {
+      let classGroupId = this.searchForm.className || null
+
+      getStudentRecord({ musicGroupId, page: this.rules.page, rows: this.rules.limit, startTime, endTime, classGroupId, userName, signStatus }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;

+ 40 - 4
src/views/vipClass/vipReset.vue

@@ -144,6 +144,16 @@
                           }">
           </el-time-select>
         </el-form-item> -->
+        <el-form-item label="课程类型"
+                      prop="courseType">
+          <el-select clearable
+                     v-model="maskForm.teachMode">
+            <el-option label="线上课"
+                       value="ONLINE"></el-option>
+            <el-option label="线下课"
+                       value="OFFLINE"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="教学地点"
                       v-if='maskForm.teachMode == "OFFLINE"'>
           <el-select v-model="maskForm.address"
@@ -259,9 +269,9 @@
                       v-if='isaddCourse'>
           <el-input v-model="adjustmentForm.fee"></el-input>
         </el-form-item>
+        <!--  v-if='isaddCourse' -->
         <el-form-item label="课程类型"
-                      prop="courseType"
-                      v-if='isaddCourse'>
+                      prop="courseType">
           <el-select clearable
                      v-model="adjustmentForm.courseType">
             <el-option label="线上课"
@@ -270,6 +280,18 @@
                        value="OFFLINE"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="教学点"
+                      v-if='adjustmentForm.courseType == "OFFLINE"'
+                      prop="address">
+          <el-select v-model="adjustmentForm.address"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in schoolList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
+          </el-select>
+        </el-form-item>
         <br>
         <el-form-item label="排课起始时间"
                       prop="courseTime">
@@ -416,13 +438,15 @@ export default {
         checked: false,
         addCount: '',
         courseType: '',
-        fee: ''
+        fee: '',
+        address: ''
       },
       adjustmentRules: {
         courseTime: [{ required: true, message: '请选择开始时间' }],
         addCount: [{ required: true, message: '请输入加课次数' }],
         courseType: [{ required: true, message: '请选择课程类型' }],
-        fee: [{ required: true, message: '请输入费用' }]
+        fee: [{ required: true, message: '请输入费用' }],
+        address: [{ required: true, message: '选择教学点' }]
       },
       weekDateList: [
         { value: '1', label: '星期一' },
@@ -497,11 +521,16 @@ export default {
       this.courseVisible = false;
       this.$refs['maskForm'].resetFields()
     },
+    // 提交单次课程调整
     submitResetClass () {
       //   endClassTimeStr: this.maskForm.endTime,
+      if (this.maskForm.teachMode == 'ONLINE') {
+        this.maskForm.address = null;
+      }
       let obj = {
         startClassTimeStr: this.maskForm.startTime,
         id: this.maskForm.id,
+        teachMode: this.maskForm.teachMode,
         classDate: this.maskForm.date,
         schoolId: this.maskForm.address || null
       }
@@ -619,6 +648,7 @@ export default {
         }
       }
     },
+    // '批量调整
     adjustment () {
       this.adjustmentName = '批量调整'
       this.isaddCourse = false;
@@ -645,6 +675,12 @@ export default {
           obj.courseTimes = this.weekList;
           obj.holiday = this.adjustmentForm.checked;
           obj.vipGroupId = this.vipid;
+          obj.schoolId = this.adjustmentForm.address || null;
+          obj.teachMode = this.adjustmentForm.courseType || null;
+          if (this.adjustmentForm.courseType == 'ONLINE') {
+            this.adjustmentForm.address = null;
+            obj.schoolId = null;
+          }
           vipCourseAdjust(obj).then(res => {
             if (res.code == 200) {
               this.$message.success('恭喜您修改成功');

+ 2 - 2
vue.config.js

@@ -21,8 +21,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.27:8000' // 箭河
 // let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:18000' //勇哥
-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 = {
   /**

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác