Merge branch 'ol_12_30' into online

src/views/auditList/index.vue

@@ -128,6 +128,14 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           prop="auditMemo"
+                           width="200px"
+                           label="审核备注">
+            <template slot-scope="scope">
+              <overflow-text width="200px" :text="scope.row.auditMemo" />
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
                            prop="operatorName"
                            label="申请人"></el-table-column>
           <el-table-column align="center"

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

@@ -379,7 +379,6 @@ export default {
           }
         }
       }
-      console.log(first, other)
       if (this.cycles && this.cycles.length) {
         this.cycles = this.cycles.map((item, index) => {
           return {

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

@@ -131,6 +131,13 @@
       :isCommon="false"
       :isDisabled="true"
     />
+    <el-alert title="其它"
+              :closable="false"
+              class="alert"
+              type="info">
+    </el-alert>
+    <otherform :form="other"
+               ref="other" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="$listeners.close">取 消</el-button>
       <el-button type="primary" @click="submit">确认</el-button>
@@ -139,6 +146,7 @@
 </template>
 <script>
 import paymentCycle from "../../../resetTeaming/modals/payment-cycle";
+import otherform from "../../../resetTeaming/modals/other";
 import extraClass from "../../../resetTeaming/modals/extra-class";
 import { musicGroupPaymentCalenderAdd } from '../../../resetTeaming/api'
 import { queryRemainCourseTypeDuration } from '../../api'
@@ -149,6 +157,7 @@ export default {
   props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
   components: {
     paymentCycle,
+    otherform,
     extraClass
   },
   data() {
@@ -164,6 +173,7 @@ export default {
       payment: {
         paymentPattern: null,
       },
+      other: {},
       cycle: {},
       eclass: [],
       collapse: [0],
@@ -288,7 +298,7 @@ export default {
     },
     getForms() {
       const { $refs: refs } = this;
-      return [refs.eclass, refs.cycle, refs.payment, ...(refs.cycles || [])]
+      return [refs.eclass, refs.cycle, refs.payment, refs.other, ...(refs.cycles || [])]
         .filter((item) => !!item)
         .map((item) => item.$refs.form || item);
     },
@@ -345,6 +355,7 @@ export default {
           payUserType: 'STUDENT',
           studentIds: this.createdUserId,
           musicGroupPaymentCalenderCourseSettingsList: this.eclass,
+          ...this.other,
         }
         try {
           await musicGroupPaymentCalenderAdd(data)