From bc0e477594c5a916c014fb20dbb3797afd037ea0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 01 六月 2024 09:48:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 4bf2a47..8ffa444 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -9,16 +9,19 @@
type="month"
format="yyyy-MM"
value-format="yyyy-MM"
- placeholder="閫夋嫨鏈�" size="small" style="width: 100%;">
+ placeholder="閫夋嫨鏈�" size="small" style="width: 100%;"
+ :clearable="false">
</el-date-picker>
</div>
</div>
<div class="search_thing">
<div class="search_label">鍛樺伐锛�</div>
- <el-select v-model="entity.name" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()">
+ <!-- <el-select v-model="entity.name" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()" clearable>
<el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
- </el-select>
+ </el-select> -->
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="entity.name" @keyup.enter.native="refreshTable()"></el-input>
</div>
<div class="search_thing">
<div class="search_label">閮ㄩ棬锛�</div>
@@ -51,8 +54,8 @@
<div class="table">
<ValueTable ref="ValueTable0"
v-if="currentTable == 'value0'"
- :url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours"
- :componentData="componentData" :inputUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :downUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :key="upIndex" />
+ :url="$api.auxiliaryOriginalHours.selectAuxiliaryOriginalHours"
+ :componentData="componentData" :downUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :key="upIndex" />
<ValueTable ref="ValueTable1"
v-if="currentTable == 'value1'"
:url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
@@ -79,10 +82,6 @@
month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
name: null,
departLims: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
},
isIndex: true,
showSelect: false,
@@ -94,7 +93,10 @@
requiredAdd: [],
requiredUp: [],
accept:聽'.xlsx',
- inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+ inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ cellSpecialStyle:{
+ redColorByKey:'Hours'
+ }
},
componentData0: {
entity: {
@@ -152,6 +154,7 @@
},
refreshTable(){
let entity = {...this.entity}
+ entity.month = entity.month.split('-')[0]+'-'+entity.month.split('-')[1]
if(this.currentTable=='value0'){
this.componentData.entity = {...this.componentData.entity,...entity}
this.$refs['ValueTable0'].selectList()
--
Gitblit v1.9.3