From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
admin/src/components/business/goodsOrderDetail.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/admin/src/components/business/goodsOrderDetail.vue b/admin/src/components/business/goodsOrderDetail.vue
index f5c68fc..8768d44 100644
--- a/admin/src/components/business/goodsOrderDetail.vue
+++ b/admin/src/components/business/goodsOrderDetail.vue
@@ -2,21 +2,21 @@
<GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking">
<div class="title">鏀粯鏄庣粏</div>
<el-table :data="list" stripe border>
- <el-table-column prop="id" label="璁㈠崟缂栧彿" min-width="120px" show-overflow-tooltip align="center"></el-table-column>
- <el-table-column prop="onlineorderId" label="浜ゆ槗鍗曞彿" min-width="100px" show-overflow-tooltip align="center"></el-table-column>
- <el-table-column prop="refundType" label="浜ゆ槗绫诲瀷" min-width="100px" align="center">
+ <el-table-column prop="id" label="璁㈠崟缂栧彿" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="onlineorderId" label="浜ゆ槗鍗曞彿" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="refundType" label="浜ゆ槗绫诲瀷" width="100px" align="center">
<template slot-scope="{row}">
{{ typeToStr(row.refundType) }}
</template>
</el-table-column>
- <el-table-column prop="money" label="浜ゆ槗閲戦(鍏�)" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="payWay" label="娓犻亾" min-width="100px" align="center">
+ <el-table-column prop="money" label="浜ゆ槗閲戦(鍏�)" width="100px" align="center"></el-table-column>
+ <el-table-column prop="payWay" label="娓犻亾" width="100px" align="center">
<template slot-scope="{row}">
{{ row.payWay==0? '寰俊' : '鏀粯瀹�' }}
</template>
</el-table-column>
- <el-table-column prop="payDate" label="浜ゆ槗鏃堕棿" min-width="100px" align="center"></el-table-column>
-
+ <el-table-column prop="payDate" label="浜ゆ槗鏃堕棿" width="150px" align="center"></el-table-column>
+
</el-table>
<div class="title">楠戣璁板綍</div>
<el-table
@@ -24,15 +24,15 @@
stripe
border
>
- <el-table-column prop="openid" label="鐢ㄦ埛" min-width="120px" show-overflow-tooltip align="center"></el-table-column>
- <el-table-column prop="bikeCode" label="杞﹁締缂栧彿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="bikeType" label="杞︾被鍨�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="duration" label="璁¤垂鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="bikeType" label="杞︾被鍨�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="backDate" label="杩樿溅鏃堕棿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="closeStatus" fixed="right" label="缁撶畻鐘舵��" min-width="100px" align="center">
+ <el-table-column prop="openid" label="鐢ㄦ埛" width="250px" show-overflow-tooltip align="center"></el-table-column>
+ <el-table-column prop="bikeCode" label="杞﹁締缂栧彿" width="100px" align="center"></el-table-column>
+ <el-table-column prop="bikeType" label="杞︾被鍨�" width="200px" align="center"></el-table-column>
+ <el-table-column prop="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" width="200px" align="center"></el-table-column>
+ <el-table-column prop="duration" label="璁¤垂鏃堕暱(鍒�)" width="200px" align="center"></el-table-column>
+ <el-table-column prop="bikeType" label="杞︾被鍨�" width="150px" align="center"></el-table-column>
+ <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" width="150px" align="center"></el-table-column>
+ <el-table-column prop="backDate" label="杩樿溅鏃堕棿" width="150px" align="center"></el-table-column>
+ <el-table-column prop="closeStatus" fixed="right" label="缁撶畻鐘舵��" width="100px" align="center">
<template slot-scope="{row}">
{{ row.closeStatus == 0 ? '鏈粨绠�' : '宸茬粨绠�' }}
</template>
@@ -52,7 +52,7 @@
name: 'OperaSitesWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data() {
+ data () {
return {
// 琛ㄥ崟鏁版嵁
form: {
--
Gitblit v1.9.3