From 6dc59277cedc8c995b1c68807e40a6ee5903f0f4 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 10 三月 2025 17:18:15 +0800
Subject: [PATCH] 送货受理受理成功生成送货安排
---
src/pages/delivergoods/arrange.vue | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/src/pages/delivergoods/arrange.vue b/src/pages/delivergoods/arrange.vue
index 9242dea..371503a 100644
--- a/src/pages/delivergoods/arrange.vue
+++ b/src/pages/delivergoods/arrange.vue
@@ -24,10 +24,10 @@
<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">
+ <u-text size='14' :text="item.remark||item.companyName" lines="1">
</u-text>
</view>
<view class="chuany-width5" @tap.stop='editOrder(item)'>
@@ -54,12 +54,17 @@
mode="date" placeholder="鐐瑰嚮閫夋嫨宸ヤ綔鏃ユ湡" :minDate='Number(new Date(minDate))'
@cancel='() => shougHuoshow = false'></up-datetime-picker>
</up-form-item>
- <up-form-item label="鍙告満" prop="driverId" required :borderBottom='false' @click="clickAction('driver')"
+ <up-form-item label="鎺掑簭" prop="sort" required :borderBottom='false' ref="item1">
+ <up-input v-model="arrangeInfo.sort" placeholder="璇疯緭鍏ユ帓搴�" border="none" type="number">
+ </up-input>
+ </up-form-item>
+ <up-form-item label="鍙告満" prop="driverName" required :borderBottom='false' @click="clickAction('driver')"
ref="item1">
- <up-input v-model="driverName" disabled border="none" disabledColor="#ffffff"
+ <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">
+ <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 +77,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 +104,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: {},
@@ -124,7 +129,10 @@
remark: '',
lianxiren: '',
dizhi: '',
- companyName: ''
+ companyName: '',
+ driverName: '',
+ deliverTixingId: '',
+ sort: '1'
},
rules: {
'deliverTime': {
@@ -133,11 +141,12 @@
message: '璇烽�夋嫨鏃ユ湡',
trigger: ['blur', 'change']
},
- // 'driverId': {
- // required: true,
- // message: '璇烽�夋嫨鍙告満',
- // trigger: ['blur', 'change']
- // },
+ 'driverName': {
+ type: 'string',
+ required: true,
+ message: '璇烽�夋嫨鍙告満',
+ trigger: ['blur', 'change']
+ },
'companyName': {
type: 'string',
required: true,
@@ -162,13 +171,19 @@
message: '璇疯緭鍏ラ�佽揣浜嬬敱',
trigger: ['blur', 'change']
},
+ 'sort': {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ユ帓搴�',
+ trigger: ['blur', 'change']
+ },
},
radio: '',
switchVal: false,
driverList: [],
buyerName: '',
- timeStart: '',
- timeEnd: '',
+ timeStart: new Date(),
+ timeEnd: new Date(),
sevenDaysDriver: [],
deliverKeyID: '',
deliverKeyName: ''
@@ -292,10 +307,11 @@
lianxiren: item.lianxiren,
dizhi: item.dizhi,
keyid: item.keyid,
- companyName: item.companyName
+ companyName: item.companyName,
+ sort: item.sort
}
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 +347,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 => {
@@ -352,6 +374,7 @@
remark: '',
lianxiren: '',
dizhi: '',
+ sort: '1'
}
this.show7 = false
this.driverName = ''
@@ -376,6 +399,9 @@
remark: '',
lianxiren: '',
dizhi: '',
+ companyName: '',
+ driverName: '',
+ sort: '1'
}
this.show7 = false
this.driverName = ''
@@ -402,6 +428,9 @@
remark: '',
lianxiren: '',
dizhi: '',
+ companyName: '',
+ driverName: '',
+ sort: '1'
}
this.show7 = false
this.driverName = ''
--
Gitblit v1.9.1