Commit df8ab0eb authored by 姬鋆屾's avatar 姬鋆屾

推修改考勤绩效每日打卡记录列表展示;修改打卡记录默认展示当日打卡数据

parent be80329f
...@@ -187,7 +187,11 @@ ...@@ -187,7 +187,11 @@
import Qs from "qs"; import Qs from "qs";
import { type } from "@/assets/utils"; import { type } from "@/assets/utils";
import { isArray } from "util"; import { isArray } from "util";
import { getFirstDay, getLastDay } from "@/assets/utils/dateFormat.js"; import {
getFirstDay,
getLastDay,
timestampToTime,
} from "@/assets/utils/dateFormat.js";
export default { export default {
props: { props: {
search: { search: {
...@@ -251,6 +255,23 @@ export default { ...@@ -251,6 +255,23 @@ export default {
delete this.form.summaryTimeStart; delete this.form.summaryTimeStart;
delete this.form.summaryTimeEnd; delete this.form.summaryTimeEnd;
} }
if (this.$route.name == "attendance/record/hik/list") {
if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
let startValue = Date.parse(this.form.attendanceDateStart);
let endValue = Date.parse(this.form.attendanceDateEnd);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.attendanceDateEnd = "";
return false;
}
} else {
this.form.attendanceDateStart = getFirstDay();
this.form.attendanceDateEnd = getFirstDay();
}
} else {
delete this.form.attendanceDateStart;
delete this.form.attendanceDateEnd;
}
let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据 let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
let data = this.decode(params); let data = this.decode(params);
...@@ -398,6 +419,24 @@ export default { ...@@ -398,6 +419,24 @@ export default {
delete this.form.summaryTimeStart; delete this.form.summaryTimeStart;
delete this.form.summaryTimeEnd; delete this.form.summaryTimeEnd;
} }
if (this.$route.name == "attendance/record/hik/list") {
console.log(this.$route, "11111111");
if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
let startValue = Date.parse(this.form.attendanceDateStart);
let endValue = Date.parse(this.form.attendanceDateEnd);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.attendanceDateEnd = "";
return false;
}
} else {
this.form.attendanceDateStart = timestampToTime(new Date(), 3);
this.form.attendanceDateEnd = timestampToTime(new Date(), 3);
}
} else {
delete this.form.attendanceDateStart;
delete this.form.attendanceDateEnd;
}
let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据 let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
let data = this.decode(params); let data = this.decode(params);
......
...@@ -122,10 +122,7 @@ ...@@ -122,10 +122,7 @@
</div> </div>
</el-drawer> </el-drawer>
<div class="mask" v-if="progress"> <div class="mask" v-if="progress">
<el-progress <el-progress :stroke-width="26" :percentage="percent"></el-progress>
:stroke-width="26"
:percentage="percent"
></el-progress>
</div> </div>
</div> </div>
</template> </template>
...@@ -134,7 +131,11 @@ ...@@ -134,7 +131,11 @@
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import { timestampToTime } from "@/assets/utils/dateFormat"; import {
timestampToTime,
getFirstDay,
getLastDay,
} from "@/assets/utils/dateFormat";
export default { export default {
name: "AttendanceRecordHikList", name: "AttendanceRecordHikList",
components: { components: {
...@@ -142,6 +143,8 @@ export default { ...@@ -142,6 +143,8 @@ export default {
}, },
mixins: [table], mixins: [table],
created() { created() {
this.query.attendanceDateStart = timestampToTime(new Date(), 3);
this.query.attendanceDateEnd = timestampToTime(new Date(), 3);
JSON.parse(sessionStorage.getItem("userData")).id == 1 JSON.parse(sessionStorage.getItem("userData")).id == 1
? (this.showBtn = true) ? (this.showBtn = true)
: (this.showBtn = false); : (this.showBtn = false);
...@@ -276,9 +279,7 @@ export default { ...@@ -276,9 +279,7 @@ export default {
toView(row) { toView(row) {
this.$refs.dialogform.view(row); this.$refs.dialogform.view(row);
}, },
afterRender(data) { afterRender(data) {},
console.log(this.tableData.data);
},
}, },
data() { data() {
return { return {
......
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