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/priceConfiguration.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/priceConfiguration.vue b/admin/src/components/business/priceConfiguration.vue
index 6855b2d..43cdf4d 100644
--- a/admin/src/components/business/priceConfiguration.vue
+++ b/admin/src/components/business/priceConfiguration.vue
@@ -1,9 +1,9 @@
<template>
<GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking">
<el-table :data="list" stripe border>
- <el-table-column prop="bikeTypeId" label="杞﹀瀷" min-width="120px" align="center"></el-table-column>
- <el-table-column prop="bikeTypeName" label="杞﹀瀷绫诲瀷" min-width="100px" align="center"></el-table-column>
- <el-table-column label="宸ヤ綔鏃ヨ浠疯鍒�" min-width="100px" align="center">
+ <el-table-column prop="bikeTypeId" label="杞﹀瀷" width="90px" align="center"></el-table-column>
+ <el-table-column prop="bikeTypeName" label="杞﹀瀷绫诲瀷" width="200px" align="center"></el-table-column>
+ <el-table-column label="宸ヤ綔鏃ヨ浠疯鍒�" align="center">
<template slot-scope="{row}">
<div style="text-align: left;">
<div>鏂瑰紡锛歿{ row.baseTime == -1 ? '涓�鍙ｄ环' : '闃舵浠锋牸' }}</div>
@@ -13,7 +13,7 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鑺傚亣鏃ヨ浠疯鍒�" min-width="100px" align="center">
+ <el-table-column label="鑺傚亣鏃ヨ浠疯鍒�" align="center">
<template slot-scope="{row}">
<div style="text-align: left;">
<div>鏂瑰紡锛歿{ row.holidayBaseTime == -1 ? '涓�鍙ｄ环' : '闃舵浠锋牸' }}</div>
@@ -28,7 +28,7 @@
<el-button type="text" @click="$refs.operaPriceConfigWindow.open('淇敼璐圭巼', row)">缂栬緫</el-button>
</template>
</el-table-column>
-
+
</el-table>
<div slot="footer">
<el-button @click="visible=false">杩斿洖</el-button>
--
Gitblit v1.9.3