From bf8a7b0bada7769302af7b497a6ae7296c7fe412 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Fri, 30 Jun 2023 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/tablecmt/tablecmt.vue | 5 +++++
.../distribution/reservation/reservation.vue | 19 ++++++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3c85c601..c3051b21 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -40,6 +40,7 @@
v-if="column.type == 3"
v-model="column.values"
class="m-2"
+ clearable
:placeholder="`请选择${column.label}`"
@change="selectchange($event,column)"
@clear="selectclear($event,column)"
@@ -55,6 +56,8 @@
v-model="column.values"
v-if="column.type == 4"
type="date"
+ clearable
+ style="width: 150px;"
:placeholder="`请选择${column.label}`"
@change="timechange($event,column)"
@clear="timeclear($event,column)"
@@ -63,6 +66,8 @@
v-model="column.values"
v-if="column.type == 5"
type="datetime"
+ clearable
+ style="width: 190px;"
:placeholder="`请选择${column.label}`"
format="YYYY/MM/DD HH:mm:ss"
@change="timechange($event,column)"
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index c2e35c8f..293387da 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -192,19 +192,28 @@ export default {
{
prop: 'deliveryPhone',
label: '收件人电话',
- type: 2,
+ type: 3,
values: '',
width: '180',
- checkarr: [],
+ checkarr: [
+ {
+ label:'1231213',
+ value:'123121123'
+ },
+ {
+ label:'112121',
+ value:'12312123111123'
+ }
+ ],
fixed: false,
sortable: true,
},
{
prop: 'reservationDate',
label: '预约时间',
- type: 4,
+ type: 5,
values: '',
- width: '150',
+ width: '220',
checkarr: [],
fixed: false,
sortable: true,
@@ -214,7 +223,7 @@ export default {
label: '时段',
type: 4,
values: '',
- width: '150',
+ width: '180',
checkarr: [],
fixed: false,
sortable: true,