页面修改

src/api/duty/index.js

@@ -16,7 +16,7 @@ export function getDutyFrequencyList(data) {
  * 删除班次
  * @param {JSON参数} data 
  */
- export function removeFrequency(data) {
+export function removeFrequency(data) {
   return request({
     url: '/Duty/RemoveFrequency',
     method: 'post',
@@ -28,7 +28,7 @@ export function getDutyFrequencyList(data) {
  * 新增班次
  * @param {JSON参数} data 
  */
- export function getSetFrequencyModel(data) {
+export function getSetFrequencyModel(data) {
   return request({
     url: '/Duty/GetSetFrequencyModel',
     method: 'post',
@@ -40,7 +40,7 @@ export function getDutyFrequencyList(data) {
  * 值班事项列表
  * @param {JSON参数} data 
  */
- export function queryDutyItemPage(data) {
+export function queryDutyItemPage(data) {
   return request({
     url: '/Duty/GetDutyItemPage',
     method: 'post',
@@ -52,7 +52,7 @@ export function getDutyFrequencyList(data) {
  * 删除值班事项列表
  * @param {JSON参数} data 
  */
- export function removeDutyItem(data) {
+export function removeDutyItem(data) {
   return request({
     url: '/Duty/RemoveDutyItem',
     method: 'post',
@@ -64,7 +64,7 @@ export function getDutyFrequencyList(data) {
  * 值班事项类型枚举
  * @param {JSON参数} data 
  */
- export function getItemTypeEnumList(data) {
+export function getItemTypeEnumList(data) {
   return request({
     url: '/Duty/GetItemTypeEnumList',
     method: 'post',
@@ -76,7 +76,7 @@ export function getDutyFrequencyList(data) {
  * 新增/修改值班事项
  * @param {JSON参数} data 
  */
- export function getSetDutyItemModel(data) {
+export function getSetDutyItemModel(data) {
   return request({
     url: '/Duty/GetSetDutyItemModel',
     method: 'post',
@@ -88,7 +88,7 @@ export function getDutyFrequencyList(data) {
  * 根据班次获取学校信息
  * @param {JSON参数} data 
  */
- export function getSchoolListByFrequencyIds(data) {
+export function getSchoolListByFrequencyIds(data) {
   return request({
     url: '/Duty/GetSchoolListByFrequencyIds',
     method: 'post',
@@ -100,7 +100,7 @@ export function getDutyFrequencyList(data) {
  * 根据学校id获取对应的班次
  * @param {JSON参数} data 
  */
- export function getDutyFrequencyBySchoolIds(data) {
+export function getDutyFrequencyBySchoolIds(data) {
   return request({
     url: '/Duty/GetDutyFrequencyBySchoolIds',
     method: 'post',
@@ -112,7 +112,7 @@ export function getDutyFrequencyList(data) {
  * 获取值班设置列表
  * @param {JSON参数} data 
  */
- export function getDutyConfigList(data) {
+export function getDutyConfigList(data) {
   return request({
     url: '/Duty/GetDutyConfigList',
     method: 'post',
@@ -124,7 +124,7 @@ export function getDutyFrequencyList(data) {
  * 新增/修改值班设置
  * @param {JSON参数} data 
  */
- export function getSetDutyConfigModel(data) {
+export function getSetDutyConfigModel(data) {
   return request({
     url: '/Duty/GetSetDutyConfigModel',
     method: 'post',
@@ -136,7 +136,7 @@ export function getDutyFrequencyList(data) {
  * 删除值班设置
  * @param {JSON参数} data 
  */
- export function removeDutyConfig(data) {
+export function removeDutyConfig(data) {
   return request({
     url: '/Duty/RemoveDutyConfig',
     method: 'post',

src/api/scheduling/schedu.js

@@ -128,3 +128,16 @@ export function DutyCheck(data) {
     data
   })
 }
+
+
+/**
+ * 值班打卡/值班交接
+ * @param {JSON参数} data 
+ */
+export function saveDutyCheck(data) {
+  return request({
+    url: '/DutyPlan/DutyCheck',
+    method: 'post',
+    data
+  })
+}

src/pages/scheduling/scheduleBoard.vue

@@ -213,7 +213,7 @@
     margin: 15px 20px 0 20px;
     font-size: 14px;
     color: #000000;
-    height:46px;
+    height: 46px;
     padding-bottom: 10px;
     border-bottom: 1px solid #F3F3F3;
   }
@@ -245,9 +245,9 @@
             <span class="schedu_st wdk"></span>未打卡 -->
         </div>
         <div class="clockon_Duty">
-          值班打卡<i class="iconfont icon-jiejue1 sche_daka"></i>
+          值班打卡<i class="iconfont icon-jiejue1 sche_daka" @click="SetDutyCheck(1)"></i>
         </div>
-        <div class="schedu_jiaojie">值班交接</div>
+        <div class="schedu_jiaojie" @click="SetDutyCheck(2)">值班交接</div>
       </div>
       <div class="col scroll myscroll">
         <div class="sche_rightTop">
@@ -277,7 +277,8 @@
 </template>
 <script>
   import {
-    OnDuty
+    OnDuty,
+    saveDutyCheck, //值班打卡
   } from '../../api/scheduling/schedu'
 
   import schedulOrder from '../../components/schedul/schedul-orderlist'
@@ -299,15 +300,24 @@
           EmergenciesList: [], //突发事项列表
           WorkList: [], //工作清单列表
         },
+        checkMsg: {
+          Id: 0,
+          Shift: 0,
+          Status: 0, //Status(1-值班打卡，2-交接打卡)
+        },
         dataList: {}
       }
     },
     created() {
-      if (this.$route.query.Shift && this.$route.query.Id) {
-        this.msg.Id = this.$route.query.Id
-        this.msg.Shfit = this.$route.query.Shift
-        this.getList();
+      if (this.$route.query.Id) {
+        this.msg.Id = this.$route.query.Id;
+        this.checkMsg.Id = this.$route.query.Id;
+      }
+      if (this.$route.query.Shift) {
+        this.msg.Shfit = this.$route.query.Shift;
+        this.checkMsg.Shift = this.$route.query.Shift;
       }
+      this.getList();
     },
     methods: {
       //请求数据
@@ -323,10 +333,35 @@
           }
         })
       },
+      //值班打卡或值班交接
+      SetDutyCheck(status) {
+        this.checkMsg.Status = status;
+        saveDutyCheck(this.checkMsg).then(res => {
+          if (res.Code == 1) {
+            this.getList();
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '数据保存成功！',
+              position: 'top'
+            })
+          } else {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: res.Message,
+              position: 'top'
+            })
+          }
+        })
+      },
       //刷新父页面
-      refreshPage(){
+      refreshPage() {
         this.getList();
       }
     },
   }
+
 </script>