提交合班级优化

1

src/views/serverDetail/index.vue

@@ -80,7 +80,7 @@
             end-placeholder="结束日期"
             :clearable="false"
             @change="changeWeek"
-            :picker-options="bigin"
+            :picker-options="bigin()"
           >
           </el-date-picker>
         </el-form-item>

src/views/teamDetail/componentClass/classCompound.vue

@@ -14,19 +14,36 @@
 
             <el-divider></el-divider>
           </div>
-          <el-button type="text" style="float: right" @click="clearCom"
+          <div class="topWrap">
+             <el-select
+            placeholder="请选择主班"
+            v-model="radio"
+            clearable
+            @change="changeMasterClass"
+          >
+            <el-option
+              v-for="(item, index) in dataList"
+              :label="item.name"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+             <el-button type="text" style="float: right" @click="clearCom"
             >清空列表</el-button
           >
+          </div>
+
           <div>
-            <el-radio-group v-model="radio" @change="changeMasterClass">
+            <!-- <el-radio-group v-model="radio" @change="changeMasterClass"> -->
               <el-table
                 :data="dataList"
                 height="300px"
                 :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
               >
-                <el-table-column align="center" label="主班" width="110">
+                <el-table-column align="center" label="班级编号" width="110">
                   <template slot-scope="scope">
-                    <el-radio :label="scope.row.id"></el-radio>
+                    {{scope.row.id}}
+                    <!-- <el-radio :label="scope.row.id"></el-radio> -->
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -69,7 +86,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-            </el-radio-group>
+            <!-- </el-radio-group> -->
           </div>
           <el-button
             type="primary"
@@ -164,6 +181,9 @@ export default {
   },
   methods: {
     cancleCom(row) {
+      if(row.id== this.radio){
+        this.radio = ''
+      }
       this.$emit("cancleCompound", row);
     },
     clearCom() {
@@ -326,6 +346,10 @@ export default {
 /deep/.el-divider--horizontal {
   margin: 0 !important;
 }
+.topWrap{
+  margin: 10px 0;
+  padding: 0 20px 0 0;
+}
 .minus {
   float: right;
   line-height: 44px;