12/08 14:04

合并课 拆班合班 考情列表

debug.log

@@ -1 +1,2 @@
 [1207/094223.177:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1208/093635.101:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/constant/index.js

@@ -150,3 +150,9 @@ export const workType = {
   TEACHING: "助教",
   BISHOP: "主教"
 }
+
+export const updateAttendanceEnum = {
+  SIGN_IN:'修复签到',
+  SIGN_OUT:'修复签退',
+  ALL:'签到和签退',
+}

src/router/notKeepAliveList.js

@@ -4,5 +4,6 @@ export default [
   '/orderList/orderAudit',
   '/business/teamCourseList',
   '/business/auditList',
+  '/journal/payAppeal'
   // '/operateManager/HumanResources'
 ]

src/utils/vueFilter.js

@@ -177,7 +177,8 @@ Vue.filter('payUserTypeFormat', val => constant.payUserType[val])
 Vue.filter('userPaymentTypeFormat', val => constant.userPaymentType[val])
 // 课程类型格式化
 Vue.filter('courseTypeFormat', val => constant.courseType[val])
-
+// 格式化签到签退记录 updateAttendanceEnum
+Vue.filter('updateAttendanceEnum', val => constant.updateAttendanceEnum[val])
 
 // 时间处理
 Vue.filter('timer', (value) => {

src/views/teamDetail/componentCourse/addCompound.vue

@@ -135,7 +135,9 @@ export default {
       this.isLook = false
 
     },
-    getList () { },
+    getList () { 
+      
+    },
     closeReset () {
       this.clearCom()
       this.show = false

src/views/teamDetail/componentCourse/compoundClass.vue

@@ -251,7 +251,7 @@ export default {
           courseMerge(obj).then(res => {
             if (res.code == 200) {
               this.$message.success("修改成功");
-              this.$emit('getList')
+              // this.$emit('getList')
               this.$emit('closeReset')
               // this.getList();
               // this.courseVisible = false;

src/views/teamDetail/components/modals/classList-item.vue

@@ -98,7 +98,7 @@ export default {
     };
   },
   mounted() {
-    this.activeClassList = [...new Set(this.classList)];
+    this.activeClassList =this.classList
   },
   methods: {
     async changeValue(val) {
@@ -111,6 +111,7 @@ export default {
           this.$emit("filterClassList", val);
         } catch {}
       } else {
+        this.setClassCourse({});
         this.$emit("filterClassList", null);
       }
     },

src/views/teamDetail/teamCourseList.vue

@@ -212,13 +212,7 @@
               <div>{{ scope.row.isComplaints==1?'是':'否'}}</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center"
-                           label="是否签退"
-                           fixed="right">
-            <template slot-scope="scope">
-              <div>{{ scope.row.isSignOut | attendanceOutType}}</div>
-            </template>
-          </el-table-column> -->
+         
           <el-table-column align="center"
                            prop="isLock"
                            label="是否冻结">
@@ -253,7 +247,7 @@
                 </el-button>
                 <el-button type="text"
                            @click="addCompound(scope.row)"
-                           v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row)&&permission('courseSchedule/courseMerge')&&scope.row.newCourseId <= 0)">添加合课</el-button>
+                           v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row)&&permission('courseSchedule/courseMerge')&&scope.row.newCourseId <= 0&&!scope.row.beMerged)">添加合课</el-button>
                 <el-button type="text"
                            v-if="isAddCom(scope.row)&&permission('courseSchedule/courseMerge')"
                            @click="cancleCompound(scope.row)">取消合课</el-button>
@@ -403,6 +397,7 @@
     </el-dialog>
     <addCompound :compoundList='compoundList' v-if="permission('courseSchedule/courseMerge')"
                  @clearCom='clearCom'
+                 @getList='getList'
                  @cancleCompound='cancleCompound' />
   </div>
 </template>

src/views/workBenchManager/payAppeal.vue

@@ -6,7 +6,7 @@
       考勤申诉
     </h2>
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <save-form :inline="true" :model.sync="searchForm" ref='searchForm'>
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
@@ -60,7 +60,7 @@
           <el-button type="danger" @click="search">搜索</el-button>
           <el-button @click="onReSet" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="tableWrap">
         <el-table
           style="width: 100%"
@@ -125,6 +125,13 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" label="修复记录">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.updateAttendanceEnum | updateAttendanceEnum }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="operatorName"
@@ -145,7 +152,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          :total="rules.total"
+          sync
+          :total.sync="rules.total"
           :page.sync="rules.page"
           :limit.sync="rules.limit"
           :page-sizes="rules.page_size"
@@ -189,7 +197,10 @@
             ></el-input>
           </el-form-item>
           <!--  -->
-          <el-form-item label="请选择需要补正的状态" v-if="visibleForm.complaintsStatusEnum == '2'">
+          <el-form-item
+            label="请选择需要补正的状态"
+            v-if="visibleForm.complaintsStatusEnum == '2'"
+          >
             <br />
             <el-checkbox
               v-model="visibleForm.reSignInStatus"
@@ -308,6 +319,8 @@ export default {
     },
     search() {
       this.rules.page = 1;
+      this.$refs.searchForm.save(this.searchForm);
+      this.$refs.searchForm.save(this.pageInfo, "page");
       this.getList();
     },
     onReSet() {
@@ -370,7 +383,7 @@ export default {
             let obj = {};
             obj.content = this.visibleForm.disposeContent;
             obj.teacherAttendanceId = this.visibleForm.teacherAttendanceId;
-            this.$confirm('驳回申诉', "是否", {
+            this.$confirm("驳回申诉", "是否", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
@@ -401,7 +414,7 @@ export default {
         teacherAttendanceId: row.teacherAttendanceId,
         // reSignInStatus: row.signInStatus == 1 ? true : false,
         // reSignOutStatus: row.signOutStatus == 1 ? true : false,
-           reSignInStatus: null,
+        reSignInStatus: null,
         reSignOutStatus: null,
       };
       this.dialogVisible = true;