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 | 90 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/src/pages/delivergoods/reservation.vue b/src/pages/delivergoods/reservation.vue
index 780b042..82b4225 100644
--- a/src/pages/delivergoods/reservation.vue
+++ b/src/pages/delivergoods/reservation.vue
@@ -14,16 +14,20 @@
<view class="coreshop-ff chuany-bradius20">
<view class="chuany-font26">
- <view class="chuany-flex chuany-justify-between">
+ <view class="chuany-flex chuany-justify-between chuany-align-center">
<text class="chuany-width5">{{index+1}}</text>
- <view class="chuany-width15">
+ <view class="chuany-width12">
{{$util.formatDate(item.createTime,'riqi')}}
</view>
- <view class="chuany-width65">
+ <view class="chuany-width16">
+ <u-text size='14' :text="item.sentStaff.name" lines="1">
+ </u-text>
+ </view>
+ <view class="chuany-width55">
<u-text size='14' :text="item.remark" lines="1">
</u-text>
</view>
- <u-text align="right" size='14' type="error" text="鏈彈鐞�" @click='accept(item)'>
+ <u-text align="right" size='13' type="error" text="鏈彈鐞�" @click='accept(item)'>
</u-text>
</view>
<view class="c-p-t-8">
@@ -46,8 +50,8 @@
<!-- <up-input v-model="arrangeInfo.deliverTime" readonly border="none"
placeholder="鐐瑰嚮閫夋嫨宸ヤ綔鏃ユ湡"></up-input> -->
<up-datetime-picker hasInput @confirm='confirmDate' :show="shougHuoshow" v-model="deliverTime"
- mode="date" placeholder="鐐瑰嚮閫夋嫨宸ヤ綔鏃ユ湡" :minDate='Number(new Date(minDate))'
- @cancel='() => shougHuoshow = false'></up-datetime-picker>
+ disabled disabledColor='#FFF' mode="date" placeholder="鐐瑰嚮閫夋嫨宸ヤ綔鏃ユ湡"
+ :minDate='Number(new Date(minDate))' @cancel='() => shougHuoshow = false'></up-datetime-picker>
</up-form-item>
<up-form-item label="鎺掑簭" prop="sort" required :borderBottom='false' ref="item1">
<up-input v-model="arrangeInfo.sort" placeholder="璇疯緭鍏ユ帓搴�" border="none" type="number">
@@ -58,12 +62,19 @@
<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-input v-model="arrangeInfo.companyName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none">
+ <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> -->
+ <!-- <up-input v-model="arrangeInfo.companyName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none">
<template #suffix>
<up-button @tap="clickAction" text="鐐瑰嚮閫夋嫨" type="primary" size="mini"></up-button>
</template>
- </up-input>
+ </up-input> -->
</up-form-item>
<up-form-item label="鑱旂郴浜�" prop="lianxiren" :borderBottom='false' ref="item1">
<up-input v-model="arrangeInfo.lianxiren" border="none" placeholder="璇疯緭鍏ヨ仈绯讳汉"></up-input>
@@ -94,6 +105,10 @@
export default {
data() {
return {
+ valueType: {
+ label: 'companyName',
+ value: 'keyid'
+ },
rules: {
'deliverTime': {
type: 'string',
@@ -110,7 +125,7 @@
'companyName': {
type: 'string',
required: true,
- message: '璇峰～鍐欏叕鍙�',
+ message: '璇烽�夋嫨鎴栧～鍐欓�佽揣鍗曚綅',
trigger: ['blur', 'change']
},
'dianhua': {
@@ -156,7 +171,7 @@
show7: false,
arrangeInfo: {
deliverTime: this.$util.formatDate(new Date(), null, 1),
- driverId: '',
+ // driverId: '',
buyerId: null,
dianhua: '',
remark: '',
@@ -172,7 +187,7 @@
maxDate: this.$util.formatDate(new Date(), null, 7),
deliverTime: Number(new Date(this.$util.formatDate(new Date(), null, 1))),
driverList: [],
- customerList:[],
+ customerList: [],
showActions: false,
driverName: '',
actions: []
@@ -182,7 +197,7 @@
this.init()
},
onLoad() {
- this.Getdrivers()
+ this.GetCarList()
this.getCustomer()
},
onReady() {
@@ -205,10 +220,26 @@
},
methods: {
- Getdrivers() {
- this.$api.Getdrivers().then(res => {
+ selectChange(item) {
+ if (typeof item == 'object') {
+ this.buyerName = item.name
+ this.arrangeInfo.buyerId = item.keyid
+ this.arrangeInfo.dizhi = item.adder
+ this.arrangeInfo.dianhua = item.companyPhone
+ this.arrangeInfo.lianxiren = item.businessManagers
+ this.arrangeInfo.companyName = item.companyName
+ } else {
+ this.arrangeInfo.companyName = item
+ }
+ },
+ 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
+ })
}
})
},
@@ -217,21 +248,22 @@
},
confirmDate(val) {
console.log(val);
- this.arrangeInfo.deliverTime = val
+ this.arrangeInfo.deliverTime = this.$util.formatDate(val.value)
this.shougHuoshow = false
},
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 = ''
@@ -259,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
@@ -304,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 = ''
@@ -330,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