|
|
@@ -36,6 +36,16 @@
|
|
|
<span slot="ShiftTime" slot-scope="text, record, index">
|
|
|
{{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
|
|
|
</span>
|
|
|
+ <span slot="customTime" slot-scope="text, record, index">
|
|
|
+ {{text.slice(10)}}
|
|
|
+ </span>
|
|
|
+
|
|
|
+ <span slot="customDuration" slot-scope="text, record, index">
|
|
|
+ <a-tag @click="workInfo(record)" color="pink" v-if="record.workOvertime != null && record.workOvertime > 0 ">
|
|
|
+ {{text}}
|
|
|
+ </a-tag>
|
|
|
+ <a @click="workInfo(record)" v-else>{{text}}</a>
|
|
|
+ </span>
|
|
|
|
|
|
<span slot="shiftType" slot-scope="text, record, index">
|
|
|
<!-- ruleType 上班类型 1.固定时间上下班，2.按班次上下班，3.自由上下班 -->
|
|
|
@@ -45,8 +55,9 @@
|
|
|
<span v-else>正常 <a>{{record.setInfo}}</a></span> -->
|
|
|
|
|
|
<a-tag color="pink" v-if="record.latetimeS < 0 || record.latetimeX > 0
|
|
|
- || record.shiftRealTimeS == '' || record.shiftRealTimeS == null || (record.ifwork !=0 && record.attendanceCount < 2)
|
|
|
+ || (record.ifwork !=0 && record.attendanceCount < 2 && record.name != null)
|
|
|
|| (record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
|
|
|
+ || record.duration != null
|
|
|
&& (record.setInfo == '' || record.setInfo == null)">
|
|
|
异常
|
|
|
</a-tag>
|
|
|
@@ -55,11 +66,11 @@
|
|
|
</span>
|
|
|
|
|
|
<span slot="action" slot-scope="text, record">
|
|
|
- <a @click="handleEdit(record)">校准</a>
|
|
|
+ <a v-has="'viewClockUserInfo:jiaozhun'" @click="handleEdit(record)">校准</a>
|
|
|
|
|
|
<a-divider type="vertical"/>
|
|
|
|
|
|
- <a-dropdown>
|
|
|
+ <a-dropdown v-has="'viewClockUserInfo:more'">
|
|
|
|
|
|
<a class="ant-dropdown-link">
|
|
|
更多 <a-icon type="down"/>
|
|
|
@@ -93,6 +104,15 @@
|
|
|
<Jiao-Zhun-Modal ref="modalForm" @ok="modalFormOk"></Jiao-Zhun-Modal>
|
|
|
<Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
|
|
|
<dept-role-user-modal ref="deptRoleUser"></dept-role-user-modal>
|
|
|
+ <a-modal
|
|
|
+ v-model="modal2Visible" title="加班信息详情" :footer="null"
|
|
|
+ centered @ok="() => (modal2Visible = false)" >
|
|
|
+ <h4>加班申请时间 ： {{durationCommitDate}}</h4>
|
|
|
+ <h4>加班开始时间 ： {{durationBeginDate}}</h4>
|
|
|
+ <h4>加班结束时间 ： {{durationEndDate}}</h4>
|
|
|
+ <h4>加班时长 ： {{duration}}</h4>
|
|
|
+ <h4>加班事由 ： {{demo}}</h4>
|
|
|
+ </a-modal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
|
@@ -117,6 +137,12 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ durationCommitDate:'',//加班申请时间
|
|
|
+ durationBeginDate:'',//加班开始时间
|
|
|
+ durationEndDate:'',//加班结束时间
|
|
|
+ duration:'',//加班时长
|
|
|
+ demo:'',//加班事由
|
|
|
+ modal2Visible: false,
|
|
|
moment,
|
|
|
description: '员工考勤信息',
|
|
|
userName:'',//标题员工姓名
|
|
|
@@ -156,12 +182,18 @@
|
|
|
{
|
|
|
title: '最早打卡时间',
|
|
|
align: "center",
|
|
|
- dataIndex: 'gotoTime'
|
|
|
+ dataIndex: 'gotoTime',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'customTime'
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '最迟打卡时间',
|
|
|
align: "center",
|
|
|
- dataIndex: 'closingTime'
|
|
|
+ dataIndex: 'closingTime',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'customTime'
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '打卡次数',
|
|
|
@@ -178,14 +210,17 @@
|
|
|
title: '加班时间',
|
|
|
align: "center",
|
|
|
dataIndex: 'duration',
|
|
|
- width: 100
|
|
|
+ width: 100,
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'customDuration'
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
|
dataIndex: 'action',
|
|
|
scopedSlots: {customRender: 'action'},
|
|
|
align: "center",
|
|
|
- width: 150
|
|
|
+ width: 120
|
|
|
}],
|
|
|
url: {
|
|
|
list: '/viewClockIn/viewClockIn/list',
|
|
|
@@ -312,7 +347,7 @@
|
|
|
open(selectedKeys, e) {
|
|
|
|
|
|
if(e.node.dataRef.orgType == 1 || e.node.dataRef.orgType == 2 || e.node.dataRef.orgType == 3){
|
|
|
- this.$message.warn("点击左侧加减号，展开或者收起菜单!")
|
|
|
+ // this.$message.warn("点击左侧加减号，展开或者收起菜单!")
|
|
|
return;
|
|
|
}
|
|
|
this.queryParam = {}
|
|
|
@@ -402,6 +437,14 @@
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ },
|
|
|
+ workInfo(record){
|
|
|
+ this.modal2Visible = true;
|
|
|
+ this.durationCommitDate = record.commitDate;//加班申请时间
|
|
|
+ this.durationBeginDate = record.durationBeginDate;//加班开始时间
|
|
|
+ this.durationEndDate = record.durationEndDate;//加班结束时间
|
|
|
+ this.duration = record.duration;//加班时长
|
|
|
+ this.demo = record.demo;//加班事由
|
|
|
}
|
|
|
}
|
|
|
}
|
ysh