Merge branch 'feature/v6.0/6.0.4' into feature/v7.0/7.0.1

罗广辉

2025-10-09 57c1aad776baa26cd534afcddcdc7cee25910880

 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,