lex-xin пре 5 година
родитељ
комит
768d6b34dd

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-71cf8560.4b973106.css → dist/static/css/chunk-63a9c1b3.63b04780.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}.inputStyle[data-v-5d2b2f36]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-7d789d15]{width:100px;text-align:center}.work[data-v-7d789d15]{margin-bottom:30px;font-size:16px}.visible[data-v-66463136]{visibility:hidden}.cl-container .topFrom[data-v-66463136]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-66463136]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-66463136]{list-style:none}.cl-container .searchForm[data-v-66463136]{margin:0 30px}.btnWraps[data-v-66463136]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-66463136]{margin-right:20px}.inputStyle[data-v-66463136]{width:180px}.red[data-v-66463136]{color:red}.exportBtn[data-v-66463136]{background:#13817a}
+.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}.inputStyle[data-v-5d2b2f36]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-7d789d15]{width:100px;text-align:center}.work[data-v-7d789d15]{margin-bottom:30px;font-size:16px}.visible[data-v-0f5ba924]{visibility:hidden}.cl-container .topFrom[data-v-0f5ba924]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-0f5ba924]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-0f5ba924]{list-style:none}.cl-container .searchForm[data-v-0f5ba924]{margin:0 30px}.btnWraps[data-v-0f5ba924]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-0f5ba924]{margin-right:20px}.inputStyle[data-v-0f5ba924]{width:180px}.red[data-v-0f5ba924]{color:red}.exportBtn[data-v-0f5ba924]{background:#13817a}

+ 1 - 1
dist/static/css/chunk-f5536f90.5a5a6545.css → dist/static/css/chunk-77d97730.52d59aff.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}.titlewrap[data-v-316aa50a]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-316aa50a],.wrap[data-v-316aa50a]{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:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-316aa50a]{margin-right:20px}
+.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}.titlewrap[data-v-43d9c028]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-43d9c028],.wrap[data-v-43d9c028]{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:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-43d9c028]{margin-right:20px}

+ 0 - 0
dist/static/css/chunk-eff52dfe.641b676e.css → dist/static/css/chunk-bdad1ada.641b676e.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.ba27bf2c.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-63a9c1b3.c274cfaf.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-71cf8560.4e56af10.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-77d97730.df761fab.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-bdad1ada.6f30d71d.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-eff52dfe.7904657f.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-f5536f90.75e1f7f6.js


+ 6 - 3
src/views/accompanyManager/accompanyList.vue

@@ -169,14 +169,13 @@
                 <el-button type="text" @click="lookCrouse(scope.row)">查看</el-button>
                 <el-button
                   type="text"
-                  v-if="scope.row.groupStatus == 'NORMAL'"
+                  v-if="scope.row.groupStatus == 'NORMAL' && permission('practiceGroupManage/cancelGroup')"
                   @click="closeCrouse(scope.row)"
-                  v-permission="'practiceGroupManage/cancelGroup'"
                 >关闭</el-button>
                 <el-button
                   type="text"
+                  v-if="permission('practiceGroupManage/updateMemo')"
                   @click="resetMemo(scope.row)"
-                  v-permission="'practiceGroupManage/updateMemo'"
                 >修改备注</el-button>
               </div>
             </template>
@@ -223,6 +222,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import { permission } from "@/utils/directivePage";
 import { commGroupStatus, practiceGroupType } from "@/utils/searchArray";
 import {
   getTeacher,
@@ -305,6 +305,9 @@ export default {
       });
       this.getList();
     },
+    permission(str, parent) {
+      return permission(str, parent);
+    },
     search() {
       this.rules.page = 1;
       this.getList();

+ 65 - 3
src/views/accompanyManager/accompanys.vue

@@ -27,6 +27,10 @@
         v-permission="'courseSchedule/batchUpdateCourseSchedule'"
         @click="adjustment"
       >批量调整</div>
+      <!-- <div class="newBand"
+        v-permission="'courseSchedule/updateCoursesExpireDate'"
+        @click="onCourseExpireDate"
+      >有效期调整</div> -->
     </div>
     
     <div class="tableWrap">
@@ -104,6 +108,8 @@
                 v-show="scope.row.status == 'NOT_START'&&courseType!='TRIAL'"
                 @click="resetTeacher(scope.row)"
               >更换老师</el-button>
+              <!-- <el-button v-if="scope.row.status == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamCourseList')" type="text" @click="onMarkAttendance(scope.row)"
+              >补考勤</el-button> -->
               <el-button
                 type="text"
                 v-permission="'accompanys/cleanAttendance'"
@@ -122,6 +128,22 @@
         @pagination="getList"
       />
     </div>
+    <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
+      <el-form>
+        <el-form-item label="签到状态">{{ markAttendance.dataInfo.isSignIn | attendanceType }}</el-form-item>
+        <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
+        <el-form-item label="签退状态">{{ markAttendance.dataInfo.isSignOut | attendanceOutType }}</el-form-item>
+        <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="markAttendance.status = false">取 消</el-button>
+        <el-button
+          type="primary"
+          :disabled="markAttendance.dataInfo.isSignIn == 1 && markAttendance.dataInfo.isSignOut == 1 ? true : false"
+          @click="batchAdjustmentTime"
+        >确定补卡</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="课程调整" width="400px" :before-close="handleClose" :visible.sync="courseVisible">
       <el-form
         :model="maskForm"
@@ -341,6 +363,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import { permission } from "@/utils/directivePage";
 import {
   findPracticeGroupCourseSchedules,
   practiceCourseAdjus,
@@ -352,7 +375,8 @@ import {
   batchAddCourses,
   getPracticeApplySubjects,
   batchUpdateCourseSchedule,
-  findEducationUsers
+  findEducationUsers,
+  updateTeacherAttendance
 } from "@/api/buildTeam";
 import {
   vipCourseAdjust,
@@ -453,7 +477,13 @@ export default {
       ],
       activeList: [],
       educationList: [],
-      timers: null
+      timers: null,
+      courseExpireDate: null, // 结束时间
+      markAttendance: {
+        // 考勤状态
+        status: false,
+        dataInfo: {}
+      },
     };
   },
   mounted() {
@@ -467,7 +497,6 @@ export default {
       this.practiceId = this.$route.query.id;
       this.userId = this.$route.query.userId;
       this.courseType = this.$route.query.type;
-      console.log( this.courseType)
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules;
       }
@@ -510,10 +539,39 @@ export default {
               this.courseData[0].coursesStartDate.substring(0, 10) +
               "至" +
               this.courseData[0].coursesExpireDate.substring(0, 10);
+            this.courseExpireDate = this.courseData[0].coursesExpireDate.substring(0, 10);
           }
         }
       });
     },
+    permission(str, parent) {
+      return permission(str, parent);
+    },
+    onMarkAttendance(item) {
+      // 补考勤
+      this.markAttendance = {
+        status: true,
+        dataInfo: item
+      };
+    },
+    batchAdjustmentTime() {
+      let tempData = this.markAttendance.dataInfo;
+      let params = {
+        teacherId: tempData.actualTeacherId,
+        courseScheduleId: tempData.id,
+        signInStatus: 1,
+        signOutStatus: 1
+      };
+      updateTeacherAttendance(params).then(res => {
+        if (res.code == 200) {
+          this.$message.success("补卡成功");
+          this.markAttendance.status = false;
+          this.getList();
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
     getList() {
       findPracticeGroupCourseSchedules({ practiceId: this.practiceId }).then(
         res => {
@@ -658,6 +716,10 @@ export default {
         return true;
       }
     },
+    onCourseExpireDate() {
+      // 修改课程有效期
+
+    },
     adjustment() {
       this.adjustmentName = "批量调整";
       this.isaddCourse = false;

+ 3 - 51
src/views/teamDetail/teamCourseList.vue

@@ -151,8 +151,6 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text" v-if="permission('teamCourseList/details')" @click="lookDetail(scope.row)">详情</el-button>
-                <el-button v-if="scope.row.status == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamCourseList')" type="text" @click="onMarkAttendance(scope.row)"
-              >补考勤</el-button>
               </div>
             </template>
           </el-table-column>
@@ -166,22 +164,6 @@
         />
       </div>
     </div>
-    <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
-      <el-form>
-        <el-form-item label="签到状态">{{ markAttendance.dataInfo.isSignIn | attendanceType }}</el-form-item>
-        <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
-        <el-form-item label="签退状态">{{ markAttendance.dataInfo.isSignOut | attendanceOutType }}</el-form-item>
-        <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="markAttendance.status = false">取 消</el-button>
-        <el-button
-          type="primary"
-          :disabled="markAttendance.dataInfo.isSignIn == 1 && markAttendance.dataInfo.isSignOut == 1 ? true : false"
-          @click="batchAdjustmentTime"
-        >确定补卡</el-button>
-      </div>
-    </el-dialog>
     <el-dialog
       title="课表详情"
       :visible.sync="classVisible"
@@ -288,8 +270,7 @@ import {
   getTeacher,
   getMusicGroupAllClass,
   superFindCourseSchedules,
-  getEmployeeOrgan,
-  updateTeacherAttendance
+  getEmployeeOrgan
 } from "@/api/buildTeam";
 import { getSchool } from "@/api/systemManage";
 import { courseType } from "@/utils/searchArray";
@@ -338,12 +319,7 @@ export default {
       teacherList: [],
       schoolList: [],
       maskForm: {},
-      activeName: "first",
-      markAttendance: {
-        // 考勤状态
-        status: false,
-        dataInfo: {}
-      },
+      activeName: "first"
       // classList: []
     };
   },
@@ -386,31 +362,7 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
-    onMarkAttendance(item) {
-      // 补考勤
-      this.markAttendance = {
-        status: true,
-        dataInfo: item
-      };
-    },
-    batchAdjustmentTime() {
-      let tempData = this.markAttendance.dataInfo;
-      let params = {
-        teacherId: tempData.actualTeacherId,
-        courseScheduleId: tempData.id,
-        signInStatus: 1,
-        signOutStatus: 1
-      };
-      updateTeacherAttendance(params).then(res => {
-        if (res.code == 200) {
-          this.$message.success("补卡成功");
-          this.markAttendance.status = false;
-          this.getList();
-        } else {
-          this.$message.error(res.msg);
-        }
-      });
-    },
+    
     search() {
       this.rules.page = 1;
       this.getList();

Неке датотеке нису приказане због велике количине промена