Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/views/resetTeaming/components/resetPayList.vue

@@ -285,7 +285,7 @@
       <userPayForm v-if="userVisible"
                    @close="userVisible = false"
                    @submited="payedSubmited"
-                   @changeActive="$listeners.changeActive"
+                   @changeActive="changeActive"
                    :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
                    :rowDetail='activeRow'
                    :type="payFormType"
@@ -539,6 +539,11 @@ export default {
       this.payFormType = row.payUserType === 'SCHOOL' ? 'school' : 'user'
       this.userVisible = true;
     },
+    changeActive(val) {
+      if (this.$listeners.changeActive) {
+        this.$listeners.changeActive(val)
+      }
+    },
     async chioseStudentSubmited () {
       try {
         await this.$confirm('缴费创建完成, 是否立即排课？', '提示', {

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -292,7 +292,7 @@
       <userPayForm v-if="userVisible"
                    @close="userVisible = false"
                    @submited="payedSubmited"
-                   @changeActive="$listeners.changeActive"
+                   @changeActive="changeActive"
                    :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
                    :rowDetail='activeRow'
                    :type="payFormType"
@@ -524,6 +524,11 @@ export default {
       this.payFormType = row.payUserType === 'SCHOOL' ? 'school' : 'user'
       this.userVisible = true;
     },
+    changeActive(val) {
+      if (this.$listeners.changeActive) {
+        this.$listeners.changeActive(val)
+      }
+    },
     async chioseStudentSubmited () {
       try {
         await this.$confirm('缴费创建完成, 是否立即排课？', '提示', {

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

@@ -51,7 +51,11 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="memo" label="备注"></el-table-column>
+      <el-table-column align="center" prop="memo" label="备注" width="200">
+        <template slot-scope="scope">
+          <overflow-text :text="scope.row.memo" width="200px"></overflow-text>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" fixed="right" min-width="200px">
         <template slot-scope="scope">
           <div>

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

@@ -434,7 +434,6 @@ export default {
       if (this.collapse.includes(index)) {
         this.collapse.splice(index, 1);
         this.collapse = this.collapse.map((item, _index) => _index - 1 >= index ? item -- : item)
-        console.log(this.collapse)
       }
       this.syncAllMoney()
     },

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

@@ -268,13 +268,16 @@ export default {
     },
     addCycle () {
       this.cycles.push({});
-      this.collapse.push(this.collapse.length);
+      this.collapse.push(this.cycles.length);
       this.syncAllMoney()
     },
     removeCycle (index) {
       this.cycles[index] = null;
       this.cycles = this.cycles.filter((item) => !!item);
-      this.collapse.pop();
+      if (this.collapse.includes(index)) {
+        this.collapse.splice(index, 1);
+        this.collapse = this.collapse.map((item, _index) => _index - 1 >= index ? item -- : item)
+      }
       this.syncAllMoney()
     },
     collapseChange (val) {