修改审核列表

1

src/views/auditList/index.vue

@@ -362,8 +362,7 @@ export default {
     lookDetail(row) {
       // this.detail = res.data
       this.detail = {
-        id: row.musicGroupPaymentCalenderId,
-        batchNo: row.batchNo,
+        id: row.id,
         musicGroupId: row.musicGroupId,
         status: row.auditStatus,
       };

src/views/resetTeaming/api.js

@@ -22,7 +22,7 @@ export const musicGroupcreateCalender = data => request2({
 
 
 export const musicGroupPaymentCalenderView = data => request2({
-  url: '/api-web/musicGroupPaymentCalender/auditListDetail',
+  url: '/api-web/musicGroupPaymentCalender/getDetail',
   data: {},
   params: data,
   method: 'get',

src/views/resetTeaming/modals/review-detail.vue

@@ -6,16 +6,16 @@
       class="alert"
       type="info"
       v-if="
-        musicGroupPaymentCalenders[0] &&
-        musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'
+        calender&&
+        calender.paymentType === 'ADD_STUDENT'
       "
     >
     </el-alert>
     <descriptions
       :column="2"
       v-if="
-        musicGroupPaymentCalenders[0] &&
-        musicGroupPaymentCalenders[0].paymentType === 'ADD_STUDENT'
+        calender &&
+        calender === 'ADD_STUDENT'
       "
     >
       <descriptions-item label="学员姓名：">{{ username }}</descriptions-item>
@@ -25,32 +25,32 @@
     </el-alert>
     <descriptions :column="2">
       <descriptions-item label="分部名称：">{{
-        auditDto.organName
+        calender.organName
       }}</descriptions-item>
       <descriptions-item label="乐团名称：">
         <overflow-text
-          :text="auditDto.musicGroupName"
+          :text="calender.musicGroupName"
           width="100%"
         ></overflow-text>
       </descriptions-item>
       <descriptions-item label="乐团编号：">
-        <copy-text>{{ auditDto.musicGroupId }}</copy-text>
+        <copy-text>{{ calender.musicGroupId }}</copy-text>
       </descriptions-item>
       <descriptions-item label="申请时间：">{{
-        auditDto.createTime
+        calender.createTime
       }}</descriptions-item>
       <descriptions-item label="申请类型：">{{
-        auditDto.paymentType | userPaymentTypeFormat
+        calender.paymentType | userPaymentTypeFormat
       }}</descriptions-item>
       <descriptions-item label="订单类型：">{{
-        auditDto.payUserType | payUserTypeFormat
+        calender.payUserType | payUserTypeFormat
       }}</descriptions-item>
       <descriptions-item :span="3" label="备注：">
         <span style="display: inline-block; max-width: 100%">
           <overflow-text
             :text="
-              musicGroupPaymentCalenders[0]
-                ? musicGroupPaymentCalenders[0].memo
+              calender
+                ? calender.memo
                 : null
             "
           ></overflow-text>
@@ -62,18 +62,18 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="musicGroupPaymentCalenderCourseSettingName"
+      v-if="course"
     >
     </el-alert>
-    <descriptions :column="3" v-if="musicGroupPaymentCalenderCourseSettingName">
+    <descriptions :column="3" v-if="course&&course.length>0">
       <descriptions-item :span="2" label="收费标准：">{{
-        musicGroupPaymentCalenderCourseSettingName
+        course[0].name
       }}</descriptions-item>
     </descriptions>
     <el-table
-      :data="musicGroupPaymentCalenderCourseSettings"
+      :data="course"
       stripe
-      v-if="musicGroupPaymentCalenderCourseSettings.length"
+      v-if="course.length"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{background:'#EDEEF0',color:'#444'}"
     >
@@ -103,13 +103,13 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column prop="courseOriginalPrice" label="原价(元)">
-      </el-table-column>
+      <!-- <el-table-column prop="courseOriginalPrice" label="原价(元)">
+      </el-table-column> -->
     </el-table>
     <el-table
-      :data="musicGroupPaymentCalenderStudentDetails"
+      :data="musicMerger"
       stripe
-      v-if="musicGroupPaymentCalenderStudentDetails.length"
+      v-if="musicMerger.length"
       style="width: 100%; margin-top: 10px"
     >
       <el-table-column prop="username" label="学员姓名"> </el-table-column>
@@ -145,7 +145,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="courseOriginalPrice" label="原价(元)">
+      <!-- <el-table-column prop="courseOriginalPrice" label="原价(元)">
         <template slot-scope="scope">
           <div>
             {{
@@ -157,7 +157,7 @@
             }}
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-alert
       title="会员信息"
@@ -182,9 +182,9 @@
         <descriptions-item label="现价">{{
           numeral(item.memberPaymentAmount).format("0,0")
         }}</descriptions-item>
-        <descriptions-item label="原价">{{
+        <!-- <descriptions-item label="原价">{{
           numeral(item.originalMemberPaymentAmount).format("0,0")
-        }}</descriptions-item>
+        }}</descriptions-item> -->
       </descriptions>
     </div>
     <!-- 会员信息 -->
@@ -192,27 +192,26 @@
     <el-alert title="缴费周期" :closable="false" class="alert" type="info">
     </el-alert>
     <descriptions
-      v-for="item in musicGroupPaymentCalenders"
-      :key="item.id"
+     v-if="calender"
       :column="2"
     >
       <descriptions-item label="缴费金额：">{{
-        numeral(item.paymentAmount + item.memberPaymentAmount).format("0,0")
+        numeral(calender.currentTotalAmount).format("0,0")
       }}</descriptions-item>
       <descriptions-item
         :span="3"
-        v-if="item.payUserType !== 'SCHOOL'"
+        v-if="calender.payUserType !== 'SCHOOL'"
         label="缴费日期："
-        >{{ item.startPaymentDate | dayjsFormat }} -
-        {{ item.deadlinePaymentDate | dayjsFormat }}</descriptions-item
+        >{{ calender.startPaymentDate | dayjsFormat }} -
+        {{ calender.deadlinePaymentDate | dayjsFormat }}</descriptions-item
       >
-      <descriptions-item
+      <!-- <descriptions-item
         :span="3"
         v-if="musicGroupPaymentCalenderCourseSettingName"
         label="缴费有效期："
         >{{ item.paymentValidStartDate | dayjsFormat }} -
         {{ item.paymentValidEndDate | dayjsFormat }}</descriptions-item
-      >
+      > -->
     </descriptions>
 
     <el-dialog
@@ -244,11 +243,13 @@ import descriptions from "@/components/Descriptions";
 import Item from "@/layout/components/Sidebar/Item.vue";
 Vue.use(descriptions);
 const initData = {
-  auditDto: {},
-  musicGroupPaymentCalenderCourseSettings: [],
+  calender: {},
+  activity: [],
   musicGroupPaymentCalenderStudentDetails: [],
-  simpleUserDto: [],
-  musicGroupPaymentCalenders: [],
+  course: [],
+  member: [],
+  repair:{},
+  musicMerger:[],
   studentNum: 0,
   phone: "",
   username: "",
@@ -271,7 +272,7 @@ export default {
       return "";
     },
     memberRankSettingId() {
-      const active = this.musicGroupPaymentCalenders[0];
+      const active = this.member?.memberRankSettingId;
       if (active) {
         return active.memberRankSettingId;
       }
@@ -286,7 +287,7 @@ export default {
     async init() {
       try {
         const res = await musicGroupPaymentCalenderView({
-          batchNo: this.detail.batchNo,
+          id: this.detail.id,
           musicGroupId: this.detail.musicGroupId,
         });
         for (const key in initData) {