Commit e4b47428 by 无尘

fix: 修改考勤数据

parent e0d2ea3d
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-04-12 17:56:45
* @LastEditors : 无尘
* @LastEditTime : 2019-12-25 19:39:51
* @LastEditTime : 2019-12-25 20:49:53
-->
<template>
<div class="notice-list-wrap">
......@@ -699,7 +699,8 @@ export default {
type: item.type
}
if (item.type == 1) {
obj.userId = item.id
obj.userId = item.userId; //item.id
obj.clerkId = item.id
}
if (item.type == 2) {
obj.groupId = item.id
......@@ -721,7 +722,8 @@ export default {
type: item.type
}
if (item.type == 1) {
obj.userId = item.id
obj.userId = item.userId; //item.id
obj.clerkId = item.id
}
if (item.type == 2) {
obj.groupId = item.id
......@@ -739,7 +741,8 @@ export default {
rangeType: 2,
storeFlag: 0,
id: item.id,
userId: item.id,
userId: item.userId,
clerkId: item.id,
name: item.name || item.label,
type: item.type
};
......@@ -752,7 +755,8 @@ export default {
rangeType: 2,
storeFlag: 1,
id: item.id,
userId: item.id,
userId: item.userId,
clerkId: item.id,
name: item.name || item.label,
type: item.type
};
......@@ -884,7 +888,7 @@ export default {
if (data.result.attenceRangeJson) {
data.result.attenceRangeJson.forEach(ele => {
ele.type = !!ele.userId? '1' :!!ele.groupId? '2' : '3';
ele.id = !!ele.userId ? ele.userId : ele.groupId ? ele.groupId : ele.storeId;
ele.id = !!ele.clerkId ? ele.clerkId : ele.groupId ? ele.groupId : ele.storeId;
if (ele.rangeType == 1&& ele.storeFlag == 0) {
data.result.adminList.push(ele);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment