From 309cc3fe6303d8464951063e89fc9d623915501e Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 10 三月 2025 16:23:35 +0800
Subject: [PATCH] -

---
 src/pages/delivergoods/arrange.vue |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/pages/delivergoods/arrange.vue b/src/pages/delivergoods/arrange.vue
index 9242dea..0ea7ff3 100644
--- a/src/pages/delivergoods/arrange.vue
+++ b/src/pages/delivergoods/arrange.vue
@@ -24,7 +24,7 @@
 						<view class="chuany-flex chuany-justify-between">
 							<text class="chuany-width7">{{index+1}}</text>
 							<view class="chuany-width15">
-								{{$util.formatDate(item.createTime,'riqi')}}
+								{{$util.formatDate(item.deliverTime,'riqi')}}
 							</view>
 							<view class="chuany-width73">
 								<u-text size='14' :text="item.remark" lines="1">
@@ -59,7 +59,7 @@
 					<up-input v-model="driverName" disabled border="none" disabledColor="#ffffff"
 						placeholder="璇烽�夋嫨鍙告満"></up-input>
 				</up-form-item>
-				<up-form-item label="鏀惰揣鍗曚綅" prop="companyName" required :borderBottom='false' ref="item1">
+				<up-form-item label="鏀惰揣鍗曚綅" prop="companyName" labelPosition='top' required :borderBottom='false' ref="item1">
 					<up-input v-model="arrangeInfo.companyName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none">
 						<template #suffix>
 							<up-button @tap="clickAction" text="鐐瑰嚮閫夋嫨" type="primary" size="mini"></up-button>
@@ -72,11 +72,11 @@
 				<up-form-item label="鑱旂郴鐢佃瘽" prop="dianhua" required :borderBottom='false' ref="item1">
 					<up-input v-model="arrangeInfo.dianhua" border="none" placeholder="璇疯緭鍏ヨ仈绯荤數璇�"></up-input>
 				</up-form-item>
-				<up-form-item label="閫佽揣鍦板潃" prop="dizhi" required :borderBottom='false' ref="item1">
+				<up-form-item label="閫佽揣鍦板潃" prop="dizhi" labelPosition='top' required :borderBottom='false' ref="item1">
 					<up-input v-model="arrangeInfo.dizhi" border="none" placeholder="璇疯緭鍏ラ�佽揣鍦板潃"></up-input>
 				</up-form-item>
-				<up-form-item label="閫佽揣浜嬬敱" prop="remark" required :borderBottom='false' ref="item1">
-					<up-textarea v-model="arrangeInfo.remark" border="none" placeholder="璇疯緭鍏ラ�佽揣浜嬬敱"></up-textarea>
+				<up-form-item label="閫佽揣浜嬬敱" prop="remark" labelPosition='top' required :borderBottom='false' ref="item1">
+					<up-input v-model="arrangeInfo.remark" border="none" placeholder="璇疯緭鍏ラ�佽揣浜嬬敱"></up-input>
 				</up-form-item>
 			</up-form>
 		</up-modal>
@@ -99,11 +99,11 @@
 			return {
 				datePickerShow: false,
 				shougHuoshow: false,
-				workTime: '',
+				workTime: this.$util.formatDate(new Date()),
 				orderList: [],
 				loadStatus: 'loadmore',
 				pageIndex: 1,
-				pageSize: 20,
+				pageSize: 30,
 				customerList: [],
 				isEdit: false,
 				editItem: {},
@@ -167,8 +167,8 @@
 				switchVal: false,
 				driverList: [],
 				buyerName: '',
-				timeStart: '',
-				timeEnd: '',
+				timeStart: new Date(),
+				timeEnd: new Date(),
 				sevenDaysDriver: [],
 				deliverKeyID: '',
 				deliverKeyName: ''
@@ -295,7 +295,7 @@
 					companyName: item.companyName
 				}
 				this.show7 = true
-				this.driverName = item.driver.name
+				this.driverName = item.driver && item.driver.name
 				// let obj = this.customerList.find(ite => {
 				// 	return ite.keyid == item.buyerId
 				// })
@@ -331,14 +331,20 @@
 			},
 			init() {
 				this.pageIndex = 1
-				this.pageSize = 20
+				this.pageSize = 30
 				this.loadStatus = 'loadmore'
 				this.orderList = []
 				console.log(this.orderList);
 				this.getList()
 			},
 			confirmSave() {
-				console.log(this.arrangeInfo.driverId);
+				if (!this.arrangeInfo.driverId) {
+					this.$refs.modalArrange.loading = false
+					return this.$util.showToast({
+						title: '璇烽�夋嫨鍙告満锛�'
+					})
+				}
+				console.log();
 				this.$refs.formRef.validate().then(res => {
 					if (this.isEdit) {
 						this.$api.UpDataDeliverPlans(this.arrangeInfo).then(res => {

--
Gitblit v1.9.1