Commit 7d2b7e4c authored by 姬鋆屾's avatar 姬鋆屾

推修改每日打卡记录搜索条件及打卡结果状态颜色显示;修改考勤组查询名字失效得问题

parent 92150ebe
......@@ -84,7 +84,7 @@ export default {
isshowTabPane: true,
search: [
{
name: "staffName",
name: "groupName",
type: "text",
label: "考勤组名称",
fuzzy: true,
......
......@@ -325,7 +325,17 @@ export default {
property === "offWorkResult"
) {
let val = arr[index][property];
return this.tableData.dict.goWorkResult[val];
return this.tableData.dict.goWorkResult[val] == "正常" ? (
<span>{this.tableData.dict.goWorkResult[val]}</span>
) : this.tableData.dict.goWorkResult[val] == "请假" ? (
<span style="color:#1a7af8">
{this.tableData.dict.goWorkResult[val]}
</span>
) : (
<span style="color:red" >
{this.tableData.dict.goWorkResult[val]}
</span>
);
}
} else {
return "-";
......@@ -579,12 +589,12 @@ export default {
// label: "员工工号",
// fuzzy: true,
// },
{
name: "phone",
type: "text",
label: "手机号",
fuzzy: true,
},
// {
// name: "phone",
// type: "text",
// label: "手机号",
// fuzzy: true,
// },
{
name: "deptId",
type: "select",
......@@ -603,12 +613,12 @@ export default {
label: "班次",
fuzzy: false,
},
{
name: "punchResult",
type: "select",
label: "打卡结果",
fuzzy: false,
},
// {
// name: "punchResult",
// type: "select",
// label: "打卡结果",
// fuzzy: false,
// },
{
name: "attendanceDateStart",
type: "date",
......
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