From eb0ef2e7c6b77096fa09af93559d5669b3de32c2 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 17 七月 2024 13:17:54 +0800
Subject: [PATCH] 日工时管理时间传值修改
---
src/components/do/b3-work-time-management/work-time-management.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 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 fa6f726..2dce23e 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>
@@ -18,7 +18,7 @@
</el-option>
</el-select>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 390px;">
<div class="search_label" style="width: 90px;">鏃堕棿鑼冨洿锛�</div>
<div class="search_input">
<el-date-picker
@@ -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
@@ -594,7 +610,13 @@
this.addLoad = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.addVisible = false
+ this.formData.number = ''
+ this.formData.amount = ''
+ this.formData.remarks = ''
+ this.formData.approvedWorkingHour = ''
+ this.formData.nonproductiveTime = ''
+ this.formData.auxiliaryProject = ''
+ // this.addVisible = false
this.refreshTable()
this.collectWorkingHours()
})
@@ -609,7 +631,13 @@
this.addLoad = false
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
- this.addVisible = false
+ this.formData.number = ''
+ this.formData.amount = ''
+ this.formData.remarks = ''
+ this.formData.approvedWorkingHour = ''
+ this.formData.nonproductiveTime = ''
+ this.formData.auxiliaryProject = ''
+ // this.addVisible = false
this.refreshTable()
this.collectWorkingHours()
})
@@ -806,4 +834,7 @@
height: calc(100% - 60px - 80px - 10px - 40px - 25px);
padding: 20px;
}
+>>>.el-dialog__wrapper {
+ z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
+}
</style>
--
Gitblit v1.9.3