From d29e0878a7e450d01e6352ca6a4b83bed6fba02b Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Fri, 12 Nov 2021 00:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=A7=E5=93=81=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/data/Framework.vue | 20 ++++++++++++++------
src/views/data/Product.vue | 9 +++++++--
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index bc80c5e..78a9405 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -36,11 +36,7 @@
-
-
- {{scope.row.startTime.substr(0, 10) + ' ~ ' + scope.row.endTime.substr(0, 10)}}
-
-
+
@@ -251,7 +247,19 @@ export default {
},
getData(){
this.$post(`${this.api.getIdQueryTable}?categoryId=${this.categoryId}&showName=${this.keyword}&pageNum=${this.page}&pageSize=${this.pageSize}&updateTime=${this.updateTime ? this.updateTime : ''}`).then(res => {
- this.listData = res.pageList.records
+ const list = res.pageList.records
+ list.map(e => {
+ const startTime = e.startTime ? e.startTime.slice(0, 10) : ''
+ const endTime = e.endTime ? e.endTime.slice(0, 10) : ''
+ if (startTime && endTime) {
+ e.timeRange = startTime + ' ~ ' + endTime
+ } else if (startTime) {
+ e.timeRange = startTime
+ } else if (endTime) {
+ e.timeRange = e.endTime
+ }
+ })
+ this.listData = list
this.total = res.pageList.total
}).catch(res => {})
},
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 153d61e..0838271 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -76,7 +76,7 @@
-
+
元/账号
@@ -378,9 +378,10 @@ export default {
},
getDetail(){
this.$post(`${this.api.findById}?id=${this.id}`).then(res => {
- let data = res.product
+ const data = res.product
this.productName = data.productName
this.market = data.market
+ this.configChecked = data.tableId
this.checkedIds = this.handleType(data.tableId.split(','),this.typeList)
this.$refs.type.setCheckedNodes(this.checkedIds)
}).catch(res => {})
@@ -460,6 +461,7 @@ export default {
this.typeIndex = 100000
this.typeList = []
this.tableId = []
+ this.configChecked = []
},
// 获取tableId,提交的时候需要
getIds(){
@@ -647,6 +649,9 @@ export default {
/deep/ .no-mb .el-form-item{
margin-bottom: 0;
}
+ /deep/.el-input--suffix .el-input__inner{
+ padding-right: 56px;
+ }
/deep/.el-container{
.el-aside{
padding: 15px;