Merge branch 'opt_fix' into online

src/views/resetTeaming/api.js

@@ -47,6 +47,13 @@ export const musicGroupPaymentCalenderDetailDel = data => request2({
   method: 'post',
 })
 
+// 删除批次
+export const musicGroupPaymentCalenderDelByBatchNo = data => request2({
+  url: '/api-web/musicGroupPaymentCalender/delByBatchNo',
+  params: data,
+  method: 'post',
+})
+
 export const queryByMusicGroupOrganizationCourseSettingsId = data => request2({
   url: '/api-web/musicGroupOrganizationCourseSettingsDetail/queryByMusicGroupOrganizationCourseSettingsId',
   data: {},

src/views/resetTeaming/components/resetPayList.vue

@@ -61,6 +61,16 @@
           </template>
         </el-table-column>
         <el-table-column align="center"
+                          prop="auditStatus"
+                          label="审核状态"
+                          width="100px">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.auditStatus | auditType }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
                          prop="addCourseTotalTime"
                          width="150px"
                          label="加课总时长">
@@ -98,7 +108,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="120px">
+                         min-width="160px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -116,6 +126,10 @@
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
+              <el-button type="text"
+                       v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                       @click="removeBatchNo(scope.row)">删除</el-button>
+
               <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
                          @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
@@ -366,7 +380,7 @@ import { getAuditList } from '@/api/auditManager'
 import {
   getOrganizationCourseUnitPriceSettings
 } from '@/api/specialSetting'
-import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd } from '../api'
+import { musicGroupPaymentCalenderQueryPage, getMusicGroupStu, musicGroupPaymentCalenderDetailBatchAdd, musicGroupPaymentCalenderDelByBatchNo } from '../api'
 import setStudentFee from './studentPayBase'
 import userPayForm from '../modals/user-pay-form'
 import payItems from '../modals/pay-items'
@@ -594,6 +608,16 @@ export default {
       let query = this.$route.query;
       this.$router.push({ path: "/business/studentPayBase", query });
     },
+    async removeBatchNo (row) {
+      try {
+        await this.$confirm('是否确认删除该缴费批次?', '提示', {
+          type: 'warning',
+        })
+        await musicGroupPaymentCalenderDelByBatchNo({batchNo: row.batchNo})
+        this.$message.success('删除成功')
+        this.getList()
+      } catch (error) {}
+    },
     newPayInfo () {
       this.$refs["payForm"].validate((res) => {
         if (res) {

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -61,6 +61,16 @@
           </template>
         </el-table-column>
         <el-table-column align="center"
+                          prop="auditStatus"
+                          label="审核状态"
+                          width="100px">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.auditStatus | auditType }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
                          prop="addCourseTotalTime"
                          width="150px"
                          label="加课总时长">
@@ -116,6 +126,10 @@
                          v-permission="'musicGroupPaymentCalender/update'"
                          @click="resetPay(scope.row)">修改</el-button>
 
+              <el-button type="text"
+                       v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                       @click="removeBatchNo(scope.row)">删除</el-button>
+
               <!-- <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
                          @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
@@ -578,6 +592,16 @@ export default {
       let query = this.$route.query;
       this.$router.push({ path: "/business/studentPayBase", query });
     },
+    async removeBatchNo (row) {
+      try {
+        await this.$confirm('是否确认删除该缴费批次?', '提示', {
+          type: 'warning',
+        })
+        await musicGroupPaymentCalenderDelByBatchNo({batchNo: row.batchNo})
+        this.$message.success('删除成功')
+        this.getList()
+      } catch (error) {}
+    },
     newPayInfo () {
       this.$refs["payForm"].validate((res) => {
         if (res) {

src/views/resetTeaming/modals/pay-items.vue

@@ -105,10 +105,6 @@
                          v-if="$listeners.onPreview && payUserType === 'STUDENT'"
                          v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
                          @click="$listeners.onPreview(scope.row)">预览</el-button>
-            <el-button type="text"
-                       v-if="removeIsShow(scope.row)"
-                       v-permission="'musicGroupPaymentCalender/del'"
-                       @click="remove(scope.row)">删除</el-button>
             <!-- <el-button type="text" v-if="!isNewGropu" @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
           </div>
         </template>
@@ -167,19 +163,6 @@ export default {
           this.$listeners.lookDetail(row)
       })
     },
-    removeIsShow(row) {
-      return row.status === 'REJECT' || row.status === 'NO'
-    },
-    async remove (row) {
-      try {
-        await this.$confirm('是否删除缴费', '提示', {
-          type: 'warning',
-        })
-        await musicGroupPaymentCalenderDetailDel({id: row.id})
-        this.$message.success('删除成功')
-        this.getList()
-      } catch (error) {}
-    }
   }
 };
 </script>