From 2ffb110afafd3374c458cea74e41bc1da9ccb739 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 27 二月 2024 09:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/product-count.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/components/view/product-count.vue b/src/components/view/product-count.vue
index c5538d2..cdc867b 100644
--- a/src/components/view/product-count.vue
+++ b/src/components/view/product-count.vue
@@ -51,15 +51,10 @@
</div>
<div class="search">
<div class="search_thing">
- <div class="search_label">绯荤粺鏃ユ湡锛�</div>
- <div class="search_input">
- <el-date-picker size="small" v-model="componentData.entity.updateTime" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
- </div>
- </div>
- <div class="search_thing">
<div class="search_label">鐧昏鏃ユ湡锛�</div>
<div class="search_input">
- <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
+ <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss" :clearable="false" :editable="false"></el-date-picker>
</div>
</div>
<div class="search_thing">
@@ -77,7 +72,8 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.dataReporting.selectProductCountDtoPageList" :componentData="componentData" :key="upIndex" :downUrl="$api.dataReporting.downProductCountFile"/>
+ <ValueTable ref="ValueTable" :url="$api.dataReporting.selectProductCountDtoPageList"
+ :componentData="componentData" :key="upIndex" :downUrl="$api.dataReporting.downProductCountFile" />
</div>
</div>
</template>
@@ -113,6 +109,21 @@
outPower: true
}
},
+ created() {
+ var today = new Date();
+ var yesterday = new Date(today);
+ yesterday.setDate(today.getDate() - 1);
+ var yyyy = yesterday.getFullYear();
+ var mm = yesterday.getMonth() + 1;
+ var dd = yesterday.getDate()
+ if (dd < 10) {
+ dd = "0" + dd;
+ }
+ if (mm < 10) {
+ mm = "0" + mm;
+ }
+ this.componentData.entity.createTime = `${yyyy}-${mm}-${dd} 00:00:00`
+ },
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.selectProductEnumList()
@@ -126,8 +137,8 @@
this.componentData.entity = this.HaveJson(this.entityCopy)
this.upIndex++
},
- selectProductEnumList(){
- this.$axios.get(this.$api.enums.selectProductEnumList).then(res=>{
+ selectProductEnumList() {
+ this.$axios.get(this.$api.enums.selectProductEnumList).then(res => {
this.product = res.data
})
},
--
Gitblit v1.9.3