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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 f5d3a51..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,16 +1,16 @@
<template>
<div class="work-time-management">
<div class="search">
-<!-- <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-->
-<!-- v-model="entity.week1"></el-input>-->
-<!-- <span> - </span>-->
-<!-- <el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable-->
-<!-- v-model="entity.week2"></el-input>-->
-<!-- </div>-->
-<!-- </div>-->
+ <!-- <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
+ v-model="entity.week1"></el-input>
+ <span> - </span>
+ <el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable
+ v-model="entity.week2"></el-input>
+ </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',
--
Gitblit v1.9.3