From ec90cbd7680a6f927cb1cea43f33ab7df6d0864c Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 11 十一月 2025 09:23:22 +0800
Subject: [PATCH] -

---
 src/pages/delivergoods/reservation.vue |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/pages/delivergoods/reservation.vue b/src/pages/delivergoods/reservation.vue
index ad347a3..82b4225 100644
--- a/src/pages/delivergoods/reservation.vue
+++ b/src/pages/delivergoods/reservation.vue
@@ -19,11 +19,11 @@
 							<view class="chuany-width12">
 								{{$util.formatDate(item.createTime,'riqi')}}
 							</view>
-							<view class="chuany-width13">
+							<view class="chuany-width16">
 								<u-text size='14' :text="item.sentStaff.name" lines="1">
 								</u-text>
 							</view>
-							<view class="chuany-width58">
+							<view class="chuany-width55">
 								<u-text size='14' :text="item.remark" lines="1">
 								</u-text>
 							</view>
@@ -62,10 +62,14 @@
 					<up-input v-model="arrangeInfo.driverName" disabled border="none" disabledColor="#ffffff"
 						placeholder="璇烽�夋嫨鍙告満"></up-input>
 				</up-form-item>
-				<up-form-item label="鏀惰揣鍗曚綅" prop="companyName" required :borderBottom='false' ref="item1">
-					<tem-selects-fan placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" :data="customerList" :clearable='true'
+				<up-form-item label="鏀惰揣鍗曚綅" prop="companyName" labelPosition='top' required :borderBottom='false'
+					ref="item1" v-if='show7'>
+					<tem-select ref="formSelect" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" :selectedId="arrangeInfo.buyerId" :value='arrangeInfo.companyName' :search='true'
+						:localdata="customerList" @change="selectChange"></tem-select>
+						
+					<!-- <tem-selects-fan placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" :data="customerList" :clearable='true'
 						:value="arrangeInfo.companyName" :value-type="valueType" :filterable='true' :searchType='1'
-						@input='selectChange'></tem-selects-fan>
+						@input='selectChange'></tem-selects-fan> -->
 					<!-- <up-input v-model="arrangeInfo.companyName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none">
 						<template #suffix>
 							<up-button @tap="clickAction" text="鐐瑰嚮閫夋嫨" type="primary" size="mini"></up-button>
@@ -167,7 +171,7 @@
 				show7: false,
 				arrangeInfo: {
 					deliverTime: this.$util.formatDate(new Date(), null, 1),
-					driverId: '',
+					// driverId: '',
 					buyerId: null,
 					dianhua: '',
 					remark: '',
@@ -193,7 +197,7 @@
 			this.init()
 		},
 		onLoad() {
-			this.Getdrivers()
+			this.GetCarList()
 			this.getCustomer()
 		},
 		onReady() {
@@ -228,10 +232,14 @@
 					this.arrangeInfo.companyName = item
 				}
 			},
-			Getdrivers() {
-				this.$api.Getdrivers().then(res => {
+			GetCarList() {
+				this.$api.GetCarList().then(res => {
 					if (res.code == 1) {
 						this.driverList = res.data
+						this.driverList.forEach(item => {
+							item.driverName = item.name
+							item.name = item.carNumber
+						})
 					}
 				})
 			},
@@ -246,15 +254,16 @@
 			cancelModal() {
 				this.arrangeInfo = {
 					deliverTime: this.$util.formatDate(new Date(), null, 1),
-					driverId: '',
+					// driverId: '',
 					buyerId: null,
 					dianhua: '',
 					remark: '',
 					lianxiren: '',
 					dizhi: '',
-					driverName: '',
 					deliverTixingId: '',
-					sort: '1'
+					sort: 1,
+					driverName:'',
+					companyName: '',
 				}
 				this.show7 = false
 				this.driverName = ''
@@ -282,14 +291,18 @@
 						this.customerList = res.data
 						this.customerList.forEach(item => {
 							item.name = item.companyName
+							item.title = item.companyName
+							item.id = item.keyid
 						})
 					}
 				})
 			},
 			selectItem(item) {
 				if (this.selectAc == 'driver') {
-					this.arrangeInfo.driverName = item.name
-					this.arrangeInfo.driverId = item.keyid
+					// this.arrangeInfo.driverName = item.driverName
+					this.arrangeInfo.driverName = item.carNumber
+					// this.arrangeInfo.driverId = item.keyid
+					this.arrangeInfo.carId = item.keyid
 				} else if (this.selectAc == 'driver7') {
 					this.deliverKeyID = item.keyid
 					this.deliverKeyName = item.name
@@ -327,14 +340,16 @@
 								this.isEdit = false
 								this.arrangeInfo = {
 									deliverTime: this.$util.formatDate(new Date(), null, 1),
-									driverId: '',
+									// driverId: '',
 									buyerId: null,
 									dianhua: '',
 									remark: '',
 									lianxiren: '',
 									dizhi: '',
 									deliverTixingId: '',
-									sort: '1'
+									sort: 1,
+									driverName:'',
+									companyName: '',
 								}
 								this.show7 = false
 								this.driverName = ''
@@ -353,12 +368,16 @@
 						if (res.code == 1) {
 							this.arrangeInfo = {
 								deliverTime: this.$util.formatDate(new Date(), null, 1),
-								driverId: '',
+								// driverId: '',
 								buyerId: null,
 								dianhua: '',
 								remark: '',
 								lianxiren: '',
 								dizhi: '',
+								deliverTixingId: '',
+								sort: 1,
+								driverName:'',
+								companyName: '',
 							}
 							this.show7 = false
 							this.driverName = ''

--
Gitblit v1.9.1