From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
index f8ee888..f04727f 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD"/>
</a-form-item>
</a-col>
<a-col :md="5" :sm="5">
@@ -79,6 +79,9 @@
</span>
<span slot="model" slot-scope="text" style="font-weight: bold">
<j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="duration" slot-scope="text">
+ {{text|getFormattedTime}}
</span>
</a-table>
</div>
@@ -163,25 +166,25 @@
{
title: '鏃ユ湡',
align: 'center',
- dataIndex: 'effectiveDate',
+ dataIndex: 'theDate',
width:150
// scopedSlots:{customRender:'startTime'},
// customRender:(text,row,index) => {
// return moment(text).format("YYYY-MM-DD HH:mm:ss")
// }
},
- {
- title: '鐝寮�濮嬫椂闂�',
- align: 'center',
- dataIndex: 'startDate',
- width:150
- },
- {
- title: '鐝缁撴潫鏃堕棿',
- align: 'center',
- dataIndex: 'endDate',
- width:150
- },
+ // {
+ // title: '鐝寮�濮嬫椂闂�',
+ // align: 'center',
+ // dataIndex: 'startDate',
+ // width:150
+ // },
+ // {
+ // title: '鐝缁撴潫鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'endDate',
+ // width:150
+ // },
{
title: '鍔犵彮寮�濮嬫椂闂�',
align: 'center',
@@ -195,10 +198,17 @@
width:150
},
{
+ title: '鍔犵彮鏃堕暱',
+ align: 'center',
+ dataIndex: 'duration',
+ scopedSlots: {customRender: 'duration'},
+ width:200
+ },
+ {
title: '澶囨敞',
align: 'center',
dataIndex: 'remark',
- width:150
+ width:210
},
{
title: '鎿嶄綔',
@@ -257,6 +267,36 @@
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
+ filters:{
+ /**
+ * 鏍煎紡鍖栨椂闂�
+ * @param seconds 绉掓暟
+ * @returns '' 鏍煎紡鍖栧悗鏃堕棿瀛楃涓�
+ */
+ getFormattedTime(seconds) {
+ var hours = Math.floor(seconds / 3600)
+ var minutes = Math.floor((seconds % 3600) / 60)
+ var secs = seconds % 60
+
+ if (hours === 0) {
+ if (minutes === 0) {
+ return secs === 0 ? 0 : `${secs}绉抈
+ } else {
+ if (secs === 0) {
+ return `${minutes}鍒哷
+ }
+ return `${minutes}鍒� ${secs}绉抈
+ }
+ } else {
+ if (minutes === 0 && secs === 0) {
+ return `${hours}灏忔椂`
+ } else if (minutes !== 0 && secs === 0) {
+ return `${hours}灏忔椂 ${minutes}鍒哷
+ }
+ }
+ return `${hours}灏忔椂 ${minutes}鍒� ${secs}绉抈
+ }
+ },
methods: {
importTemplate(fileName){
var a = document.createElement("a");
--
Gitblit v1.9.3