Merge branch 'master' of http://git.cc-lotus.info/new_train/train-student

src/layout/class/classList.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <van-tabs v-model="active">
           <van-tab title="班级名单">
-            <span v-if="role === '1'">
+            <span v-if="role === '4'">
               <headNameList v-on="$listeners" :headNameList="headNameList" :assignShow="assignShow" :assignForm="assignForm"></headNameList>
             </span>
             <span v-else>

src/layout/user/punchBtn.vue

@@ -0,0 +1,74 @@
+<template>
+  <div id="punchBtn">
+    <el-row>
+      <el-col :span="24" class="punchBtn">
+        <el-col :span="24" class="top">
+          <el-button type="primary" @click="openClick()" round>考勤打卡</el-button>
+        </el-col>
+      </el-col>
+    </el-row>
+    <van-dialog v-model="show" title="考勤打卡" :showConfirmButton="false">
+      <van-form @submit="onSubmit">
+        <van-col :span="24">
+          <span>第一期</span>
+          <span>第一批次</span>
+          <span>一班</span>
+        </van-col>
+        <el-col :span="24">
+          <h2>当前打卡时间</h2>
+          <el-col :span="24" class="round">
+            <!-- <p>打卡</p>
+            <p>2020-03-03-80:30</p> -->
+            <ul>
+              <li></li>
+              <li></li>
+              <li></li>
+            </ul>
+          </el-col>
+        </el-col>
+        <div style="margin: 16px;">
+          <van-button round block type="info" native-type="submit">
+            提交
+          </van-button>
+        </div>
+      </van-form>
+    </van-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'punchBtn',
+  props: {
+    show: null,
+    stuInfo: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {
+    openClick() {
+      this.$emit('openClick');
+    },
+    onSubmit() {
+      this.$emit('onSubmit', { data: this.form });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.round {
+  width: 200px;
+  height: 200px;
+  background-color: #5eb3f4;
+  margin: 15px 60px;
+  border-radius: 360px;
+  border: 10px solid #d5e3fe;
+}
+</style>

src/views/user/checkWork.vue

@@ -8,7 +8,8 @@
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="leaveBtn">
-            <van-button round type="info" icon="smile" @click="onClickRight()">考勤打卡</van-button>
+            <!-- <van-button round type="info" icon="smile" @click="onClickRight()">考勤打卡</van-button> -->
+            <punchBtn :show="show" :stuInfo="stuInfo" @openClick="openClick" @onSubmit="onSubmit"></punchBtn>
           </el-col>
           <el-col :span="24" class="leaveList">
             <checkList :checkWorkList="checkWorkList"></checkList>
@@ -22,12 +23,16 @@
 <script>
 import NavBar from '@/layout/common/topInfo.vue';
 import checkList from '@/layout/user/checkList.vue';
+import punchBtn from '@/layout/user/punchBtn.vue';
+import { createNamespacedHelpers, mapGetters } from 'vuex';
+const { mapActions: mapAttendance } = createNamespacedHelpers('attendance');
 export default {
   name: 'checkWork',
   props: {},
   components: {
     NavBar, //头部导航
     checkList, //考勤列表
+    punchBtn, //考勤打卡
   },
   data: () => ({
     checkWorkList: [
@@ -52,12 +57,16 @@ export default {
         ],
       },
     ],
+    show: false,
+    stuInfo: {},
     title: '',
     isleftarrow: '',
     transitionName: 'fade',
     navShow: true,
   }),
-  created() {},
+  created() {
+    this.searchInfo();
+  },
   computed: {},
   mounted() {
     this.title = this.$route.meta.title;
@@ -70,8 +79,17 @@ export default {
     },
   },
   methods: {
-    onClickRight() {
-      console.log('考勤打卡');
+    ...mapAttendance(['fetch']),
+    searchInfo() {
+      let site = JSON.parse(sessionStorage.getItem('site'));
+      this.$set(this, `stuInfo`, site);
+    },
+    openClick() {
+      this.show = true;
+    },
+    onSubmit(form) {
+      console.log(form);
+      this.show = false;
     },
   },
 };