From b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 七月 2024 09:44:10 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b3-work-time-management/work-time-management.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index f47b25e..b500e82 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -217,7 +217,9 @@
},
data () {
return{
- entity:{},
+ entity:{
+ dateTime: []
+ },
down:false,
add:false,
componentData: {
@@ -341,13 +343,13 @@
entityCopy1: {},
upIndex1:100,
weekList:[
- {label: '鏄熸湡涓�', value: '1',type:'primary'},
- {label: '鏄熸湡浜�', value: '2',type:'primary'},
- {label: '鏄熸湡涓�', value: '3',type:'primary'},
- {label: '鏄熸湡鍥�', value: '4',type:'primary'},
- {label: '鏄熸湡浜�', value: '5',type:'primary'},
- {label: '鏄熸湡鍏�', value: '6',type:'primary'},
- {label: '鏄熸湡鏃�', value: '7',type:'primary'}
+ {label: '鍛ㄤ竴', value: '1',type:'primary'},
+ {label: '鍛ㄤ簩', value: '2',type:'primary'},
+ {label: '鍛ㄤ笁', value: '3',type:'primary'},
+ {label: '鍛ㄥ洓', value: '4',type:'primary'},
+ {label: '鍛ㄤ簲', value: '5',type:'primary'},
+ {label: '鍛ㄥ叚', value: '6',type:'primary'},
+ {label: '鍛ㄦ棩', value: '7',type:'primary'}
],
currentTable:'ValueTable0',
addVisible:false,
@@ -454,6 +456,9 @@
}
}
},
+ created() {
+ this.setDate()
+ },
mounted(){
this.getCurrentWeekNumber()
this.selectEnumByCategory()
@@ -466,6 +471,17 @@
this.getPower()
},
methods:{
+ /** 灏嗘椂闂撮�夋嫨鍣ㄩ粯璁ら�変负褰撳ぉ鐨勬棩鏈� */
+ setDate(){
+ let currentDate = new Date();
+ let year = currentDate.getFullYear();
+ let month = String(currentDate.getMonth() + 1).padStart(2, '0');
+ let day = String(currentDate.getDate()).padStart(2, '0');
+ let formattedDate1 = `${year}-${month}-${day} 00:00:00`;
+ let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
+ this.entity.dateTime.push(formattedDate1);
+ this.entity.dateTime.push(formattedDate2);
+ },
getPower(){
let power = JSON.parse(sessionStorage.getItem('power'))
let del = false
--
Gitblit v1.9.3