Merge branch 'online' into LAO_MO

dist/static/css/chunk-6b3c8f63.33f00eb0.css → dist/static/css/chunk-4a55d3f0.771df458.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.wrap[data-v-6d86b3da]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-6d86b3da]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-6d86b3da],.wrap .rightCell[data-v-6d86b3da]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-6d86b3da]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-6d86b3da]{margin-right:30px}[data-v-6d86b3da] .el-tag{cursor:pointer}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.wrap[data-v-f715ab24]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-f715ab24]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-f715ab24],.wrap .rightCell[data-v-f715ab24]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-f715ab24]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-f715ab24]{margin-right:30px}[data-v-f715ab24] .el-tag{cursor:pointer}

dist/static/css/chunk-33ab15b4.485bd57e.css → dist/static/css/chunk-b492de72.3f9c7909.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-c556f9ec]{position:absolute;top:3px;right:2px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-305eb4f6]{position:absolute;top:3px;right:2px}

dist/static/css/chunk-4a7d856c.f0ff2a7a.css → dist/static/css/chunk-dea11c4e.e3f816f4.css

@@ -1 +1 @@
-.wrap[data-v-c506f63a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-c506f63a]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-c506f63a],.wrap .rightCell[data-v-c506f63a]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-c506f63a]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-c506f63a]{margin-right:30px}[data-v-c506f63a] .el-tag{cursor:pointer}
+.wrap[data-v-706cda31]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-706cda31]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-706cda31],.wrap .rightCell[data-v-706cda31]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-706cda31]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-706cda31]{margin-right:30px}[data-v-706cda31] .el-tag{cursor:pointer}

src/views/evaluateManager/networkList.vue

@@ -63,7 +63,7 @@
                      :key="index"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-select placeholder="提交作业"
                    v-model="searchForm.hasHandHomework"
                    clearable>
@@ -72,7 +72,7 @@
           <el-option label="未提交"
                      value="0"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-select placeholder="老师评价"
                    v-model="searchForm.hasReview"
@@ -161,6 +161,15 @@
         <el-table-column align="center"
                          prop="courseName"
                          label="课程名称"></el-table-column>
+        <el-table-column align="center"
+                         prop="courseName"
+                         label="上课日期">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.classDate | formatTimer }}
+            </div>
+          </template>
+        </el-table-column>
 
         <el-table-column align="center"
                          prop="subjectName"

src/views/evaluateManager/vipEvaluateList.vue

@@ -52,7 +52,7 @@
                      value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-select placeholder="教务评价"
                    v-model="searchForm.courseReview"
                    clearable>
@@ -63,7 +63,7 @@
           <el-option label="差"
                      value="差"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item>
         <el-select placeholder="是否到课"
                    v-model="searchForm.hasArrived"
@@ -131,6 +131,15 @@
                          prop="courseName"
                          label="课程名称"></el-table-column>
         <el-table-column align="center"
+                         prop="courseName"
+                         label="上课日期">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.classDate | formatTimer }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
                          prop="subjectName"
                          label="声部"></el-table-column>
         <el-table-column align="center"
@@ -210,11 +219,11 @@
             <p>回访日期</p>
             <p>{{ courseScheduleReview.createTime.substring(0,10) }}</p>
           </div>
-          <div class="leftCell"
+          <!-- <div class="leftCell"
                v-if="courseScheduleReview">
             <p>是否双向沟通</p>
             <p>{{courseScheduleReview.hasLiaison?'是':'否'}}</p>
-          </div>
+          </div> -->
           <div class="leftCell"
                v-if="courseScheduleReview">
             <p>是否提交作业</p>

src/views/operateManager/serverIndexList.vue

@@ -115,6 +115,18 @@
                           end-placeholder="结束日期"
                           @change="getWeekTime"></el-date-picker>
         </el-form-item>
+        <el-form-item label="作业提交时间">
+          <el-date-picker v-model.trim="searchForm.workTimer"
+                          style="width:400px;"
+                          type="daterange"
+                          :picker-options="{
+        firstDayOfWeek: 1
+    }"
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button type="danger"
                      @click="search">搜索</el-button>
@@ -273,6 +285,7 @@ export default {
         teacherId: null,
         existVipCourse: null,
         existPracticeCourse: null,
+        workTimer: []
       },
       organList: [],
       teacherList: [],
@@ -350,6 +363,11 @@ export default {
         this.$message.error("请选择时间段");
         return false;
       }
+      if (this.searchForm.workTimer && this.searchForm.workTimer.length > 0) {
+        obj.submitStartDate = this.searchForm.workTimer[0];
+        obj.submitEndDate = this.searchForm.workTimer[1];
+      }
+
       return obj;
     },
     getList () {

src/views/resetTeaming/components/resetSound.vue

@@ -11,12 +11,12 @@
                        width="180px;"
                        prop="yuji"
                        label="课程费用">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <div>
             <el-input style="width:100px"
                       v-model.trim="scope.row.yuji"></el-input>
           </div>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="可选乐器规格"
                        align="center"
@@ -342,7 +342,7 @@ export default {
 
       sessionStorage.setItem('resetCode', '2');
       // 获取所有声部
-      getSoundTree({tenantId:1}).then(res => {
+      getSoundTree({ tenantId: 1 }).then(res => {
         if (res.code == 200) {
           this.soundList = res.data.rows;
           // // 生成动态的checkList

src/views/resetTeaming/index.vue

@@ -16,7 +16,7 @@
           <teamBaseInfo v-if="activeIndex == 1"
                         @getName='getName' />
         </el-tab-pane>
-        <el-tab-pane label="声部收费设置"
+        <el-tab-pane label="声部设置"
                      v-if="permission('/resetTeaming/resetSound')"
                      name="2">
           <resetSound v-if="activeIndex == 2" />