缴费项目开发完毕等待自测

1

src/views/resetTeaming/components/resetPayList.vue

@@ -416,8 +416,9 @@
         :rowDetail="activeRow"
         :type="payFormType"
         :baseInfo="baseInfo"
-        :paymentType="team_status == 'PRE_BUILD_FEE' ? 0 : undefined"
+        :paymentType="paymentType"
         :musicGroupId="$route.query.id"
+        @changePaymentType = "changePaymentType"
       />
     </el-dialog>
     <!-- 会员缴费 -->
@@ -437,7 +438,7 @@
         :rowDetail="activeRow"
         :type="payFormType"
         :baseInfo="baseInfo"
-        :paymentType="team_status == 'PRE_BUILD_FEE' ? 0 : undefined"
+        :paymentType="paymentType"
         :musicGroupId="$route.query.id"
       />
     </el-dialog>
@@ -538,6 +539,7 @@ export default {
   },
   data() {
     return {
+      paymentType:this.team_status == 'PRE_BUILD_FEE' ? 0 : undefined,
       musicGroupStu: [],
       payFormType: "user",
       userVisible: false,
@@ -652,6 +654,9 @@ export default {
         });
       }
     },
+    changePaymentType(val){
+      this.paymentType = val
+    },
     newUserPay() {
       // 判断一下乐团是课程缴费 还是会员缴费 且乐团状态为创建缴费中
       if (

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -418,8 +418,9 @@
         :rowDetail="activeRow"
         :type="payFormType"
         :baseInfo="baseInfo"
-        :paymentType="team_status == 'PRE_BUILD_FEE' ? 0 : undefined"
+        :paymentType="paymentType"
         :musicGroupId="$route.query.id"
+        @changePaymentType="changePaymentType"
       />
       <!--  -->
     </el-dialog>
@@ -554,6 +555,7 @@ export default {
       payOrderTypeLists: payOrderTypeList,
       getMoneyVisible: false,
       baseInfo: null,
+      paymentType:this.team_status == 'PRE_BUILD_FEE' ? 0 : undefined
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -618,6 +620,9 @@ export default {
       this.activeRow = null;
       this.userVisible = true;
     },
+    changePaymentType(val) {
+      this.paymentType = val;
+    },
     newSchoolPay() {
       if (
         this.baseInfo?.musicGroup?.courseViewType == 2 &&

src/views/resetTeaming/modals/member-setting.vue

@@ -100,7 +100,6 @@
         type="daterange"
         style="width: 620px"
         :picker-options="pickerOptions"
-        value-format="yyyy-MM-DD"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
@@ -114,7 +113,14 @@ import { paymentPatternType } from "@/constant";
 import { objectToOptions } from "@/utils";
 import { getAllmemberRank, getMemberFee } from "../api";
 export default {
-  props: ["form", "isUserType", "organId", "addStudent", "showTime","viewDetail"],
+  props: [
+    "form",
+    "isUserType",
+    "organId",
+    "addStudent",
+    "showTime",
+    "viewDetail",
+  ],
   data() {
     return {
       paymentPatternTypeOptions: objectToOptions(paymentPatternType),
@@ -124,6 +130,7 @@ export default {
           return time.getTime() + 86400000 <= new Date().getTime();
         },
       },
+      dataTime: ["2021-05-14", "2021-05-19"],
       memberRankList: [],
       radio: true,
     };
@@ -131,12 +138,12 @@ export default {
   async mounted() {
     // 获取所有得会员信息
     try {
-      const res = await getAllmemberRank({isDefault:0});
+      const res = await getAllmemberRank({ isDefault: 0 });
       this.memberRankList = res.data;
     } catch (e) {
       console.log(e);
     }
-      this.$set(this.form, "memberValidDate", 6);
+    this.$set(this.form, "memberValidDate", 6);
   },
   methods: {
     async memberRankSettingIdChange(val) {
@@ -160,11 +167,6 @@ export default {
           } else {
             this.$message.error("请设置该会员的默认价格");
           }
-
-          console.log(
-            this.form.memberPaymentAmount,
-            res.data?.currentHalfYearFee
-          );
         } catch (e) {
           console.log(e);
         }
@@ -183,17 +185,16 @@ export default {
         this.$set(this.form, "memberValidDate", 6);
       }
     },
-    viewDetail:{
-      deep:true,
-      handler(val){
-        if(val.musicGroupPaymentCalenders[0]?.memberRankSettingId){
-          this.radio = true
-        }else{
-          this.radio = false
+    viewDetail: {
+      deep: true,
+      handler(val) {
+        if (val.musicGroupPaymentCalenders[0]?.memberRankSettingId) {
+          this.radio = true;
+        } else {
+          this.radio = false;
         }
-      }
-    }
-
+      },
+    },
   },
 };
 </script>

src/views/resetTeaming/modals/user-pay-form.vue

@@ -13,7 +13,9 @@
     <userBaseinfo
       :form.sync="form"
       :isCommon="isCommon"
-      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
+      v-if="
+        paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST' && courseViewType != 2
+      "
       :isUserType="isUserType"
       @getCharges="getCharges"
       @changeActive="changeActive"
@@ -72,9 +74,9 @@
     </template>
     <!-- 续费或临时加课 -->
     <template v-else-if="(!isCommon && eclass.length) || isCommon">
-      <div>
+      <!--    会员团的续费不显现 -->
+      <div v-if="!(courseViewType == 2 && paymentType == 1)">
         <extraClass
-          v-if="courseViewType != 2"
           :form="eclass"
           ref="eclass"
           :isCommon="isCommon"
@@ -89,29 +91,6 @@
             form.leixing === '1' || form.leixing === '2' || paymentType == '0'
           "
         />
-        <template v-else>
-          <div>
-            <el-alert
-              title="会员设置"
-              :closable="false"
-              class="alert"
-              style="margin-top: 20px"
-              type="info"
-              v-if="courseViewType == 2 && paymentType != 2"
-            >
-            </el-alert>
-            <memberSetting
-              ref="memberSetting"
-              v-if="courseViewType == 2 && paymentType != 2"
-              :form="memberForm"
-              :viewDetail="nowDetail"
-              :isUserType="isUserType"
-              :organId="baseInfo.musicGroup.organId"
-              :addStudent="showMember"
-              :showTime="true"
-            />
-          </div>
-        </template>
       </div>
     </template>
 
@@ -133,9 +112,9 @@
         :isUserType="isUserType"
         :organId="baseInfo.musicGroup.organId"
         :addStudent="showMember"
-        :showTime="false"
+        :showTime="paymentType == 1"
       />
-      <div v-if="!(courseViewType == 2 && form.leixing == 1)">
+      <div v-if="!(courseViewType == 2 && paymentType == 1)">
         <el-alert title="缴费设置" :closable="false" class="alert" type="info">
         </el-alert>
         <!-- 缴费设置的  不是会员团切不是续费 续费{{form.leixing}} -->
@@ -279,6 +258,7 @@ import memberSetting from "./member-setting";
 import baseInfoVue from "../../teamDetail/components/baseInfo.vue";
 import merge from "webpack-merge";
 import numeral from "numeral";
+import dayjs from "dayjs";
 // import { organizationCloudTeacherFeeQueryPage } from "@/api/specialSetting";
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -485,30 +465,14 @@ export default {
         this.$set(this.form, "leixing", "2");
         this.addExtraClass();
       }
-      // if (
-      //   !this.paymentType &&
-      //   this.type == "user" &&
-      //   organId &&
-      //   (this.courseViewType == 2 || this.courseViewType == 3)
-      // ) {
-      //   try {
-      //     const res = await organizationCloudTeacherFeeQueryPage({ organId });
-      //     this.courseViewType == 2
-      //       ? (this.cloudFee = res.data.rows[0].price)
-      //       : (this.cloudFee = res.data.rows[0].plusPrice);
-      //   } catch (e) {
-      //     console.log(e);
-      //   }
-      //   // 获取乐团云教练费用
-      //   // this.cloudFee
-      // }
       this.getCharges();
       if (this.rowDetail) {
         for (const key in paymentTypeFormat) {
           if (paymentTypeFormat.hasOwnProperty(key)) {
             const item = paymentTypeFormat[key];
             if (item === this.rowDetail.paymentType) {
-              this.paymentType = key;
+              this.$emit('changePaymentType',key)
+              // this.paymentType = key;
             }
           }
         }
@@ -571,6 +535,7 @@ export default {
             this.viewDetail.musicGroupPaymentCalenders[0]
               .originalMemberPaymentAmount
           );
+
           if (this.$refs.cycle) {
             this.$set(
               this.cycle,
@@ -597,6 +562,12 @@ export default {
             "musicGroupOrganizationCourseSettingId",
             res.data.auditDto?.musicGroupOrganizationCourseSettingsId
           );
+          if (this.courseViewType == 2 && this.form.leixing == 1) {
+            // 会员团续费
+
+            this.$set(this.memberForm, "paymentDate", [dayjs(firstPayment.startPaymentDate).format("YYYY-MM-DD"),dayjs(firstPayment.deadlinePaymentDate).format("YYYY-MM-DD")
+            ]);
+          }
           this.syncAllMoney();
         } catch (error) {}
       }
@@ -771,7 +742,9 @@ export default {
       ) {
         return this.$message.error("请至少选择一条加课信息");
       }
+
       if (valided.length === forms.length) {
+        // 验证通过
         const { leixing, ...rest } = {
           ...this.form,
           ...this.other,
@@ -780,7 +753,6 @@ export default {
           musicGroupPaymentDateRangeList: [
             ...this.cycles.map((item) => {
               const { paymentDate, paymentValid, ...other } = item;
-              console.log(item)
               return {
                 ...other,
                 ...getTimes(paymentDate, [
@@ -798,7 +770,17 @@ export default {
           musicGroupPaymentCalenderCourseSettingsList: this.eclass,
           musicGroupPaymentCalenderStudentDetails: this.eclassuser,
         };
-         console.log('直接循环')
+        // 如果是会员团续费 则添加缴费开始时间 缴费结束时间
+        const { paymentDate, ...some } = this.memberForm;
+        if (this.courseViewType == 2 && this.form.leixing == 1) {
+          rest.musicGroupPaymentDateRangeList[0] = {
+            ...getTimes(paymentDate, [
+              "startPaymentDate",
+              "deadlinePaymentDate",
+            ]),
+          };
+        }
+
         if (this.$refs.cycle) {
           const { paymentDate, paymentValid, ...other } = this.cycle;
           rest.musicGroupPaymentDateRangeList = [
@@ -815,14 +797,10 @@ export default {
             },
           ];
         }
-        const { paymentDate, ...some } = this.memberForm;
+
         const data = {
           ...rest,
           ...some,
-          ...getTimes(paymentDate, [
-            "startPaymentDate",
-            "deadlinePaymentDate",
-          ]),
           isGiveMusicNetwork: false,
           studentIds: this.studentIds,
           paymentType: