Merge branch 'dev' of http://git.dayaedu.com/molingzhide/dy-admin-manager into dev

src/views/stuRecodeManager/index.vue

@@ -278,7 +278,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否回访">
+          <el-table-column align="center" label="考勤回访">
             <template slot-scope="scope">
               <div>{{ scope.row.visitFlag | yesOrNo }}</div>
             </template>
@@ -321,6 +321,7 @@
             :username="detail.username"
             @close="visitVisible = false"
             @submited="getList"
+            :isMainGo="true"
           />
         </el-dialog>
       </div>
@@ -388,7 +389,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     const { query } = this.$route
-  
+
     if (query.visitFlag == 1 || query.visitFlag == 0) {
       this.searchForm.visitFlag = String(query.visitFlag)
     }

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -67,7 +67,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="是否回访">
+        <el-table-column align="center" label="考勤回访">
           <template slot-scope="scope">
             <div>{{ scope.row.visitFlag | yesOrNo }}</div>
           </template>
@@ -96,7 +96,7 @@
         :username="detail.username"
         @close="visitVisible = false"
         @submited="getList"
-        :isMainGo="isMainGo"
+        :isMainGo="true"
       />
     </el-dialog>
   </div>

src/views/teamDetail/components/modals/classroom-preview.vue

@@ -41,7 +41,7 @@
         label="周次"
         key="week"
       >
-        <span slot-scope="scope">{{dayjs(scope.row.startClassTime).day()}}</span>
+        <span slot-scope="scope">{{$helpers.dayjs(scope.row.startClassTime).day()}}</span>
       </el-table-column>
       <el-table-column
         label="开始时间"