Merge branch '0609getMusicFee' into test

src/views/resetTeaming/api.js

@@ -54,6 +54,14 @@ export const musicGroupPaymentCalenderDelByBatchNo = data => request2({
   method: 'post',
 })
 
+// 撤回审核  musicGroupPaymentCalender/revoke
+export const revokeMusicGroupPaymentCalender = data => request2({
+  url: '/api-web/musicGroupPaymentCalender/revoke',
+  data: {},
+  params: data,
+  method: 'post',
+})
+
 export const queryByMusicGroupOrganizationCourseSettingsId = data => request2({
   url: '/api-web/musicGroupOrganizationCourseSettingsDetail/queryByMusicGroupOrganizationCourseSettingsId',
   data: {},

src/views/resetTeaming/components/resetPayList.vue

@@ -133,50 +133,64 @@
         <el-table-column label="操作" fixed="right" min-width="200px">
           <template slot-scope="scope">
             <div>
-              <el-button
-                type="text"
-                @click="lookList(scope.row)"
-                v-permission="'musicGroupPaymentCalender/queryPage/4315'"
-                >查看</el-button
-              >
-              <!-- <el-button type="text"
-                         @click="lookDetail(scope.row)"
-                         v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
-              <el-button
-                type="text"
-                @click="openChioseStudent(scope.row)"
-                v-if="
-                  scope.row.auditStatus != 'REJECT' &&
-                  scope.row.auditStatus != 'AUDITING' &&
-                  teamStatus &&
-                  scope.row.paymentType != 'MUSIC_APPLY' &&
-                  scope.row.paymentType != 'ADD_STUDENT' &&
-                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
-                "
-                v-permission="'musicGroupPaymentCalenderDetail/batchAdd/3890'"
-                >添加学员</el-button
-              >
-              <el-button
-                type="text"
-                v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
-                v-permission="'musicGroupPaymentCalender/update/4313'"
-                @click="resetPay(scope.row)"
-                >修改</el-button
+              <auth auths="musicGroupPaymentCalender/queryPage/4315">
+                <!--   v-permission="'musicGroupPaymentCalender/queryPage/4315'" -->
+                <el-button type="text" @click="lookList(scope.row)"
+                  >查看</el-button
+                ></auth
               >
+              <auth auths="musicGroupPaymentCalenderDetail/batchAdd/3890">
+                <el-button
+                  type="text"
+                  @click="openChioseStudent(scope.row)"
+                  v-if="
+                    scope.row.auditStatus != 'REJECT' &&
+                    scope.row.auditStatus != 'AUDITING' &&
+                    teamStatus &&
+                    scope.row.paymentType != 'MUSIC_APPLY' &&
+                    scope.row.paymentType != 'ADD_STUDENT' &&
+                    scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
+                  "
+                  >添加学员</el-button
+                >
+              </auth>
+              <!-- v-permission="'musicGroupPaymentCalenderDetail/batchAdd/3890'"  v-permission="''" -->
 
-              <el-button
-                type="text"
-                v-permission="'musicGroupPaymentCalender/delByBatchNo/4305'"
-                v-if="
-                  (scope.row.auditStatus == 'REJECT' ||
-                    scope.row.auditStatus == 'AUDITING' ||
-                    scope.row.auditStatus == 'NO') &&
-                  teamStatus &&
-                  scope.row.paymentType != 'ADD_STUDENT' &&
-                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
-                "
-                @click="removeBatchNo(scope.row)"
-                >删除</el-button
+              <auth auths="musicGroupPaymentCalender/update/4313">
+                <el-button
+                  type="text"
+                  v-if="
+                    teamStatus &&
+                    (scope.row.auditStatus === 'REJECT' ||
+                      scope.row.auditStatus === 'DRAFT')
+                  "
+                  @click="resetPay(scope.row)"
+                  >修改</el-button
+                >
+              </auth>
+              <auth auths="musicGroupPaymentCalender/update/4313">
+                <el-button
+                  type="text"
+                  v-if="teamStatus && scope.row.auditStatus === 'AUDITING'"
+                  @click="revoke(scope.row)"
+                  >撤回</el-button
+                >
+              </auth>
+
+              <auth auths="musicGroupPaymentCalender/delByBatchNo/4305">
+                <el-button
+                  type="text"
+                  v-if="
+                    (scope.row.auditStatus == 'REJECT' ||
+                      scope.row.auditStatus == 'DRAFT' ||
+                      scope.row.auditStatus == 'NO') &&
+                    teamStatus &&
+                    scope.row.paymentType != 'ADD_STUDENT' &&
+                    scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
+                  "
+                  @click="removeBatchNo(scope.row)"
+                  >删除</el-button
+                ></auth
               >
 
               <!-- <el-button type="text"
@@ -482,6 +496,7 @@ import {
   getMusicGroupStu,
   musicGroupPaymentCalenderDetailBatchAdd,
   musicGroupPaymentCalenderDelByBatchNo,
+  revokeMusicGroupPaymentCalender,
 } from "../api";
 import setStudentFee from "./studentPayBase";
 import userPayForm from "../modals/user-pay-form";
@@ -617,7 +632,10 @@ export default {
     },
     newUserPay() {
       // 判断一下乐团是课程缴费 还是会员缴费 且乐团状态为创建缴费中
-      if (this.baseInfo?.musicGroup?.courseViewType == 1&&this.team_status == "PRE_BUILD_FEE") {
+      if (
+        this.baseInfo?.musicGroup?.courseViewType == 1 &&
+        this.team_status == "PRE_BUILD_FEE"
+      ) {
         this.payFormType = "user";
         this.isNew = true;
         this.activeRow = null;
@@ -675,7 +693,10 @@ export default {
     },
     resetPay(row) {
       this.diTitle = "修改缴费";
-      if (this.baseInfo?.musicGroup?.courseViewType == 1&&row.paymentType == 'MUSIC_APPLY') {
+      if (
+        this.baseInfo?.musicGroup?.courseViewType == 1 &&
+        row.paymentType == "MUSIC_APPLY"
+      ) {
         this.payFormType = row.payUserType === "SCHOOL" ? "school" : "user";
         this.isNew = false;
         this.activeRow = row;
@@ -689,6 +710,21 @@ export default {
 
       // 判断一下 是不是云收费团 且是乐团报名缴费
     },
+    async revoke(row) {
+      try {
+        await this.$confirm("是否撤回此缴费项目的审批？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        });
+        const res = await revokeMusicGroupPaymentCalender({
+          batchNo: row.batchNo,
+        });
+        this.$message.success('取消审批成功')
+        this.getList()
+      } catch {}
+      console.log(row);
+    },
     changeActive(val) {
       if (this.$listeners.changeActive) {
         this.$listeners.changeActive(val);