Skip to content

C
cdsf-static-bg
Commit 94b9f2cf by 向童
Options

Merge branch 'develop' into 'test'

时间处理 See merge request !4
parents 1831f2c8 f2fd0e82
Showing with 21 additions and 16 deletions
src/containers/management/publicCar/publicCar.vue
...@@ -231,14 +231,16 @@ export default { ...@@ -231,14 +231,16 @@ export default {
name: data.row.name, name: data.row.name,
userCount: data.row.userCount, userCount: data.row.userCount,
categoryName: categoryName.join('； '), categoryName: categoryName.join('； '),
beginDate: this.$formatDate( // beginDate: this.$formatDate(
new Date(data.row.beginDate), // new Date(data.row.beginDate),
'yyyy-MM-dd hh:mm:ss' // 'yyyy-MM-dd hh:mm:ss'
), // ),
endDate: this.$formatDate( // endDate: this.$formatDate(
new Date(data.row.endDate), // new Date(data.row.endDate),
'yyyy-MM-dd hh:mm:ss' // 'yyyy-MM-dd hh:mm:ss'
), // ),
beginDate:data.row.beginDate,
endDate:data.row.endDate,
lineDescription: data.row.lineDescription, lineDescription: data.row.lineDescription,
dealName: data.row.dealName || this.userInfo.name, dealName: data.row.dealName || this.userInfo.name,
carPlate: data.row.carPlate, carPlate: data.row.carPlate,
...@@ -348,14 +350,17 @@ export default { ...@@ -348,14 +350,17 @@ export default {
name: data.row.name, name: data.row.name,
userCount: data.row.userCount, userCount: data.row.userCount,
categoryName: categoryName.join('； '), categoryName: categoryName.join('； '),
beginDate: this.$formatDate( // beginDate: this.$formatDate(
new Date(data.row.beginDate), // new Date(data.row.beginDate),
'yyyy-MM-dd hh:mm:ss' // 'yyyy-MM-dd hh:mm:ss'
), // ),
endDate: this.$formatDate( // endDate: this.$formatDate(
new Date(data.row.endDate), // new Date(data.row.endDate),
'yyyy-MM-dd hh:mm:ss' // 'yyyy-MM-dd hh:mm:ss'
), // ),
beginDate:data.row.beginDate,
endDate:data.row.endDate,
lineDescription: data.row.lineDescription, lineDescription: data.row.lineDescription,
dealName: data.row.dealName, dealName: data.row.dealName,
carPlate: data.row.carPlate, carPlate: data.row.carPlate,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment