会员乐团加续费

1

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -9,8 +9,9 @@
       label="缴费类型"
       prop="leixing"
       :rules="[{required: true, message: '请选择缴费类型', trigger: 'change'}]"
-      v-if="typeof paymentType === 'undefined'&&courseViewType != 2"
+      v-if="typeof paymentType === 'undefined'"
     >
+    <!-- &&courseViewType != 2 -->
       <el-radio-group style="width: 100%" v-model="form.leixing">
         <el-radio label="1">乐团续费</el-radio>
         <el-radio label="2">临时加课</el-radio>

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

@@ -55,6 +55,7 @@
         type="info"
       >
       </el-alert>
+      <!--这里是临时加课  -->
       <extraClass
         :form.sync="eclass"
         ref="eclass"
@@ -69,20 +70,51 @@
         @moneyChange="syncAllMoney"
       />
     </template>
-    <extraClass
-      v-else-if="(!isCommon && eclass.length) || isCommon"
-      :form="eclass"
-      ref="eclass"
-      :isCommon="isCommon"
-      @create="addExtraClass"
-      @remove="removeExtraClass"
-      @moneyChange="syncAllMoney"
-      :courseUnitPriceSettingsByType="organizationCourseUnitPriceSettingsByType"
-      :isUserType="isUserType"
-      :isDisabled="
-        form.leixing === '1' || form.leixing === '2' || paymentType == '0'
-      "
-    />
+    <template v-else-if="(!isCommon && eclass.length) || isCommon">
+      <div>
+        这是啥 {{ form.leixing }} paymentType:{{ paymentType }}
+        <extraClass
+          v-if="courseViewType != 2"
+          :form="eclass"
+          ref="eclass"
+          :isCommon="isCommon"
+          @create="addExtraClass"
+          @remove="removeExtraClass"
+          @moneyChange="syncAllMoney"
+          :courseUnitPriceSettingsByType="
+            organizationCourseUnitPriceSettingsByType
+          "
+          :isUserType="isUserType"
+          :isDisabled="
+            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="false"
+            />
+          </div>
+        </template>
+      </div>
+    </template>
+
     <template>
       <el-alert
         title="会员设置"
@@ -202,8 +234,10 @@
     <el-alert title="其它" :closable="false" class="alert" type="info">
     </el-alert>
     <otherform :form="other" ref="other" />
-    <div slot="footer" class="dialog-footer" >
-      <p v-if="paymentTypeString != 'SPAN_GROUP_CLASS_ADJUST'">缴费总金额:{{ money || 0 }}元</p>
+    <div slot="footer" class="dialog-footer">
+      <p v-if="paymentTypeString != 'SPAN_GROUP_CLASS_ADJUST'">
+        缴费总金额:{{ money || 0 }}元
+      </p>
       <div>
         <el-button @click="$listeners.close">取 消</el-button>
         <el-button type="primary" @click="submit">确认</el-button>
@@ -305,7 +339,7 @@ export default {
         paymentDate: [],
       },
       money: "",
-      isSetCourseSettingsId:false
+      isSetCourseSettingsId: false,
     };
   },
   computed: {
@@ -408,7 +442,7 @@ export default {
     async "form.musicGroupOrganizationCourseSettingId"(val) {
       // && !this.rowDetail
 
-      if (val&&!this.isSetCourseSettingsId) {
+      if (val && !this.isSetCourseSettingsId) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
             id: val,
@@ -420,7 +454,7 @@ export default {
           this.syncAllMoney();
         } catch (error) {}
       }
-      this.isSetCourseSettingsId = false
+      this.isSetCourseSettingsId = false;
     },
     "payment.paymentPattern"() {
       this.syncAllMoney();
@@ -553,8 +587,8 @@ export default {
             this.$set(this.cycle, "paymentValid", arr);
           }
           this.studentIds = firstPayment.studentIds;
-          if(res.data.auditDto?.musicGroupOrganizationCourseSettingsId){
-            this.isSetCourseSettingsId = true
+          if (res.data.auditDto?.musicGroupOrganizationCourseSettingsId) {
+            this.isSetCourseSettingsId = true;
           }
           this.$set(
             this.form,