提交修复

1

src/views/teamBuild/signupList.vue

@@ -3,13 +3,20 @@
     <div class="topWrap">
       <div>
         <div style="display: flex; justify-content: space-between">
-          <div style="display:flex;margin-bottom: 15px; font-size: 18px; font-weight: 400">
-            <p style="margin-right:10px" v-if="applyExpireDate">
+          <div
+            style="
+              display: flex;
+              margin-bottom: 15px;
+              font-size: 18px;
+              font-weight: 400;
+            "
+          >
+            <p style="margin-right: 10px" v-if="applyExpireDate">
               报名截止时间:{{ applyExpireDate | formatTimer }}
             </p>
-            <p v-if="paymentExpireDate">缴费截止时间:{{
-                paymentExpireDate | formatTimer
-              }}</p>
+            <p v-if="paymentExpireDate">
+              缴费截止时间:{{ paymentExpireDate | formatTimer }}
+            </p>
           </div>
         </div>
 
@@ -57,12 +64,19 @@
           >
             延长报名
           </div>
-          <div class="newBand" @click="onCreateQRCode('payment')"   v-show="
+          <div
+            class="newBand"
+            @click="onCreateQRCode('payment')"
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
-            ">报名链接</div>
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
+            "
+          >
+            报名链接
+          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
@@ -86,11 +100,12 @@
             class="newBand"
             v-permission="'musicGroup/addMusicGroupRegs'"
             @click="mergeVisible = true"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             合并学员
@@ -99,11 +114,12 @@
             class="newBand"
             style="background-color: #f97215; border: 1px solid #f97215"
             @click="onCreateQRCode('rePayment')"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             报名链接（无乐器）
@@ -192,6 +208,29 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.paymentStatus"
+            clearable
+            filterable
+            placeholder="报名缴费"
+          >
+            <el-option label="未开启缴费" value="0"></el-option>
+            <el-option label="开启缴费" value="1"></el-option>
+            <el-option label="已缴费" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.visited"
+            clearable
+            filterable
+            placeholder="是否回访"
+          >
+            <el-option label="否" value="false"></el-option>
+            <el-option label="是" value="true"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -234,12 +273,17 @@
           v-permission="'musicGroup/updateExpectedStudentNum'"
           style="margin-right: 20px; margin-top: 20px"
         >
-          <el-button v-show="!isEdit&&(
-              status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')
-            " @click="isEdit = true">编辑</el-button>
+          <el-button
+            v-show="
+              !isEdit &&
+              (status == 'PAY' ||
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE')
+            "
+            @click="isEdit = true"
+            >编辑</el-button
+          >
           <el-button v-show="isEdit" @click="saveIsEdit">保存</el-button>
         </div>
       </div>
@@ -298,6 +342,15 @@
           </el-table-column>
           <el-table-column label="联系电话" prop="parentsPhone" align="center">
           </el-table-column>
+
+          <el-table-column label="是否回访" prop="paymentStatus" align="center">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.visitNum ? "是" : "否" }}
+              </div>
+            </template>
+          </el-table-column>
+          <!-- visited -->
           <!-- v-show='status == "PAY"' -->
           <el-table-column
             label="报名缴费状态"
@@ -311,23 +364,24 @@
               </div>
             </template>
           </el-table-column>
+
           <el-table-column
             label="操作"
             fixed="right"
             width="240"
             align="center"
-             v-if="
+            v-if="
               status == 'PAY' ||
               status == 'APPLY' ||
               status == 'PROGRESS' ||
               status == 'PREPARE'
             "
           >
-          <!--  v-show="
+            <!--  v-show="
               status == 'PAY' || status == 'PROGRESS' || status == 'PREPARE' || status=='APPLY'
             " -->
             <template slot-scope="scope">
-              <div  >
+              <div>
                 <auth :auths="'studentRegistration/batchUpdateSubject'">
                   <el-button
                     type="text"
@@ -374,7 +428,7 @@
                     >退团</el-button
                   >
                 </auth>
-                <auth :auths="'visit/add/teamSignupList'">
+                <auth :auths="'visit/add/teamSignupList'" v-if=" scope.row.visitNum<=0">
                   <el-button type="text" @click="addVisit(scope.row)"
                     >新增回访</el-button
                   >
@@ -703,7 +757,7 @@ import {
   studentApplyDetailExport,
   StudentQuit,
   getMusicGroupGradeList,
-  checkCanReg
+  checkCanReg,
 } from "@/api/buildTeam";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
@@ -748,6 +802,8 @@ export default {
         subject: "", // 专业
         isAllowAdjust: "", // 是否允许调剂
         currentGrade: null, // 入学年级
+        paymentStatus: "",
+        visited: "",
       },
       quitForm: {
         // 退团信息确认
@@ -856,7 +912,7 @@ export default {
       applyDates: this.applyDate(),
       detail: null,
       gradeList: [],
-      ischeckCanReg:false
+      ischeckCanReg: false,
     };
   },
   created() {},
@@ -871,7 +927,7 @@ export default {
     permission(str) {
       return permission(str);
     },
-   async init() {
+    async init() {
       this.status = this.$route.query.team_status;
       // 通过乐团id 获取乐团招生状态
       this.id = this.$route.query.id;
@@ -879,14 +935,15 @@ export default {
       // 判断是否带缓存参数
       this.pickerOptions = this.beginDate(new Date());
       // checkCanReg
-      try{
-       this.ischeckCanReg = await (await checkCanReg({musicGroupId:this.id})).data
-       console.log(this.ischeckCanReg)
-      }catch(e){
-        console.log(e)
+      try {
+        this.ischeckCanReg = await (
+          await checkCanReg({ musicGroupId: this.id })
+        ).data;
+        console.log(this.ischeckCanReg);
+      } catch (e) {
+        console.log(e);
       }
 
-
       getMusicGroupGradeList({ musicGroupId: this.id }).then((res) => {
         let result = res.data;
         if (res.code == 200 && result) {
@@ -928,6 +985,8 @@ export default {
         subject: null, // 专业
         isAllowAdjust: null, // 是否允许调剂
         currentGrade: null,
+        paymentStatus: null,
+        visited: null,
       };
       this.getList();
     },
@@ -951,6 +1010,8 @@ export default {
         isAllowAdjust: this.searchFrom.isAllowAdjust || null,
         name: this.searchFrom.name || null,
         currentGrade: this.searchFrom.currentGrade || null,
+        paymentStatus: this.searchFrom.paymentStatus || null,
+        visited: this.searchFrom.visited || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -1215,9 +1276,9 @@ export default {
     },
     // 修改专业
     resetSubject(row) {
-      console.log(row)
+      console.log(row);
       this.activeId = row.studentId;
-      this.maskForm.subject = row.actualSubjectId
+      this.maskForm.subject = row.actualSubjectId;
       this.subjectVisible = true;
       //   resetStudentSubject().then(res=>{]})
     },
@@ -1424,10 +1485,9 @@ export default {
       this.getList().then((res) => {
         for (const item of res.data.rows) {
           if (item.id === row.id) {
-            this.rowDetail = { ...item,userId:item.studentId };
+            this.rowDetail = { ...item, userId: item.studentId };
             // console.log(this.rowDetail)
             this.changeVoiceVisible = true;
-
           }
         }
       });
@@ -1480,7 +1540,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-         return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },
@@ -1489,7 +1549,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },