From 57c1aad776baa26cd534afcddcdc7cee25910880 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 09 Oct 2025 14:32:02 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.4' into feature/v7.0/7.0.1
---
src/views/tickets/orderLog.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 0a6f5b5..46e87d8 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -579,7 +579,8 @@
<el-col :span="3">
<el-time-picker
- style="width: 100px"
+ class="timeStyle"
+ :style="{width:pxToRem(140)}"
v-model="form.deal_time"
prop="deal_time"
value-format="HH:mm"
@@ -861,6 +862,7 @@
</template>
<script>
+import { pxToRem, pxToRemNum } from '@/utils/rem'
import { calculateDefaultRange } from '@/utils/util';
import {
getList,
--
Gitblit v1.9.3