进行中加学员和合班的修改

src/constant/index.js

@@ -363,11 +363,11 @@ export const tenantStatus = {
 }
 
 export const memberEnum = {
-  "DAY": '按天',
-  "MONTH": '按月',
-  "QUARTERLY": '按季度',
-  "YEAR_HALF": '按半年',
-  "YEAR": '按年'
+  "DAY": '天',
+  "MONTH": '月度',
+  "QUARTERLY": '季度',
+  "YEAR_HALF": '半年',
+  "YEAR": '年'
 }
 export const cloudGroupActive = {
   1: '固定天数',

src/views/auditList/index.vue

@@ -364,7 +364,8 @@ export default {
       this.detail = {
         id: row.id,
         musicGroupId: row.musicGroupId,
-        status: row.auditStatus,
+        status: row.status,
+        batchNo:row.batchNo
       };
       this.typeStatus = true;
     },

src/views/resetTeaming/components/resetPayList.vue

@@ -70,13 +70,6 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="paymentPattern" label="缴费方式">
-          <template slot-scope="scope">
-            <div>
-              {{ scope.row.paymentPattern | teamPayStatus }}
-            </div>
-          </template>
-        </el-table-column>
         <el-table-column
           align="center"
           prop="auditStatus"
@@ -85,18 +78,18 @@
         >
           <template slot-scope="scope">
             <div>
-              {{ scope.row.auditStatus | auditType }}
+              {{ scope.row.status | auditType }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           align="center"
           prop="addCourseTotalTime"
           width="150px"
           label="加课总时长"
         >
-        </el-table-column>
-        <el-table-column
+        </el-table-column> -->
+        <!-- <el-table-column
           align="center"
           prop="courseCurrentPrice"
           label="课程费用"
@@ -121,16 +114,16 @@
               {{ scope.row.memberPaymentAmount | moneyFormat }}
             </div>
           </template>
-        </el-table-column>
-        <!-- <el-table-column align="center"
+        </el-table-column> -->
+        <el-table-column align="center"
                          prop="status"
-                         label="缴费状态">
+                         label="缴费人数">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.status | payTypeStatus }}
+              {{ scope.row.actualNum  }}/{{ scope.row.expectNum  }}
             </div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <!-- <el-table-column align="center"
                          prop="operatorName"
                          label="责任人">
@@ -145,7 +138,7 @@
             <div>
               <auth auths="musicGroupPaymentCalender/queryPage/4315">
                 <!--   v-permission="'musicGroupPaymentCalender/queryPage/4315'" -->
-                <el-button type="text" @click="lookList(scope.row)"
+                <el-button type="text" @click="lookDetail(scope.row)"
                   >查看</el-button
                 ></auth
               >
@@ -171,8 +164,8 @@
                 auths="musicGroupPaymentCalender/update/4313"
                 v-if="
                   teamStatus &&
-                  (scope.row.auditStatus === 'REJECT' ||
-                    scope.row.auditStatus === 'DRAFT')
+                  (scope.row.status === 'REJECT' ||
+                    scope.row.status === 'DRAFT')
                 "
               >
                 <el-button type="text" @click="resetPay(scope.row)"
@@ -219,13 +212,13 @@
                 ></auth
               >
 
-              <!-- <el-button type="text"
+              <el-button type="text"
                          v-if="!isNewGropu&&teamStatus&&scope.row.paymentType!='MUSIC_APPLY'"
-                         @click="onCreateQRCode(scope.row)">续费二维码</el-button> -->
-              <!-- <el-button type="text"
+                         @click="onCreateQRCode(scope.row)">续费二维码</el-button>
+              <el-button type="text"
                          v-if="isNewGropu"
                          v-permission="'musicGroup/findMusicGroupSubjectInfo/966'"
-                         @click="onPreview(scope.row)">预览</el-button> -->
+                         @click="onPreview(scope.row)">预览</el-button>
             </div>
           </template>
         </el-table-column>
@@ -756,13 +749,14 @@ export default {
     resetPay(row) {
       this.diTitle = "修改缴费";
       if (
-        this.baseInfo?.musicGroup?.courseViewType == 2 &&
-        row.paymentType == "MUSIC_APPLY"
+
+        row.paymentType == "MUSIC_APPLY" ||  row.paymentType == "MUSIC_RENEW" ||  row.paymentType == "ADD_COURSE"
       ) {
         this.payFormType = row.payUserType === "SCHOOL" ? "school" : "user";
         this.isNew = false;
         this.activeRow = row;
-        this.memberVisible = true;
+        // 跳转新接口
+        // this.memberVisible = true;
       } else {
         this.isNew = false;
         this.activeRow = row;

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -171,13 +171,13 @@
   OVER: '缴费已结束', -->
       <div class="wrap">
         <div class="newBand" @click="detailVisible = true">缴费详情</div>
-        <div
+        <!-- <div
           class="newBand"
           @click="resetPay"
           v-permission="'musicGroupPaymentCalenderDetail/updateExpectAmount'"
         >
           修改缴费金额
-        </div>
+        </div> -->
         <div
           class="newBand"
           @click="startPay"
@@ -370,7 +370,7 @@
       </div>
     </el-dialog> -->
 
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="resetPayVisible"
       width="500px"
       title="修改缴费金额"
@@ -383,12 +383,6 @@
         ref="resetPayForm"
         @submit.native.prevent
       >
-        <!-- <el-form-item label="学员姓名"
-                      :rules="[{ required: true, message: '学员姓名',trigger: 'blur'}]"
-                      prop="startDate">
-          <el-input disabled
-                    value="张三"></el-input>
-        </el-form-item> -->
         <el-form-item
           v-if="
             msgList.length > 0 ||
@@ -429,7 +423,7 @@
         <el-button @click="resetPayVisible = false">取 消</el-button>
         <el-button type="primary" @click="submitReset">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
     <el-dialog :visible.sync="studentVisible" title="学生列表" width="600">
       <el-table

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

@@ -5,18 +5,12 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="
-        calender&&
-        calender.paymentType === 'ADD_STUDENT'
-      "
+      v-if="calender && calender.paymentType === 'ADD_STUDENT'"
     >
     </el-alert>
     <descriptions
       :column="2"
-      v-if="
-        calender &&
-        calender === 'ADD_STUDENT'
-      "
+      v-if="calender && calender.paymentType === 'ADD_STUDENT'"
     >
       <descriptions-item label="学员姓名：">{{ username }}</descriptions-item>
       <descriptions-item label="手机号码：">{{ phone }}</descriptions-item>
@@ -45,28 +39,39 @@
       <descriptions-item label="订单类型：">{{
         calender.payUserType | payUserTypeFormat
       }}</descriptions-item>
-      <descriptions-item :span="3" label="备注：">
+
+      <descriptions-item label="缴费金额：">{{
+        numeral(calender.currentTotalAmount).format("0,0")
+      }}</descriptions-item>
+      <descriptions-item
+        :span="3"
+        v-if="calender.payUserType !== 'SCHOOL'"
+        label="缴费日期："
+        >{{ calender.startPaymentDate | dayjsFormat }} -
+        {{ calender.deadlinePaymentDate | dayjsFormat }}</descriptions-item
+      >
+      <descriptions-item
+        :span="3"
+        label="备注："
+        style="border-bottom: none !important"
+      >
         <span style="display: inline-block; max-width: 100%">
           <overflow-text
-            :text="
-              calender
-                ? calender.memo
-                : null
-            "
+            :text="calender ? calender.memo : null"
           ></overflow-text>
         </span>
       </descriptions-item>
     </descriptions>
     <el-alert
-      title="课程信息"
+      title="乐团课"
       :closable="false"
       class="alert"
       type="info"
       v-if="course"
     >
     </el-alert>
-    <descriptions :column="3" v-if="course&&course.length>0">
-      <descriptions-item :span="2" label="收费标准：">{{
+    <descriptions :column="3" v-if="course && course.length > 0">
+      <descriptions-item :span="2" label="收费标准：" v-if="course[0].name">{{
         course[0].name
       }}</descriptions-item>
     </descriptions>
@@ -75,9 +80,9 @@
       stripe
       v-if="course.length"
       style="width: 100%; margin-top: 10px"
-      :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
-      <el-table-column prop="courseType" label="课程类型" width="120">
+      <el-table-column prop="courseType" label="课程信息" width="120">
         <template slot-scope="scope">
           {{ scope.row.courseType | courseTypeFormat }}
         </template>
@@ -87,12 +92,16 @@
           scope.row.isStudentOptional ? "是" : "否"
         }}</template>
       </el-table-column>
-      <el-table-column prop="courseTotalMinuties" label="课程总时长(分钟)">
+      <el-table-column
+        prop="courseTotalMinuties"
+        label="课程总时长(分钟)"
+        width="150px"
+      >
       </el-table-column>
-      <el-table-column prop="courseCurrentPrice" label="现价(元)">
+      <el-table-column prop="courseCurrentPrice" label="售价(元)" width="100px">
         <template slot="header">
           <p style="position: relative">
-            现价(元)
+            售价(元)
             <el-tooltip placement="top" popper-class="mTooltip">
               <div slot="content">学生实际缴费金额</div>
               <i
@@ -103,8 +112,7 @@
           </p>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="courseOriginalPrice" label="原价(元)">
-      </el-table-column> -->
+      <el-table-column> </el-table-column>
     </el-table>
     <el-table
       :data="musicMerger"
@@ -126,10 +134,10 @@
       </el-table-column>
       <el-table-column prop="courseTime" label="课程总时长(分钟)">
       </el-table-column>
-      <el-table-column prop="courseCurrentPrice" label="现价(元)">
+      <el-table-column prop="courseCurrentPrice" label="售价(元)">
         <template slot="header">
           <p style="position: relative">
-            现价(元)
+            售价(元)
             <el-tooltip placement="top" popper-class="mTooltip">
               <div slot="content">学生实际缴费金额</div>
               <i
@@ -160,60 +168,137 @@
       </el-table-column> -->
     </el-table>
     <el-alert
-      title="会员信息"
+      title="团练宝"
       :closable="false"
       class="alert"
       type="info"
       v-if="memberRankSettingId"
     >
     </el-alert>
-    <div v-if="memberRankSettingId">
-      <descriptions
-        v-for="item in musicGroupPaymentCalenders"
-        :key="item.id + 'member'"
-        :column="2"
-      >
-        <descriptions-item label="会员等级：">{{
-          item.memberRankSettingName
-        }}</descriptions-item>
-        <descriptions-item label="会员有效期："
-          >{{ item.memberValidDate }}个月</descriptions-item
-        >
-        <descriptions-item label="现价">{{
-          numeral(item.memberPaymentAmount).format("0,0")
-        }}</descriptions-item>
-        <!-- <descriptions-item label="原价">{{
-          numeral(item.originalMemberPaymentAmount).format("0,0")
-        }}</descriptions-item> -->
-      </descriptions>
-    </div>
-    <!-- 会员信息 -->
+    <el-table
+      :data="[{ ...member }]"
+      stripe
+      v-if="memberRankSettingId"
+      style="width: 100%; margin-top: 10px"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+    >
+      <el-table-column prop="name" label="会员类型" width="120">
+      </el-table-column>
+      <el-table-column prop="optionalFlag" label="是否可选" width="100px">
+        <template slot-scope="scope">{{
+          scope.row.optionalFlag ? "是" : "否"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="courseTotalMinuties" label="会员周期" width="150">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.period | memberEnumType }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="num" label="数量" width="120"> </el-table-column>
+      <el-table-column prop="actualAmount" label="售价(元)" width="120">
+        <template slot="header">
+          <p style="position: relative">
+            售价(元)
+            <el-tooltip placement="top" popper-class="mTooltip">
+              <div slot="content">学生实际缴费金额</div>
+              <i
+                class="el-icon-question"
+                style="font-size: 18px; color: #f56c6c"
+              ></i>
+            </el-tooltip>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column> </el-table-column>
+    </el-table>
+    <el-alert
+      title="乐保"
+      :closable="false"
+      class="alert"
+      type="info"
+      v-if="repair.calenderId"
+    >
+    </el-alert>
+    <el-table
+      :data="[{ ...repair }]"
+      stripe
+      v-if="repair.calenderId"
+      style="width: 100%; margin-top: 10px"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+    >
+      <el-table-column prop="name" label="服务" width="120">
+        <template slot-scope="scope">
+          <div>乐器保养</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="年限" width="100px">
+        <template slot-scope="scope">{{ scope.row.num }}</template>
+      </el-table-column>
 
-    <el-alert title="缴费周期" :closable="false" class="alert" type="info">
+      <el-table-column prop="num" label="数量" width="150px"> </el-table-column>
+      <el-table-column prop="actualAmount" label="售价(元)">
+        <template slot="header">
+          <p style="position: relative">
+            售价(元)
+            <el-tooltip placement="top" popper-class="mTooltip">
+              <div slot="content">学生实际缴费金额</div>
+              <i
+                class="el-icon-question"
+                style="font-size: 18px; color: #f56c6c"
+              ></i>
+            </el-tooltip>
+          </p>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-alert
+      title="乐团活动"
+      :closable="false"
+      class="alert"
+      type="info"
+      v-if="activity.length > 0"
+    >
     </el-alert>
-    <descriptions
-     v-if="calender"
-      :column="2"
+    <el-table
+      :data="activity"
+      stripe
+      v-if="repair.calenderId"
+      style="width: 100%; margin-top: 10px"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
-      <descriptions-item label="缴费金额：">{{
-        numeral(calender.currentTotalAmount).format("0,0")
-      }}</descriptions-item>
-      <descriptions-item
-        :span="3"
-        v-if="calender.payUserType !== 'SCHOOL'"
-        label="缴费日期："
-        >{{ calender.startPaymentDate | dayjsFormat }} -
-        {{ calender.deadlinePaymentDate | dayjsFormat }}</descriptions-item
-      >
-      <!-- <descriptions-item
-        :span="3"
-        v-if="musicGroupPaymentCalenderCourseSettingName"
-        label="缴费有效期："
-        >{{ item.paymentValidStartDate | dayjsFormat }} -
-        {{ item.paymentValidEndDate | dayjsFormat }}</descriptions-item
-      > -->
-    </descriptions>
+      <el-table-column prop="activityName" label="活动方案" width="120">
+      </el-table-column>
+      <el-table-column prop="optionalFlag" label="是否可选" width="100px">
+        <template slot-scope="scope">{{
+          scope.row.optionalFlag ? "是" : "否"
+        }}</template>
+      </el-table-column>
+      <el-table-column label="活动课程" width="100px">
+        <template slot-scope="scope">{{ scope.row.num }}</template>
+      </el-table-column>
 
+      <el-table-column prop="num" label="数量" width="100px"> </el-table-column>
+      <el-table-column prop="actualAmount" label="售价(元)">
+        <template slot="header">
+          <p style="position: relative">
+            售价(元)
+            <el-tooltip placement="top" popper-class="mTooltip">
+              <div slot="content">学生实际缴费金额</div>
+              <i
+                class="el-icon-question"
+                style="font-size: 18px; color: #f56c6c"
+              ></i>
+            </el-tooltip>
+          </p>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 会员信息 -->
+
+    <!--
     <el-dialog
       :visible.sync="payVisible"
       :close-on-click-modal="false"
@@ -232,7 +317,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="payVisible = false">关 闭</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -248,8 +333,8 @@ const initData = {
   musicGroupPaymentCalenderStudentDetails: [],
   course: [],
   member: [],
-  repair:{},
-  musicMerger:[],
+  repair: {},
+  musicMerger: [],
   studentNum: 0,
   phone: "",
   username: "",
@@ -274,7 +359,7 @@ export default {
     memberRankSettingId() {
       const active = this.member?.memberRankSettingId;
       if (active) {
-        return active.memberRankSettingId;
+        return active;
       }
       return "";
     },
@@ -304,6 +389,11 @@ export default {
 .alert {
   margin: 10px 0;
 }
+.description-tr {
+  &:nth-last-child(1) {
+    border-bottom: none !important;
+  }
+}
 // /deep/ .description-view{
 //   border: none;
 //     .description-tr{