05/20 16:40

缴费详情加 学生功能

dist/static/css/chunk-2fe1f76c.5a55cf51.css → dist/static/css/chunk-30b4ed8a.e9fce4b2.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}.infoMsg[data-v-49f8bc5c]{margin:30px 0;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;text-align:center}.infoMsg .title[data-v-49f8bc5c]{color:#999;font-size:14px;line-height:30px}.infoMsg .status[data-v-49f8bc5c]{font-size:20px}.infoMsg .left[data-v-49f8bc5c]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-49f8bc5c],.infoMsg .right[data-v-49f8bc5c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-49f8bc5c]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-49f8bc5c]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-49f8bc5c]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-49f8bc5c]{width:300px}.wrap[data-v-49f8bc5c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-49f8bc5c]{margin-right:20px}
+.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}.infoMsg[data-v-07556e73]{margin:30px 0;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;text-align:center}.infoMsg .title[data-v-07556e73]{color:#999;font-size:14px;line-height:30px}.infoMsg .status[data-v-07556e73]{font-size:20px}.infoMsg .left[data-v-07556e73]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-07556e73],.infoMsg .right[data-v-07556e73]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-07556e73]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-07556e73]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-07556e73]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-07556e73]{width:300px}.wrap[data-v-07556e73]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-07556e73]{margin-right:20px}

dist/static/css/chunk-33978e88.738cf396.css

@@ -0,0 +1 @@
+.floor[data-v-506ec06a]{padding-right:20px;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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-506ec06a]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-506ec06a],.floor .remove[data-v-506ec06a]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-506ec06a]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-506ec06a]{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}.studentMask .left[data-v-506ec06a]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-506ec06a]{margin-bottom:20px}.studentMask .left h4[data-v-506ec06a]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-506ec06a]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-506ec06a]{padding-left:10px;line-height:25px}.studentMask .right[data-v-506ec06a]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-506ec06a]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-506ec06a] .el-date-editor.el-input,.resetClassForm[data-v-506ec06a] .el-date-editor.el-input__inner{width:180px!important}[data-v-506ec06a] .el-date-editor.el-input,[data-v-506ec06a] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-50f21b80.4923d34c.css

@@ -1 +0,0 @@
-.floor[data-v-37e12977]{padding-right:20px;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:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-37e12977]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-37e12977],.floor .remove[data-v-37e12977]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-37e12977]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-37e12977]{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}.studentMask .left[data-v-37e12977]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-37e12977]{margin-bottom:20px}.studentMask .left h4[data-v-37e12977]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-37e12977]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-37e12977]{padding-left:10px;line-height:25px}.studentMask .right[data-v-37e12977]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-37e12977]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-37e12977] .el-date-editor.el-input,.resetClassForm[data-v-37e12977] .el-date-editor.el-input__inner{width:180px!important}[data-v-37e12977] .el-date-editor.el-input,[data-v-37e12977] .el-date-editor.el-input__inner{width:100px!important}

src/api/buildTeam.js

@@ -1152,6 +1152,22 @@ export function resetMusicGroupPaymentCalender (data) {
   })
 }
 
+// 查询可新增的学生
+export function queryCanAddStudent (data) {
+  return request({
+    url: api + '/studentManage/queryCanAddStudent',
+    method: 'get',
+    params: data
+  })
+}
+// 增加学生缴费 musicGroupPaymentCalenderDetail/add
+export function addMusicGroupPaymentCalenderStudent (data) {
+  return request({
+    url: api + '/musicGroupPaymentCalenderDetail/add',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}
 // 删除缴费周期 musicGroupPaymentCalender/del
 export function delMusicGroupPaymentCalender (data) {
   return request({

src/utils/vueFilter.js

@@ -489,11 +489,11 @@ Vue.filter('paymentType', value => {
   return template[value]
 })
 
-Vue.filter('paymentStatus', value => {
+Vue.filter('paymentListStatus', value => {
   let template = {
     0: "未开始",
-    1: "缴费中",
-    2: "已缴费",
+    1: "已开启",
+    2: "已结束",
   }
   return template[value]
 })

src/views/resetTeaming/components/resetPayList.vue

@@ -52,7 +52,7 @@
                          label="缴费状态">
           <template slot-scope="scope">
             <div>
-              {{scope.row.paymentStatus | paymentStatus}}
+              {{scope.row.paymentStatus | paymentListStatus}}
             </div>
           </template>
         </el-table-column>
@@ -85,6 +85,7 @@
                   @pagination="getList" />
     </div>
     <el-dialog :visible.sync="payVisible"
+               :close-on-click-modal="false"
                width="500px"
                :title="diTitle">
       <el-form :model="payForm"
@@ -145,7 +146,6 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicGroupPaymentCalender, delMusicGroupPaymentCalender } from "@/api/buildTeam";
-
 export default {
   components: { pagination },
   data () {

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -42,13 +42,12 @@
       </div>
     </div>
     <div class="m-core">
-
       <el-form :inline="true"
                :model="searchForm">
         <el-form-item>
           <el-input v-model.trim="searchForm.search"
                     @keyup.enter.native="search"
-                    placeholder='学生编号'></el-input>
+                    placeholder='学生编号,手机号'></el-input>
         </el-form-item>
         <el-form-item>
           <el-select v-model.trim="searchForm.subjectId"
@@ -90,6 +89,9 @@
         <div class="newBand"
              @click="startPay"
              v-permission="'musicGroupPaymentCalenderDetail/openPayment'">开启缴费</div>
+        <div class="newBand"
+             @click="addStudentBtn"
+             v-permission="'musicGroupPaymentCalenderDetail/add'">新增学生</div>
       </div>
 
       <div class="tableWrap">
@@ -121,6 +123,15 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           prop="studentId"
+                           label="手机号">
+            <template slot-scope="scope">
+              <div v-if="scope.row.sysUser">
+                {{scope.row.sysUser.phone}}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
                            prop="expectAmount"
                            label="预计缴费金额"></el-table-column>
           <el-table-column align="center"
@@ -233,6 +244,33 @@
                    @click="submitReset">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="studentVisible"
+               width="600">
+      <el-table :data="studentList"
+                ref='singleTable'
+                highlight-current-row
+                @current-change="handleCurrentChange">
+        <!-- <el-table-column type="selection"
+                         width="55">
+        </el-table-column> -->
+        <el-table-column property="userId"
+                         align="center"
+                         label="学员编号"></el-table-column>
+        <el-table-column property="name"
+                         align="center"
+                         label="学员姓名"></el-table-column>
+        <el-table-column property="phone"
+                         align="center"
+                         label="手机号"></el-table-column>
+      </el-table>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="cancleAdd">取 消</el-button>
+        <el-button type="primary"
+                   @click="submitAddStudent">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -241,7 +279,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import { findSound, getmusicGroupPaymentCalenderDetail, openMusicGroupPaymentCalenderDetailPayment, resetMusicGroupPaymentCalenderDetail, getMusicGroupPaymentCalenderDetail } from "@/api/buildTeam";
+import { findSound, getmusicGroupPaymentCalenderDetail, openMusicGroupPaymentCalenderDetailPayment, resetMusicGroupPaymentCalenderDetail, getMusicGroupPaymentCalenderDetail, queryCanAddStudent, addMusicGroupPaymentCalenderStudent } from "@/api/buildTeam";
 
 export default {
   components: { pagination },
@@ -264,6 +302,9 @@ export default {
       },
       payVisible: false,
       resetPayVisible: false,
+      studentVisible: false,
+      chioseStudent: null,
+      studentList: [],
       pickerOptions: {
         disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
@@ -355,6 +396,7 @@ export default {
       }
       this.search()
     },
+
     startPay () {
       if (this.activeChiose.length < 1) {
         this.$message.error('请至少选择一名学生')
@@ -414,6 +456,36 @@ export default {
           this.getList();
         }
       })
+    },
+    addStudentBtn () {
+      // 获取无缴费学员
+      queryCanAddStudent({ musicGroupId: this.teamid, musicGroupPaymentCalenderId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.studentList = res.data;
+          this.studentVisible = true;
+        }
+      })
+
+    },
+    handleCurrentChange (val) {
+      this.chioseStudent = val;
+    },
+    submitAddStudent () {
+      if (!this.chioseStudent) {
+        this.$message.error('请选择学生')
+        return
+      }
+      addMusicGroupPaymentCalenderStudent({ musicGroupPaymentCalenderId: this.id, userId: this.chioseStudent.userId }).then(res => {
+        if (res.code == 200) {
+          this.$message.success('添加成功')
+          this.studentVisible = false;
+          this.getList();
+        }
+      })
+    },
+    cancleAdd (row) {
+      this.$refs.singleTable.setCurrentRow(row);
+      this.studentVisible = false;
     }
   }, watch: {
     payVisible (val) {
@@ -423,7 +495,14 @@ export default {
         }
         this.$refs['payForm'].resetFields()
       }
-    }
+    },
+    resetPayVisible (val) {
+      if (!val) {
+        this.resetPayForm = {
+          momey: null
+        }
+      }
+    },
   }
 };
 </script>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -345,7 +345,7 @@
                  @click="payList.student.chiose='loop'">周期循环</div>
           </div>
         </div>
-        <p class="subTitle"
+        <!-- <p class="subTitle"
            v-if="payList.student.chiose == 'loop'&&teamStatus !='resetTeam'">按月缴费时，将在所选月份的1号的前一周提醒用户缴费操作，单次的缴费金额为当前列表「预计收费」的设置金额</p>
         <div class="chioseWrap"
              v-if="payList.student.chiose == 'loop'&&teamStatus !='resetTeam'">
@@ -366,7 +366,7 @@
             <el-checkbox :label="11">十一月</el-checkbox>
             <el-checkbox :label="12">十二月</el-checkbox>
           </el-checkbox-group>
-        </div>
+        </div> -->
       </div>
       <div class="btnWrap">
         <div class="nextBtn"

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

@@ -192,6 +192,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="助教老师"
+                      v-if=" newClassForm.type != 'HIGH_ONLINE'"
                       prop="teaching">
           <el-select placeholder="请选择助教老师"
                      v-model="newClassForm.teaching"

src/views/teamDetail/components/courseList.vue

@@ -224,6 +224,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="助教老师"
+                      v-if="maskForm.courseScheduleType != 'MUSIC_NETWORK'&&maskForm.courseScheduleType != 'HIGH_ONLINE'"
                       prop="assistant">
           <el-select v-model.trim="maskForm.assistant"
                      clearable
@@ -417,6 +418,8 @@ export default {
         { value: "HIGH", label: "基础技能课" },
         { value: "COMPREHENSIVE", label: "综合课" },
         { value: "CLASSROOM", label: "课堂课" },
+        { value: "HIGH_ONLINE", label: "线上基础技能课" },
+        { value: "MUSIC_NETWORK", label: "乐团网管课" },
       ],
       typeVisible: false,
       timerVisible: false,
@@ -444,7 +447,8 @@ export default {
         id: "",
         startTime: "",
         endTime: "",
-        type: ""
+        type: "",
+        courseScheduleType: null,
       },
       typeForm: {
         teacher: "",
@@ -605,6 +609,7 @@ export default {
     },
     resetClass (row) {
       this.maskForm.teacher = parseInt(row.masterTeacherId);
+      this.maskForm.courseScheduleType = row.courseScheduleType;
       // this.maskForm.type = row.courseScheduleType;
       this.maskForm.assistant = [];
       for (let i in row.teachingTeachers) {

src/views/teamDetail/components/resetClass.vue

@@ -315,6 +315,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="助教老师"
+                      v-if="activeType!='HIGH_ONLINE'&&activeType!='MUSIC_NETWORK'"
                       prop="assistant">
           <el-select v-model.trim="teacherForm.assistant"
                      filterable

src/views/teamDetail/components/studentList.vue

@@ -421,7 +421,7 @@
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="乐团网管课">
+        <!-- <el-form-item label="乐团网管课">
           <el-select v-model.trim="maskForm.muiscnetwork"
                      filterable
                      clearable
@@ -431,7 +431,7 @@
                        :value="item.id"
                        :label="item.name"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-divider>首缴订单信息</el-divider>
         <el-form-item label="课程费用"