缴费方式修改

src/views/resetTeaming/components/resetPayList.vue

@@ -143,6 +143,7 @@
         :batchNo="viewDetail && viewDetail.batchNo"
         payUserType="STUDENT"
         :teamStatus="teamStatus"
+        :teamType="teamType"
         @lookDetail="lookDetail"
         @openChioseStudent="openChioseStudent"
         @resetPay="resetPay"
@@ -431,6 +432,7 @@ export default {
       chioseStudentList: [],
       clearStduent: true,
       musicGroupPaymentCalenderId: "",
+      teamType: this.$route.query.type,
       payOrderTypeLists: payOrderTypeList,
       dialogSubjectVisible: false, // 预览声部
       dialogSubjectList: [],

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -261,6 +261,7 @@
         :batchNo="viewDetail && viewDetail.batchNo"
         payUserType="STUDENT"
         :teamStatus="teamStatus"
+        :teamType="teamType"
         @lookDetail="lookDetail"
         @openChioseStudent="openChioseStudent"
         @resetPay="resetPay"

src/views/resetTeaming/modals/pay-items.vue

@@ -84,7 +84,7 @@
             <el-button
               type="text"
               v-permission="'musicGroupPaymentCalender/makesureSchoolePaid'"
-              v-if="scope.row.status == 'OPEN' && teamType == 'resetTeam'"
+              v-if="scope.row.status == 'OPEN' && teamStatus == 'resetTeam'"
               @click="$listeners.commmitGetMoney(scope.row)"
               >确认收款</el-button
             >
@@ -109,7 +109,7 @@ import { addMusicGroupPaymentCalender, getMusicGroupPaymentCalender, resetMusicG
 import loading from '@/utils/loading'
 import pagination from "@/components/Pagination/index";
 export default {
-  props: ['batchNo', 'teamStatus'],
+  props: ['batchNo', 'teamStatus', 'teamType'],
   components: {
     pagination
   },

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -73,6 +73,22 @@
     />
     <el-alert title="缴费设置" :closable="false" class="alert" type="info">
     </el-alert>
+    <el-form ref="payment" :model="payment">
+        <el-form-item
+          label="缴费方式"
+          prop="paymentPattern"
+          :rules="[{required: true, message: '请选择缴费方式', trigger: 'change'}]"
+        >
+          <el-select style="width: 100%!important;" v-model="payment.paymentPattern" placeholder="请选择缴费方式">
+            <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>
     <el-collapse :value="collapse" @change="collapseChange" >
       <el-collapse-item
         v-for="(item, index) in cycles"
@@ -88,6 +104,7 @@
         <paymentCycle
           ref="cycles"
           :form="item"
+          :hidePaymentPattern="true"
           :isUserType="true"
           :isCommon="false"
           :isDisabled="true"
@@ -122,6 +139,7 @@ import { musicGroupPaymentCalenderAdd } from '../../../resetTeaming/api'
 import { queryRemainCourseTypeDuration } from '../../api'
 import { courseType } from '@/constant'
 import { getTimes, objectToOptions } from "@/utils";
+import { paymentPatternType } from '@/constant'
 export default {
   props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
   components: {
@@ -138,11 +156,15 @@ export default {
         highClass: '',
         snapClass: '',
       },
+      payment: {
+        paymentPattern: null,
+      },
       cycle: {},
       eclass: [],
       collapse: [0],
       cycles: [{}],
       organizationCourseUnitPriceSettingsByType: {},
+      paymentPatternTypeOptions: objectToOptions(paymentPatternType),
     }
   },
   watch: {
@@ -210,7 +232,6 @@ export default {
       for (const item of list) {
         _[item.courseType] = item
       }
-      console.log(_)
       this.organizationCourseUnitPriceSettingsByType = _
       return _
     },
@@ -241,7 +262,7 @@ export default {
     },
     getForms() {
       const { $refs: refs } = this;
-      return [refs.eclass, refs.cycle, ...refs.cycles]
+      return [refs.eclass, refs.cycle, refs.payment, ...refs.cycles]
         .filter((item) => !!item)
         .map((item) => item.$refs.form);
     },
@@ -281,6 +302,7 @@ export default {
                 "paymentValidStartDate",
                 "paymentValidEndDate",
               ]),
+              paymentPattern: this.payment.paymentPattern,
             }
           })],
           musicGroupId: this.musicGroupId,