2020/01/03

17:18 提交测试

src/views/teamBuild/components/teamSoundMoney.vue

@@ -501,7 +501,6 @@ export default {
             }
             obj.musicGroupSubjectGoodsGroups.push(some);
           })
-
           // 附件
           active.markList.forEach(mark => {
             if (mark.goods.length >= 1) {
@@ -541,6 +540,7 @@ export default {
           type: 'warning'
         }).then(() => {
           createTeam(obj).then(res => {
+
             if (res.code == 200) {
               // 成功 跳转到乐团报名详情
               this.$router.push({ path: '/business/teamDetail', query: { search: this.Fsearch, rules: this.Frules } })
@@ -549,6 +549,7 @@ export default {
         }).catch(() => { })
 
       } else {
+
         // 只提交第二页的数据
         let obj = {};
         let activeSoundList = this.activeSoundList
@@ -739,7 +740,7 @@ export default {
             if (res.code == 200) {
               this.activeSoundList = res.data.map(item => {
                 // this.soundLists[0].push(item.subjectId)
-                let obj = { 'id': item.subjectId, 'sound': item.name, 'jihua': item.expectedStudentNum, 'yuji': item.fee, 'zhonglei': [], 'fangshi': item.kitGroupPurchaseType, 'fangshiprice': item.depositFee, 'jiaopu': '', 'type': 1, 'typeVisible': false, 'provideVisible': false, 'markVisible': false, 'goodsList': [], 'markList': [], 'markChioseList': [] }
+                let obj = { 'id': item.id, 'sound': item.name, 'jihua': item.expectedStudentNum, 'yuji': item.fee, 'zhonglei': [], 'fangshi': item.kitGroupPurchaseType, 'fangshiprice': item.depositFee, 'jiaopu': '', 'type': 1, 'typeVisible': false, 'provideVisible': false, 'markVisible': false, 'goodsList': [], 'markList': [], 'markChioseList': [] }
                 // this.checkinlist(obj);
                 return obj;
               })
@@ -853,7 +854,6 @@ export default {
     PlannedCount () {
       let Count = 0;
       for (let item in this.activeSoundList) {
-        console.log(this.activeSoundList[item].jihua)
         Count += parseInt(this.activeSoundList[item].jihua) || 0
       }
       return Count

src/views/teamDetail/components/studentList.vue

@@ -170,14 +170,11 @@
                          label="批量修改缴费">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.isLock?'可修改':'已锁定'}}
+              {{ scope.row.isLock?'已锁定':'可修改'}}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         label="缴费金额"
-                         prop="courseFee">
-        </el-table-column>
+
         <el-table-column align="center"
                          label="下次缴费日期"
                          prop="nextPaymentDate">
@@ -185,6 +182,10 @@
             {{ scope.row.nextPaymentDate | formatTimer }}
           </template>
         </el-table-column>
+        <el-table-column align="center"
+                         label="缴费金额"
+                         prop="courseFee">
+        </el-table-column>
         <el-table-column align='center'
                          label="报名缴费">
           <template slot-scope="scope">