Merge branch 'LAO_MO' into online

src/views/resetTeaming/components/resetSound.vue

@@ -39,6 +39,7 @@
                          multiple
                          clearable
                          filterable
+                         @change="changezhonglei(scope.row)"
                          collapse-tags>
                 <el-option v-for="(item,index) in scope.row.goodsList"
                            :key='index'
@@ -289,10 +290,11 @@
                         disabled></el-input>
             </div>
             <div class="item">
+              <!--  v-model="item.mode.FREE" -->
               <el-input style="width:80%"
                         type="number"
                         @mousewheel.native.prevent
-                        v-model="item.mode.FREE"></el-input>
+                        disabled></el-input>
             </div>
 
           </div>
@@ -488,12 +490,11 @@ export default {
               goodsItem = goods
             }
           })
-          let kitGroupPurchaseTypeJson = ''
+          let kitGroupPurchaseTypeJson = null
           let depositFee;
           let price
           active.fangshi.forEach(fs => {
             if (fs.id == zl) {
-
               depositFee = fs.mode.depositFee
               price = fs.mode.price
               let types = {}
@@ -508,6 +509,7 @@ export default {
                 types.LEASE = fs.mode.LEASE
               }
               kitGroupPurchaseTypeJson = JSON.stringify(types)
+
               if (kitGroupPurchaseTypeJson.length <= 0) {
                 kitGroupPurchaseTypeJson = null
               }
@@ -671,7 +673,10 @@ export default {
     },
     setDeposiInput (val, item) {
       item.mode.LEASE = 0;
-    }
+    },
+    changezhonglei (row) {
+      row.fangshi = []
+    },
 
   }, filters: {
     zhongleiFilter (val, list) {

src/views/teamBuild/components/teamSoundMoney.vue

@@ -801,7 +801,7 @@ export default {
                 goodsItem = goods
               }
             })
-            let kitGroupPurchaseTypeJson = ''
+            let kitGroupPurchaseTypeJson = null
             let depositFee, price;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {
@@ -901,7 +901,7 @@ export default {
                 goodsItem = goods
               }
             })
-            let kitGroupPurchaseTypeJson = ''
+            let kitGroupPurchaseTypeJson = null
             let depositFee, price;
             active.fangshi.forEach(fs => {
               if (fs.id == zl) {

src/views/teamBuild/signupList.vue

@@ -467,41 +467,48 @@ export default {
   },
   created () {
     // 通过乐团状态判断显示隐藏的东西
-    this.status = this.$route.query.status;
-    // 通过乐团id 获取乐团招生状态
-    this.id = this.$route.query.id;
-    this.teamName = this.$route.query.name
-    // 判断是否带缓存参数
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules
-    }
-
+    this.init()
+  },
+  activated () {
+    this.init()
   },
   mounted () {
-    getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        this.applyExpireDate = res.data.musicGroup.applyExpireDate;
-      }
-    })
-    // 根据乐团id获取学团情况
-    getintoClass({ musicGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        this.leftList = res.data;
-      }
-    })
-    // 根据乐团id获乐团声部
-    findSound({ musicGroupId: this.id }).then(res => {
-      if (res.code == 200) {
-        this.soundList = res.data;
-      }
-    })
-    // 通过乐团id获取乐团学生列表
-    this.getList()
+
   },
   methods: {
+    init () {
+      this.status = this.$route.query.status;
+      // 通过乐团id 获取乐团招生状态
+      this.id = this.$route.query.id;
+      this.teamName = this.$route.query.name
+      // 判断是否带缓存参数
+      if (this.$route.query.search) {
+        this.Fsearch = this.$route.query.search;
+      }
+      if (this.$route.query.rules) {
+        this.Frules = this.$route.query.rules
+      }
+
+      getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.applyExpireDate = res.data.musicGroup.applyExpireDate;
+        }
+      })
+      // 根据乐团id获取学团情况
+      getintoClass({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.leftList = res.data;
+        }
+      })
+      // 根据乐团id获乐团声部
+      findSound({ musicGroupId: this.id }).then(res => {
+        if (res.code == 200) {
+          this.soundList = res.data;
+        }
+      })
+      // 通过乐团id获取乐团学生列表
+      this.getList()
+    },
     search () {
       this.rules.page = 1;
       this.getList();

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -11,15 +11,45 @@
         <el-input disabled></el-input>
       </el-form-item>
     </el-form>
+    <div class="tableWrap">
+      <el-table :data='tableList'
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align='center'
+                         prop="id"
+                         label="学生姓名">
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="id"
+                         label="手机号">
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="id"
+                         label="学生状态">
+        </el-table-column>
+      </el-table>
+      <pagination :total="rules.total"
+                  :page.sync="rules.page"
+                  :limit.sync="rules.limit"
+                  @pagination="getList" />
+    </div>
   </div>
 </template>
 <script>
 import { findStudentAttendance } from '@/api/buildTeam'
+import pagination from '@/components/Pagination/index'
 export default {
   props: ['courseScheduleId'],
+  components: { pagination },
   data () {
     return {
-      tableList: []
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+
+      },
     }
   },
   mounted () {
@@ -31,10 +61,14 @@ export default {
   methods: {
     init () {
       console.log(this.courseScheduleId)
+      this.getList()
+
+      //  发请求获取学生签到信息
+    },
+    getList () {
       findStudentAttendance({ search: this.courseScheduleId }).then(res => {
 
       })
-      //  发请求获取学生签到信息
     }
   }
 }

src/views/teamDetail/teamCourseList.vue

@@ -167,7 +167,7 @@
                            label="指导老师">
           </el-table-column>
 
-          <!-- <el-table-column align='center'
+          <el-table-column align='center'
                            label="详情">
             <template slot-scope="scope">
               <div>
@@ -175,7 +175,7 @@
                            @click="lookDetail(scope.row)">详情</el-button>
               </div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
         <pagination :total="rules.total"
                     :page.sync="rules.page"