Merge branch 'LAO_MO' into online

src/views/businessManager/resetList/index.vue

@@ -133,7 +133,8 @@
                            label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text">修改</el-button>
+                <el-button type="text"
+                           @click="reset(scope.row)">修改</el-button>
               </div>
             </template>
           </el-table-column>
@@ -145,7 +146,7 @@
                     @pagination="getList" />
       </div>
     </div>
-    <resetSound />
+    <resetSound :show="show" />
   </div>
 </template>
 
@@ -164,6 +165,7 @@ export default {
         search: null,
         resetDate: null
       },
+      show: false,
       teacherList: [],
       tableList: [{}],
       organList: [],
@@ -202,7 +204,10 @@ export default {
   methods: {
     init () {
     },
-    getList () { }
+    getList () { },
+    reset (row) {
+      this.show = true
+    }
   }
 };
 </script>

src/views/businessManager/resetList/resetSound.vue

@@ -2,6 +2,7 @@
   <div>
     <el-dialog title="修改"
                width="700px"
+               inline
                :visible.sync="soundVisible">
       <el-form :model="soundForm"
                ref="soundForm">
@@ -55,7 +56,8 @@ export default {
   data () {
     return {
       soundForm: {},
-      soundVisible: false
+      soundVisible: false,
+      value1: null
     }
   },
   mounted () { },
@@ -63,6 +65,11 @@ export default {
   watch: {
     show (val) {
       this.soundVisible = val
+    },
+    soundVisible (val) {
+      if (!val) {
+        // this.
+      }
     }
   }
 }

src/views/teamDetail/components/resetClass.vue

@@ -437,6 +437,7 @@
             <span>结束时间</span>
             <el-time-select placeholder
                             v-model.trim="item.endClassTime"
+                            @change="(val)=>{changeEndClassTime(item,val)}"
                             :picker-options="{
                               start: '04:30',
                               step: step,
@@ -1606,7 +1607,11 @@ export default {
 
     },
     changeStartClassTime (item) {
-      item.endClassTime = ''
+      // item.endClassTime = ''
+      this.$set(item, 'endClassTime', '')
+    },
+    changeEndClassTime (item, val) {
+      this.$set(item, 'endClassTime', val)
     },
     changeCourseType (val) {
       console.log(val)