From 70c8abfff1d57551f7e3505bd61e8c65d628a35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=AC=E9=8B=86=E5=B1=BE?= <804461479@qq.com>
Date: Wed, 16 Aug 2023 10:20:01 +0800
Subject: [PATCH] tui
---
.../attendance/leave/record/drawershow.vue | 10 ++++-
.../views/attendance/leave/record/list.vue | 2 +-
.../src/views/attendance/record/list.vue | 44 ++++++++++++-------
3 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
index ccbe9d8d..79a14be5 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue
@@ -280,7 +280,15 @@ export default {
changedate(val) {
if (this.form.startTime && this.form.endTime) {
if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) {
- this.form.duration = getSec(this.form.startTime, this.form.endTime);
+ // this.form.duration = getSec(this.form.startTime, this.form.endTime);
+ this.$post("/attendance/getTimeCount", {
+ startTime: this.form.startTime,
+ endTime: this.form.endTime,
+ }).then((res) => {
+ if (res.code == 1) {
+ this.form.duration = res.data * 3600;
+ }
+ });
} else {
this.$message.closeAll();
this.$message.error("缁撴潫鏃ユ湡闇€澶т簬璇峰亣鏃ユ湡");
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
index 23868a7f..84a7915a 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
@@ -147,7 +147,7 @@ export default {
return (
(row.sourceDingTime ? row.sourceDingTime : "--") +
(row.duration
- ? "锛�" + (row.duration / 60 / 60 / 9).toFixed(2) + "澶�" + "锛�"
+ ? "锛�" + (row.duration / 60 / 60 / 8).toFixed(2) + "澶�" + "锛�"
: "锛�--锛�")
);
},
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
index ba45569b..def9ec42 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
@@ -18,9 +18,7 @@
</div>
<div>
鍑哄嫟鐜�
- <span class="num">{{
- attendStatInfo.attPercentage
- }}</span>
+ <span class="num">{{ attendStatInfo.attPercentage }}</span>
</div>
</div>
@@ -34,7 +32,7 @@
</div>
<div>
缂哄崱
- <span class="num">{{attendStatInfo.lackOfCards }}</span>
+ <span class="num">{{ attendStatInfo.lackOfCards }}</span>
</div>
</div>
</div>
@@ -129,13 +127,14 @@
<el-checkbox
v-for="(item, index) in setcolum"
:key="index"
- :label="item.label"
+ :label="item.prop"
>
+ {{ item.label }}
</el-checkbox>
</el-checkbox-group>
<div class="mt20" style="text-align:right">
- <el-button>鍙栨秷</el-button>
- <el-button type="primary">纭畾</el-button>
+ <el-button @click="handleCancel">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleSubmit">纭畾</el-button>
</div>
</el-dialog>
<!-- 涓婁紶 -->
@@ -207,17 +206,25 @@ export default {
},
},
created() {
-
this.$post("/attendance/record/stat", {}).then((res) => {
if (res.code === 1) {
this.attendStatInfo = res.data;
}
});
-
this.initalArr = this.config.columns;
},
methods: {
+ // 琛ㄦ牸璁剧疆寮圭獥鍙栨秷鎿嶄綔
+ handleCancel() {
+ this.checkList = [];
+ this.isdialog = false;
+ },
+ // 琛ㄦ牸璁剧疆鎻愪氦鎿嶄綔
+ handleSubmit() {
+ this.doExport();
+ this.isdialog = false;
+ },
// 琛ㄦ牸鎺ユ敹鏁版嵁鍚�
afterRender(data) {
let addobjArr = [];
@@ -335,7 +342,9 @@ export default {
if (this.selection.length > 0) {
params["idList"] = this.selection;
}
-
+ if (this.checkList.length > 0) {
+ params["properties"] = this.checkList;
+ }
this.$download(
"/attendance/record/exportExcel",
{
@@ -343,7 +352,10 @@ export default {
},
{ type: "excel" }
)
- .then(() => (this.isExport = false))
+ .then(() => {
+ this.isExport = false;
+ this.checkList = [];
+ })
.catch((error) => {
this.isExport = false;
this.$message.error(error.message);
@@ -354,6 +366,7 @@ export default {
this.setcolum = this.config.columns.filter(
(item) => item.label && item.prop
);
+ console.log(this.setcolum);
},
renderTable(tableData) {
return (
@@ -498,10 +511,10 @@ export default {
{ label: "鍛樺伐宸ュ彿", prop: "workNum" },
{
label: "鑰冨嫟缁�",
- prop: "attendanceGroupName"
+ prop: "attendanceGroupName",
},
{ label: "閮ㄩ棬", prop: "deptName" },
- { label: "鑱屼綅", prop: "positionName"},
+ { label: "鑱屼綅", prop: "positionName" },
{ label: "鐝", prop: "classId", formatter: this.formatter },
{
label: "绛惧埌缁撴灉",
@@ -521,9 +534,6 @@ export default {
width: 120,
prop: "subColumns",
formatter: (row) => {
-
-
-
let widthsize = this.columnSet.reduce((pre, cur) => {
return pre + Number(cur.width);
}, 50);
@@ -556,7 +566,7 @@ export default {
exportList: [], //瀵煎嚭璁板綍
baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
initalArr: [],
- attendStatInfo:{}
+ attendStatInfo: {},
};
},
};
--
2.24.3