Pārlūkot izejas kodu

还剩学员管理 和班级管理

1
mo 4 gadi atpakaļ
vecāks
revīzija
1d442cc57d

+ 5 - 5
src/constant/index.js

@@ -226,18 +226,18 @@ export const packageStatus = {
 }
 
 export const musicGroupType = {
+  DRAFT: '编辑中',
+  AUDIT: '审核中',
+  PRE_APPLY:'预报名中',
+  PRE_BUILD_FEE:'创建缴费中',
+  FEE_AUDIT:'费用审核中',
   APPLY: "报名中",
   PAY: "缴费中",
   PREPARE: "筹备中",
   PROGRESS: "进行中",
   CANCELED: '取消',
   PAUSE: '暂停',
-  AUDIT: '审核中',
-  DRAFT: '编辑中',
   AUDIT_FAILED: '审核失败',
-  PRE_APPLY:'预报名中',
-  PRE_BUILD_FEE:'创建缴费中',
-  FEE_AUDIT:'费用审核中',
   CLOSE:'关闭'
 }
 export const gradeType = {

+ 1 - 1
src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus, } from '../constant'
+import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,musicGroupType } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "声部课", value: "SINGLE" },

+ 2 - 2
src/views/resetTeaming/components/resetPayList.vue

@@ -482,9 +482,9 @@ export default {
       }
     },
     teamStatus () {
-      let type = this.$route.query.type;
+      // let type = this.$route.query.type;
       let team_status = this.$route.query.team_status
-      return type == 'teamDraft' || type == 'resetTeam' || type == 'PRE_BUILD_FEE' || team_status == 'PRE_BUILD_FEE'
+      return team_status == 'PRE_BUILD_FEE' || team_status =='PROGRESS'
     }
   },
   // activated () {

+ 1 - 1
src/views/resetTeaming/components/resetPayListSchool.vue

@@ -507,7 +507,7 @@ export default {
     teamStatus () {
       let type = this.$route.query.type;
            let team_status = this.$route.query.team_status
-      return type == 'teamDraft' || type == 'resetTeam' || type == 'PRE_BUILD_FEE' || team_status == 'PRE_BUILD_FEE'
+      return team_status == 'PRE_BUILD_FEE' || team_status =='PROGRESS'
     }
   },
   // activated () {

+ 1 - 1
src/views/resetTeaming/index.vue

@@ -281,7 +281,7 @@ export default {
   font-weight: bold;
   position: absolute;
   right: 40px;
-  top: -33px;
+  top: -55px;
   img {
     width: 36px;
     height: 36px;

+ 14 - 218
src/views/teamBuild/components/teamBaseInfo.vue

@@ -1,124 +1,6 @@
 <template>
   <div class="base-container">
-    <div class="topFunction">
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-        "
-        v-if="
-          team_status == 'PAY' ||
-          team_status == 'APPLY' ||
-          team_status == 'PROGRESS' ||
-          team_status == 'PREPARE'
-        "
-      >
-        <!-- <h2> -->
-        <!-- + '报名详情' -->
-        <!-- <el-page-header @back="onCancel" :content="teamName">
-              </el-page-header> -->
-        <!-- </h2> -->
 
-        <div class="btnList">
-          <!-- <div class='newBand close'
-               v-permission="'musicGroup/cancelMusicGroup'"
-               @click="onClose">停止乐团</div>   v-show="status == 'APPLY'"-->
-          <div
-            class="newBand"
-            @click="payStart"
-            v-permission="'musicGroup/openPay'"
-            v-if="team_status == 'APPLY'"
-          >
-            开始缴费
-          </div>
-          <!-- v-show="status=='PAY'" -->
-          <div
-            class="newBand"
-            v-permission="'musicGroup/found'"
-            @click="onGoHome"
-            v-if="team_status == 'APPLY' || team_status == 'PAY'"
-          >
-            确认开团
-          </div>
-          <div
-            class="newBand"
-            v-permission="'musicGroup/extensionPayment'"
-            @click="extendTime(true)"
-            v-show="
-              team_status == 'PAY' ||
-              team_status == 'PROGRESS' ||
-              team_status == 'PREPARE'
-            "
-          >
-            延长缴费
-          </div>
-          <div
-              class="newBand"
-              v-permission="'musicGroup/extensionApplyExpireDate'"
-              @click="extendTime(false)"
-              v-show="
-                team_status == 'PAY' ||
-                team_status == 'APPLY' ||
-                team_status == 'PROGRESS' ||
-                team_status == 'PREPARE'
-              "
-            >
-              延长报名
-            </div>
-          <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
-          <div class="newBand" @click="onCreateQRCode('rePayment')">
-            报名链接(无乐器)
-          </div>
-          <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
-          <!-- <div
-              class="newBand"
-              v-show="rightList.length > 0"
-              v-permission="
-                getFullPermission(
-                  'studentRegistration/queryStudentApplyDetailExport'
-                )
-              "
-              @click="onDownLoadExecl"
-            >
-              报表导出
-            </div> -->
-          <!-- <auth
-              :auths="
-                'studentRegistration/queryPreApplyList'
-              "
-            >
-              <div
-                class="newBand"
-                style="margin-right: 0"
-                @click="forecastVisible = true"
-              >
-                预报名名单
-              </div>
-            </auth> -->
-          <!--    v-permission="getFullPermission('musicGroup/addMusicGroupRegs')" -->
-          <div
-            class="newBand"
-            v-permission="'musicGroup/addMusicGroupRegs'"
-            @click="mergeVisible = true"
-            v-show="team_status == 'PAY' || team_status == 'APPLY'"
-          >
-            合并学员
-          </div>
-        </div>
-        <p
-          style="margin-bottom: 15px; font-size: 18px; font-weight: 400"
-          v-if="
-            team_status == 'PAY' ||
-            team_status == 'PROGRESS' ||
-            team_status == 'PREPARE'
-          "
-        >
-          <!-- 报名截止时间:{{ applyExpireDate | formatTimer }} -->
-          缴费截止时间:{{ paymentExpireDate | formatTimer }}
-        </p>
-      </div>
-    </div>
     <div class="banseLeft">
       <div class="head">乐团基本信息:</div>
       <!-- <div class="num">乐团编号:dywh01</div> -->
@@ -467,93 +349,7 @@
         </div> -->
       </div>
     </div>
-    <el-dialog title="选择合并乐团" :visible.sync="mergeVisible" width="950px">
-      <mergeMusic
-        v-if="mergeVisible"
-        style="padding: 0 20px"
-        :organId="organId"
-        @close="mergeVisible = false"
-        @submited="gotoStudentList"
-      />
-    </el-dialog>
-    <el-dialog
-      title="开始缴费"
-      :visible.sync="paymentStatus"
-      width="400px"
-      destroy-on-close
-    >
-      <el-form
-        ref="paymentForm"
-        class="paymentForm"
-        :model="paymentForm"
-        :rules="paymentRules"
-      >
-        <el-form-item label="请设置缴费截止日期" prop="paymentExpireDate">
-          <el-date-picker
-            v-model.trim="paymentForm.paymentExpireDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :picker-options="payDate()"
-            style="width: 100%"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="paymentStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onStartPayment('paymentForm')"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
-    <el-dialog
-      :title="!isPay ? '延长报名' : '延长缴费'"
-      :visible.sync="extendPaymentStatus"
-      destroy-on-close
-      width="400px"
-    >
-      <el-form :model="extendForm" ref="extendForm" :rules="extendRule">
-        <el-form-item v-if="isPay" label="延长缴费时间" prop="expireDate">
-          <el-date-picker
-            v-model.trim="extendForm.expireDate"
-            value-format="yyyy-MM-dd"
-            type="date"
-            :picker-options="{
-              firstDayOfWeek: 1,
-            }"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="延长报名时间" v-else prop="expireDate">
-          <el-date-picker
-            v-model.trim="extendForm.expireDate"
-            value-format="yyyy-MM-dd"
-            type="date"
-            :picker-options="applyDate"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="extendPaymentStatus = false">取 消</el-button>
-        <el-button
-          type="primary"
-          v-if="isPay"
-          @click="onExtendPayment('extendForm', isPay)"
-          >确 定</el-button
-        >
-        <el-button
-          v-else
-          type="primary"
-          @click="onExtendPayment('extendForm', isPay)"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
-    <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
+
   </div>
 </template>
 <script>
@@ -566,7 +362,8 @@ import {
   musicGroupOpenPay,
   extensionPayment,
    extensionApplyExpire,
-  findUserByRole
+  findUserByRole,
+  getTeacher
 } from "@/api/buildTeam";
 import { findTechnician } from "@/api/repairManager";
 import dayjs from "dayjs";
@@ -635,12 +432,15 @@ export default {
       basdisabled: false,
       // 整合报名中
       paymentExpireDate: "",
+         applyExpireDate:null,
       mergeVisible: false,
       team_status: "",
       paymentNum: 0,
       paymentStatus: false,
+
       paymentForm: {
         paymentExpireDate: null,
+
         // feeType: null
       },
       paymentRules: {
@@ -712,6 +512,7 @@ export default {
   deactivated() {},
   beforeDestroy() {
     this.topFrom.paymentExpireDate = this.paymentExpireDate;
+    console.log( this.topFrom.paymentExpireDate )
     sessionStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
   },
 
@@ -797,6 +598,9 @@ export default {
           });
         } else {
           this.topFrom = sotrage;
+          this.applyExpireDate = sotrage.time
+          this.paymentExpireDate = Storage.paymentExpireDate
+          console.log( sotrage,this.applyExpireDate,this.paymentExpireDate)
           if (this.topFrom.section) {
             // 获取员工
              this.getBaseList(this.topFrom.section)
@@ -1232,6 +1036,7 @@ export default {
                 ? res.data.musicGroup.feeType
                 : null;
               this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
+              this.applyExpireDate = res.data.musicGroup.applyExpireDate;
     }
   },
   computed: {
@@ -1405,18 +1210,9 @@ export default {
   }
 }
 </style>
-<style lang="scss" scoped>
-.btnList {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-items: center;
-  flex-wrap: wrap;
-  & > div {
-    margin-right: 15px;
-    margin-bottom: 10px;
-  }
-}
+<style scoped lang="scss">
+
+
 /deep/.el-date-editor {
   width: 180px !important;
 }

+ 0 - 58
src/views/teamBuild/signupList.vue

@@ -655,64 +655,6 @@
         @close="visitVisiable = false"
         @submited="getList"
       />
-      <!-- <el-form
-        :model="visitForm"
-        label-width="120px"
-        label-position="right"
-        ref="visitForm"
-        :rules="visitRules"
-      >
-        <el-form-item label="学生姓名">
-          <p>{{ visitForm.studentName }}</p>
-        </el-form-item>
-        <el-form-item label="回访类型" prop="visitType">
-          <el-cascader
-            expand-trigger="hover"
-            clearable
-            placeholder="请选择回访类型"
-            :options="visitChiose"
-            @change="handleChange"
-            style="width: 220px !important"
-            v-model="visitForm.visitType"
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="回访日期" prop="visitTime">
-          <el-date-picker
-            v-model.trim="visitForm.visitTime"
-            align="right"
-            style="width: 220px !important"
-            type="date"
-            placeholder="选择日期"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="学员情况" prop="overview">
-          <el-input
-            type="textarea"
-            v-model="visitForm.overview"
-            style="width: 80% !important"
-            :rows="3"
-            maxlength="50"
-            show-word-limit
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="家长反馈" prop="feedback">
-          <el-input
-            type="textarea"
-            v-model="visitForm.feedback"
-            style="width: 80% !important"
-            :rows="3"
-            maxlength="50"
-            show-word-limit
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visitVisiable = false">取 消</el-button>
-        <el-button type="primary" @click="submitAddVisit">确 定</el-button>
-      </span> -->
     </el-dialog>
     <el-dialog
       title="更改声部"

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 656 - 188
src/views/teamDetail/components/studentList.vue


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels