提交一下

1

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

@@ -100,6 +100,7 @@
         type="daterange"
         style="width: 620px"
         :picker-options="pickerOptions"
+        value-format="yyyy-MM-DD"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"

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

@@ -102,7 +102,7 @@
             </el-alert>
             <memberSetting
               ref="memberSetting"
-              v-if="courseViewType == 2  && paymentType != 2"
+              v-if="courseViewType == 2 && paymentType != 2"
               :form="memberForm"
               :viewDetail="nowDetail"
               :isUserType="isUserType"
@@ -135,12 +135,12 @@
         :addStudent="showMember"
         :showTime="false"
       />
-    <div v-if="!(courseViewType == 2&&form.leixing == 1)">
-      <el-alert title="缴费设置" :closable="false" class="alert" type="info">
-      </el-alert>
-      <!-- 缴费设置的  不是会员团切不是续费 续费{{form.leixing}} -->
-      <el-form ref="payment" :model="payment">
-        <!-- <el-form-item
+      <div v-if="!(courseViewType == 2 && form.leixing == 1)">
+        <el-alert title="缴费设置" :closable="false" class="alert" type="info">
+        </el-alert>
+        <!-- 缴费设置的  不是会员团切不是续费 续费{{form.leixing}} -->
+        <el-form ref="payment" :model="payment">
+          <!-- <el-form-item
           label-width="160px"
           label="系统缴费金额"
           v-if="
@@ -151,86 +151,86 @@
         >
           <el-input :disabled="true" v-model="cloudFee"></el-input>
         </el-form-item> -->
-        <el-form-item
-          label-width="160px"
-          label="缴费方式"
-          prop="paymentPattern"
-          :rules="[
-            { required: true, message: '请选择缴费方式', trigger: 'change' },
-          ]"
-        >
-          <el-select
-            style="width: 100% !important"
-            v-model="payment.paymentPattern"
-            placeholder="请选择缴费方式"
-            :disabled="courseViewType == 2 && paymentType !== undefined"
+          <el-form-item
+            label-width="160px"
+            label="缴费方式"
+            prop="paymentPattern"
+            :rules="[
+              { required: true, message: '请选择缴费方式', trigger: 'change' },
+            ]"
           >
-            <el-option
-              v-for="item in paymentPatternTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+            <el-select
+              style="width: 100% !important"
+              v-model="payment.paymentPattern"
+              placeholder="请选择缴费方式"
+              :disabled="courseViewType == 2 && paymentType !== undefined"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <template
-        v-if="isMulticycle && paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
-      >
-        <el-collapse :value="collapse" @change="collapseChange">
-          <el-collapse-item
-            v-for="(item, index) in cycles"
-            :key="index"
-            :name="index"
-          >
-            <template slot="title">
-              <div class="collapse-title">
-                <span>缴费周期 {{ index + 1 }}</span>
-                <i
-                  v-if="cycles.length > 1"
-                  class="el-icon-circle-close"
-                  @click.stop="removeCycle(index)"
-                ></i>
-              </div>
-            </template>
-            <paymentCycle
-              ref="cycles"
-              :form="item"
-              :paymentType="paymentType"
-              :hidePaymentPattern="true"
-              :isCommon="isCommon"
-              :isUserType="isUserType"
-              :isDisabled="
-                form.leixing === '1' ||
-                form.leixing === '2' ||
-                paymentType == '0'
-              "
-            />
-          </el-collapse-item>
-        </el-collapse>
-        <el-button
-          icon="el-icon-circle-plus-outline"
-          plain
-          type="info"
-          size="small"
-          style="width: 100%; margin: 20px 0"
-          @click="addCycle"
-          >新增缴费周期</el-button
+              <el-option
+                v-for="item in paymentPatternTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <template
+          v-if="isMulticycle && paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
         >
-      </template>
-      <paymentCycle
-        ref="cycle"
-        :form.sync="cycle"
-        :isCommon="isCommon"
-        :hidePaymentPattern="true"
-        :isUserType="isUserType"
-        :isDisabled="
-          form.leixing === '1' || form.leixing === '2' || paymentType === '0'
-        "
-        :courseViewType="courseViewType"
-        v-else
-      />
+          <el-collapse :value="collapse" @change="collapseChange">
+            <el-collapse-item
+              v-for="(item, index) in cycles"
+              :key="index"
+              :name="index"
+            >
+              <template slot="title">
+                <div class="collapse-title">
+                  <span>缴费周期 {{ index + 1 }}</span>
+                  <i
+                    v-if="cycles.length > 1"
+                    class="el-icon-circle-close"
+                    @click.stop="removeCycle(index)"
+                  ></i>
+                </div>
+              </template>
+              <paymentCycle
+                ref="cycles"
+                :form="item"
+                :paymentType="paymentType"
+                :hidePaymentPattern="true"
+                :isCommon="isCommon"
+                :isUserType="isUserType"
+                :isDisabled="
+                  form.leixing === '1' ||
+                  form.leixing === '2' ||
+                  paymentType == '0'
+                "
+              />
+            </el-collapse-item>
+          </el-collapse>
+          <el-button
+            icon="el-icon-circle-plus-outline"
+            plain
+            type="info"
+            size="small"
+            style="width: 100%; margin: 20px 0"
+            @click="addCycle"
+            >新增缴费周期</el-button
+          >
+        </template>
+        <paymentCycle
+          ref="cycle"
+          :form.sync="cycle"
+          :isCommon="isCommon"
+          :hidePaymentPattern="true"
+          :isUserType="isUserType"
+          :isDisabled="
+            form.leixing === '1' || form.leixing === '2' || paymentType === '0'
+          "
+          :courseViewType="courseViewType"
+          v-else
+        />
       </div>
     </template>
     <el-alert title="其它" :closable="false" class="alert" type="info">
@@ -481,7 +481,7 @@ export default {
       this.courseViewType = this.baseInfo?.musicGroup?.courseViewType;
       // 如果为学员缴费且是乐团缴费则显示云教练的价格
       //  进行中添加
-      if (this.courseViewType == 2 && !this.rowDetail&&!this.isUserType) {
+      if (this.courseViewType == 2 && !this.rowDetail && !this.isUserType) {
         this.$set(this.form, "leixing", "2");
         this.addExtraClass();
       }
@@ -780,6 +780,7 @@ export default {
           musicGroupPaymentDateRangeList: [
             ...this.cycles.map((item) => {
               const { paymentDate, paymentValid, ...other } = item;
+              console.log(item)
               return {
                 ...other,
                 ...getTimes(paymentDate, [
@@ -793,9 +794,11 @@ export default {
               };
             }),
           ],
+
           musicGroupPaymentCalenderCourseSettingsList: this.eclass,
           musicGroupPaymentCalenderStudentDetails: this.eclassuser,
         };
+         console.log('直接循环')
         if (this.$refs.cycle) {
           const { paymentDate, paymentValid, ...other } = this.cycle;
           rest.musicGroupPaymentDateRangeList = [
@@ -812,9 +815,14 @@ export default {
             },
           ];
         }
+        const { paymentDate, ...some } = this.memberForm;
         const data = {
           ...rest,
-          ...this.memberForm,
+          ...some,
+          ...getTimes(paymentDate, [
+            "startPaymentDate",
+            "deadlinePaymentDate",
+          ]),
           isGiveMusicNetwork: false,
           studentIds: this.studentIds,
           paymentType: