1108 14:34

111

src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -92,7 +92,8 @@
       <div class="right">
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column label="课次">
+          <el-table-column label="课次"
+                           width="180">
             <template slot-scope="scope">
               <div>
                 {{ scope.$index+1 }}
@@ -119,18 +120,18 @@
                            label="课程名称"
                            width="180">
           </el-table-column>
-          <el-table-column prop="classTime"
+          <!-- <el-table-column prop="classTime"
                            label="上课时间"
                            width="180">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作"
                            width="180">
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
-                           @click="OpenSign(scope.row)">展开</el-button>
+                           @click="OpenSign(scope.row)">查看</el-button>
                 <el-button type="text"
-                           @click='resetMixCourse(scope.row)'>修改</el-button>
+                           @click='resetMixCourse(scope.row)'>变更</el-button>
                 <el-button type="text"
                            @click='skipClass(scope.row)'>跳过此天</el-button>
               </div>
@@ -183,27 +184,27 @@
           <el-table-column prop="name"
                            label="班级">
           </el-table-column>
-          <el-table-column prop="startClassTime"
+          <el-table-column prop="startClassTimeStr"
                            label="开始时间">
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div>
-                <p v-if="scope.row.option == 1">{{scope.row.startClassTimeStr  }}</p>
+                <p v-if="scope.row.option == 1">{{scope.row.startClassTimeStr}}</p>
                 <el-input v-if="scope.row.option == 2"
                           v-model="scope.row.startClassTimeStr"></el-input>
               </div>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column prop="endClassTimeStr"
                            label="结束时间">
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div>
-                <p v-if="scope.row.option == 1">{{scope.row.endClassTimeStr  }}</p>
+                <p v-if="scope.row.option == 1">{{scope.row.endClassTimeStr}}</p>
                 <el-input v-if="scope.row.option == 2"
                           v-model="scope.row.endClassTimeStr"></el-input>
               </div>
-            </template>
+            </template> -->
           </el-table-column>
-          <el-table-column prop="date"
+          <!-- <el-table-column prop="date"
                            label="操作">
             <template slot-scope="scope">
               <div>
@@ -215,7 +216,7 @@
                            @click="savecolumn(scope.row)">修改</el-button>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <span slot="footer"
               class="dialog-footer">
@@ -453,13 +454,13 @@ export default {
     },
     skipClass (row) {
       // 这里是跳过此天
-      let loadingInstance = Loading.service();
+      let loadingInstance = Loading.service({
+        lock: true,
+        text: '加载中……',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       setTimeout(res => {
-        loadingInstance.close({
-          lock: true,
-          text: '加载中……',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
+        loadingInstance.close();
       }, 1000)
       let lastTime = this.tableList[this.tableList.length - 1].classDate;
       let id = this.tableList[this.tableList.length - 1].id;
@@ -500,8 +501,9 @@ export default {
       let activeTpye = this.tableActive.type;
       let startClassTime;
       let endClassTime;
+
       if (this.chioseType.indexOf('MIX') != -1) {
-        // 单技改合奏 
+        // 改合奏 
         // 删除真实课表里的所有相关单技课
         for (let i = 0; i < this.classCardList.length; i++) {
           if (this.activeTime == this.classCardList[i].classDate && this.startClassTimeStr == this.classCardList[i].startClassTimeStr && this.endClassTimeStr == this.classCardList[i].endClassTimeStr) {
@@ -525,22 +527,24 @@ export default {
         }
         //
       } else if (this.chioseType.indexOf('SINGLE') != -1 || this.chioseType.indexOf('CLASSROOM') != -1) {
-        // 合奏改单技
+        // 合奏改单技 
         for (let i in this.tableList) {
-          if (this.activeTime == this.classCardList[i].classDate && this.startClassTimeStr == this.classCardList[i].startClassTimeStr && this.endClassTimeStr == this.classCardList[i].endClassTimeStr) {
+          if (this.activeTime == this.tableList[i].classDate && this.startClassTimeStr == this.tableList[i].startClassTimeStr && this.endClassTimeStr == this.tableList[i].endClassTimeStr) {
             this.tableList[i].type = this.chioseType;
             startClassTime = this.tableList[i].startClassTime;
             endClassTime = this.tableList[i].endClassTime;
           }
         }
         let activeTableItem = {};
+
         // 修改提交表里的状态
         for (let j = 0; j < this.classCardList.length; j++) {
           for (let i in this.tableList) {
-            if (this.activeTime == this.classCardList[i].classDate && this.startClassTimeStr == this.classCardList[i].startClassTimeStr && this.endClassTimeStr == this.classCardList[i].endClassTimeStr) {
+            if (this.activeTime == this.classCardList[j].classDate && this.startClassTimeStr == this.classCardList[j].startClassTimeStr && this.endClassTimeStr == this.classCardList[j].endClassTimeStr) {
               // this.classCardList[j].type = "SINGLE";
               // this.classCardList[j].startClassTime = startClassTime;
               // this.classCardList[j].endClassTime = endClassTime;
+
               activeTableItem = this.tableList[i];
               this.classCardList.splice(j, 1);
               j--
@@ -548,6 +552,7 @@ export default {
           }
         }
         //添加单机班课
+        console.log(this.chioseType)
         for (let z in this.activeSingleList) {
           let obj = {
             'classDate': activeTableItem.classDate,
@@ -617,7 +622,7 @@ export default {
             'week': this.weekDay[weekArr[i].weekNum],
             'type': 'SINGLE',
             'id': id,
-
+            'mixid': id,
             'name': className,
             'classTime': nowStartTime + '-' + nowEndTime,
             'startClassTimeStr': nowStartTime,
@@ -667,12 +672,12 @@ export default {
       let id = row.id;
       this.SignList = [];
       for (let i in this.classCardList) {
-        if (this.classCardList[i].mixid == row.id && this.classCardList[i].classDate == row.classDate && this.classCardList[i].startClassTimeStr == row.startClassTimeStr && this.classCardList[i].endClassTimeStr == row.endClassTimeStr) {
+        if (this.classCardList[i].mixid == row.id && this.classCardList[i].classDate == row.classDate) {
 
           this.SignList.push(this.classCardList[i])
         }
       }
-
+      console.log(this.SignList);
       this.openSignListVisible = true;
     },
     savecolumn (row) {