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 | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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 7d73c33..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
@@ -1,7 +1,7 @@
<template>
<div class="work-time-management">
<div class="search">
- <div class="search_thing">
+ <!-- <div class="search_thing">
<div class="search_label">鍛ㄦ锛�</div>
<div class="search_input" style="display: flex;align-items: center;">
<el-input size="small" placeholder="寮�濮嬪懆娆�" clearable
@@ -10,7 +10,7 @@
<el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable
v-model="entity.week2"></el-input>
</div>
- </div>
+ </div> -->
<div class="search_thing" style="width: 200px;">
<div class="search_label">鏄熸湡锛�</div>
<el-select v-model="entity.weekDay" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()" clearable>
@@ -226,7 +226,7 @@
entity: {
week: null,
weekDay: null,
- dateTime: null,
+ dateTime: new Date(),
name:null,
orderBy: {
field: 'id',
@@ -343,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,
@@ -477,12 +477,10 @@
let year = currentDate.getFullYear();
let month = String(currentDate.getMonth() + 1).padStart(2, '0');
let day = String(currentDate.getDate()).padStart(2, '0');
- let formattedDate = `${year}-${month}-${day} 00:00:00`;
- this.entity.dateTime.push(formattedDate);
- this.entity.dateTime.push(formattedDate);
- this.$nextTick(() => {
- this.refreshTable()
- })
+ 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'))
--
Gitblit v1.9.3