From e35a4f61e1449ae199a815e0172709e68054c657 Mon Sep 17 00:00:00 2001 From: kilo Date: Sat, 19 Aug 2023 16:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E9=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionDeliveryList.js | 27 + .../distribution/distributionStockArticle.js | 11 + src/router/views/index.js | 15 +- .../distributionDeliveryListmar.vue | 4 +- src/views/distribution/reservation/atlas1.vue | 109 ++++ .../reservation/reservationFrom.vue | 100 ++-- .../turndelivery/deliveryDiscuss.vue | 1 + .../turndelivery/deliveryMarket.vue | 504 +++++++++++------- 8 files changed, 528 insertions(+), 243 deletions(-) create mode 100644 src/views/distribution/reservation/atlas1.vue diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index 0268c4f4..523de3ff 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -162,6 +162,33 @@ export const updateDeliveryList = (data) => { data: data }) } +/** + * 修改配送计划 + * @param data + * @returns {AxiosPromise} + */ +export const updateMarketDelivery = (data) => { + return request({ + url: '/api/logpm-distribution/deliveryList/updateMarketDelivery', + method: 'put', + data: data + }) +} + +/** + * 查询配送任务订单地图信息 + * @param data + * @returns {AxiosPromise} + */ +export const selectStockArticleAtlasInfo = (id) => { + return request({ + url: '/api/logpm-distribution/deliveryList/selectStockArticleAtlasInfo', + method: 'get', + params: { + id, + } + }) +} diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index c17a484f..da52c7ed 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -196,5 +196,16 @@ export const selectStockArticleInfoList = (current, size, params) => { }) } +export const selectUpdateAvailableStockArticle = (id) => { + return request({ + url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle', + method: 'get', + params: { + id + } + }) +} + + diff --git a/src/router/views/index.js b/src/router/views/index.js index 3c5d0d44..9ed56970 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -417,12 +417,25 @@ export default [ children: [ { path: '/distribution/reservation/atlas', - name: '地图展示', + name: '市配地图展示', id:'id', component: () => import('@/views/distribution/reservation/atlas.vue'), }, ], }, + { + path: '/distribution/reservation/atlas1', + component: Layout, + redirect: '/distribution/reservation/atlas1', + children: [ + { + path: '/distribution/reservation/atlas1', + name: '配送地图展示', + id:'id', + component: () => import('@/views/distribution/reservation/atlas1.vue'), + }, + ], + }, { path: '/distribution/reservation/reservationDetails', component: Layout, diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index e0641cb1..0b7dc629 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -535,9 +535,9 @@ export default { const { row } = scope; console.log("row>>>>>>xxxx",row); this.$router.push({ - path: '/distribution/reservation/atlas', + path: '/distribution/reservation/atlas1', query: { - id: row.reservationId, + id: JSON.stringify(row), type:'2' } }); diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue new file mode 100644 index 00000000..ff4108ea --- /dev/null +++ b/src/views/distribution/reservation/atlas1.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/views/distribution/reservation/reservationFrom.vue b/src/views/distribution/reservation/reservationFrom.vue index 8f0dba71..93c29d81 100644 --- a/src/views/distribution/reservation/reservationFrom.vue +++ b/src/views/distribution/reservation/reservationFrom.vue @@ -472,7 +472,8 @@ import { getStockArticleList, selectStockArticleList, - selectStockArticleInfoList + selectStockArticleInfoList, + selectUpdateAvailableStockArticle } from '@/api/distribution/distributionStockArticle'; import { getDetailDelivery } from '@/api/distribution/distributionDelivery'; import { addIncrement } from '@/api/distribution/distributionStockArticle'; @@ -656,32 +657,60 @@ //查询出所有的市配订单 handleAddOrder() { this.loading = true; - console.log('$$$$$$', this.orderData); this.query.typeService = 2; this.query.genre = '1'; const params = {}; const page = this.page; - selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { - console.log('res------------>', res); - const data = res.data.data; - this.stockArticleInfo = data.records; - this.stockArticleInfo.forEach((item, index) => { - //检查订单是否冻结 - this.checkOrder(item, index); - if (this.orderData) { - this.orderData.forEach(o => { - if (o.id === item.id) { - this.$nextTick(() => { - this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true); - }); - } - }); - }else { + if (this.reservationId){ + console.log("------------>",'预约编辑'); + //编辑和新增不一样的处理方式 + //这里需要查询出未被预约的订单和该预约自己本身的订单 + selectUpdateAvailableStockArticle(this.reservationId).then(res=>{ + console.log('res------------>', res); + const data = res.data.data; + this.stockArticleInfo = data + this.stockArticleInfo.forEach((item, index) => { + //检查订单是否冻结 + this.checkOrder(item, index); + if (this.orderData) { + this.orderData.forEach(o => { + if (o.id === item.id) { + this.$nextTick(() => { + this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true); + }); + } + }); + }else { this.orderList = []; - } + } + }); + }) + + }else { + selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => { + console.log('res------------>', res); + const data = res.data.data; + this.stockArticleInfo = data.records; + this.stockArticleInfo.forEach((item, index) => { + //检查订单是否冻结 + this.checkOrder(item, index); + // if (this.orderData) { + // this.orderData.forEach(o => { + // if (o.id === item.id) { + // this.$nextTick(() => { + // this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true); + // }); + // } + // }); + // }else { + // this.orderList = []; + // } + }); + this.orderList = []; + }); - }); + } this.loading = false; console.log("this.stockArticleInfo------------->",this.stockArticleInfo); // if (this.reservationId) { @@ -1192,24 +1221,21 @@ return; } } - const data = this.orderList; + this.orderData = this.orderList; let info = []; - if (this.orderData){ - let a = this.orderData; - data.forEach(item=>{ - a.forEach(order=>{ - if (item.id === order.id){ - console.log("order----------------->",order); - item = order; - } - }) - info.push(item); - }) - } - console.log("orderList------------------->",this.orderList); - console.log("list------------------->",list); - console.log("orderData------------------->",this.orderData); - this.orderData = info; + // if (this.orderData){ + // let a = this.orderData; + // data.forEach(item=>{ + // a.forEach(order=>{ + // if (item.id === order.id){ + console.log("orderData----------------->",this.orderData); + // item = order; + // } + // }) + // info.push(item); + // }) + // } + // this.orderData = info; this.orderShow = false; }, selectionClear() { diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 5501d8df..b3b181d6 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -1447,6 +1447,7 @@ this.query.genre = "1"; const page = this.page; let params = {}; + console.log("------------->",this.query); selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{ console.log(res.data.data); diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue index 46f94c7c..d853584f 100644 --- a/src/views/distribution/turndelivery/deliveryMarket.vue +++ b/src/views/distribution/turndelivery/deliveryMarket.vue @@ -201,7 +201,7 @@ - + @@ -336,7 +336,7 @@ import option from '@/option/distribution/distributionReservation'; import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup'; import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation'; - import { getMarketDeliveryList } from '@/api/distribution/distributionDeliveryList'; + import { getMarketDeliveryList,updateMarketDelivery } from '@/api/distribution/distributionDeliveryList'; import { getListUser } from '@/api/distribution/distributionStockup'; import { getPostList } from '@/api/system/post'; import { getListOwn } from '@/api/system/user'; @@ -617,14 +617,33 @@ fetchData() { this.error = this.post = null; this.loading = true; - console.log("this.$route.query",this.$route.query); + console.log('this.$route.query', this.$route.query); if (this.$route.query.id) { this.reservationIds = this.$route.query.id; } if (this.$route.query.deliveryId) { this.deliveryListId = this.$route.query.deliveryId; } + this.loading = false; + + }, + removeStockArticle(row){ + if (this.data.length===1){ + this.$message({ + message: '无法进行预约任务取消!!!', + type: 'warning' + }); + return; + } + let data = this.data; + data.forEach((item,index)=>{ + if (item.id === row.id){ + data.splice(index, 1); + } + }) + this.data = data; + console.log("row------------->",row); }, viewDriverInfo() { console.log(this.driverInfo.length); @@ -665,8 +684,9 @@ for (let i = 0; i < this.driverInfo.length; i++) { let obj = {}; obj.driver = this.driverInfo[i].name; + obj.driverName = this.driverInfo[i].name; obj.driverId = this.driverInfo[i].id; - obj.driverPhone=this.driverInfo[i].phone; + obj.driverPhone = this.driverInfo[i].phone; obj.vehicleNub = this.vehticleInfo[i].vehicleNub; obj.vehicleId = this.vehticleInfo[i].id; info.push(obj); @@ -675,203 +695,219 @@ allocationInfo = info; } data.allocationInfo = allocationInfo; - data.masterDriverName = this.driverForm.masterDriverName; - data.masterVehicleNub = this.driverForm.masterVehicleNub; - } - if (this.waixieForm.tripartiteSource){ - tripartite = this.waixieForm; - data.tripartite = tripartite; - } - if (this.stockUpForm) { - let params = this.stockUpForm; - if (params.tripartiteSource) { - //三方配送数据构建 - if (params.driverName) { - tripartite.driverName = params.driverName; - } - if (params.deiverPhone) { - tripartite.deiverPhone = params.deiverPhone; - } - if (params.vehicleNum) { - tripartite.vehicleNum = params.vehicleNum; + data.masterDriverName = this.driverForm.masterDriverName; + data.masterVehicleNub = this.driverForm.masterVehicleNub; + } + if (this.waixieForm.tripartiteSource) { + tripartite = this.waixieForm; + data.tripartite = tripartite; + } + if (this.stockUpForm) { + let params = this.stockUpForm; + if (params.tripartiteSource) { + //三方配送数据构建 + if (params.driverName) { + tripartite.driverName = params.driverName; + } + if (params.deiverPhone) { + tripartite.deiverPhone = params.deiverPhone; + } + if (params.vehicleNum) { + tripartite.vehicleNum = params.vehicleNum; + } + if (params.deliveryFee) { + tripartite.deliveryFee = params.deliveryFee; + } + if (params.tripartiteSource) { + this.tripartiteSourceData.forEach(item => { + if (params.tripartiteSource === item.dictValue) { + tripartite.distributionCompanyId = item.dictKey; + tripartite.distributionCompany = item.dictValue; + } + }); + } + data.tripartite = tripartite; + } else { + // 自主配送 + if (params.loader) { + this.loaderData.forEach(a => { + if (params.loader === a.dictKey) { + stockup.loaderName = a.dictValue; + stockup.loaderId = a.dictKey; + } + }); + } + if (params.forklift) { + this.forkliftData.forEach(b => { + if (params.forklift === b.dictKey) { + stockup.forkliftName = b.dictValue; + stockup.forkliftId = b.dictKey; + } + }); + } + if (params.goodsAreaId) { + this.goodsAreaData.forEach(c => { + if (params.goodsAreaId === c.dictKey) { + stockup.goodsAreaId = c.dictKey; + stockup.goodsAreaName = c.dictValue; + } + }); + } + if (params.stockupDate) { + stockup.stockupDate = params.stockupDate; + } + if (params.remarks) { + stockup.remarks = params.remarks; + } + if (this.loadAndUnload.length > 0) { + stockup.loadAndUnload = this.loadAndUnload.join(','); + } + if (params.outboundDate) { + stockup.outboundDate = params.outboundDate; + } + data.stockup = stockup; } - if (params.deliveryFee) { - tripartite.deliveryFee = params.deliveryFee; + if (this.stockUpForm.taskTime) { + data.taskTime = this.stockUpForm.taskTime.toString(); } - if (params.tripartiteSource) { - this.tripartiteSourceData.forEach(item => { - if (params.tripartiteSource === item.dictValue) { - tripartite.distributionCompanyId = item.dictKey; - tripartite.distributionCompany = item.dictValue; - } + } + console.log('this.data------------>', this.data); + if (!this.deliveryListId) { + data.reservationIds = this.reservationIds; + console.log('>>>>>>>>>>>>', data); + deliveryTask(data).then((res) => { + this.$router.push({ + path: '/distribution/deliverylist/distributionDeliveryListmar', + name: '配送市配列表' }); - } - data.tripartite = tripartite; - }else { - // 自主配送 - if (params.loader) { - this.loaderData.forEach(a => { - if (params.loader === a.dictKey) { - stockup.loaderName = a.dictValue; - stockup.loaderId = a.dictKey; + }); + } else { + data.reservationInfos =this.data; + data.id = this.deliveryListId; + data.stockupInfo = stockup; + updateMarketDelivery(data).then(res=>{ + let result = res; + console.log("result---------------->",result); + this.$message({ + message: '操作成功', + type: 'message' + }); + this.$router.go(-1) + return; + }) + } + }, + changeVehicle(params) { + console.log(params); + this.vehticleList = params; + let b = []; + if (params) { + this.vehicleData.forEach(item => { + this.vehticleList.forEach(p => { + if (p == item.id) { + b.push(item); + console.log(this.driverInfo); } }); - } - if (params.forklift){ - this.forkliftData.forEach(b => { - if (params.forklift === b.dictKey) { - stockup.forkliftName = b.dictValue; - stockup.forkliftId = b.dictKey; + if (params[0] === item.id) { + this.driverForm.masterVehicleNub = item.vehicleNub; + } + }); + this.vehticleInfo = b; + } + }, + changeDriver(params) { + this.driverList = params; + let a = []; + if (params) { + this.driverData.forEach(item => { + this.driverList.forEach(p => { + if (p == item.id) { + a.push(item); + console.log(this.driverInfo); } }); + if (params[0] === item.id) { + this.driverForm.masterDriverName = item.name; + } + }); + this.driverInfo = a; + } + }, + //上移 + moveUpVehictle(row) { + let i = 0; + this.vehticleInfo.forEach((item, index) => { + if (item.id === row.id) { + i = index; } - if (params.goodsAreaId){ - this.goodsAreaData.forEach(c => { - if (params.goodsAreaId === c.dictKey) { - stockup.goodsAreaId = c.dictKey; - stockup.goodsAreaName = c.dictValue; + }); + //获取当当前选中的下标，如果下标为第一个则不能上移 + if (i > 0) { + let a = this.vehticleInfo[i - 1]; + this.vehticleInfo.splice(i - 1, 1); + this.vehticleInfo.splice(i, 0, a); + } else { + this.$message({ + message: '已经是第一条，上移失败', + type: 'warning' + }); + } + console.log(this.vehticleInfo); + }, + handleSelect(selection, row) { + // 阻止全选框原有逻辑 + this.$refs.multipleTable.clearSelection(); + if (row) { + if (selection.length === 1) { + this.multipleSelection = row; + this.$refs.multipleTable.toggleRowSelection(row, true); + } else if (selection.length > 1) { + let a = {}; + selection.forEach((s, index) => { + if (s.id === row.id) { + selection.splice(index, 1); + a = s; } }); + this.multipleSelection = selection; + this.$refs.multipleTable.toggleRowSelection(a, true); } - if (params.stockupDate) { - stockup.stockupDate = params.stockupDate; - } - if (params.remarks) { - stockup.remarks = params.remarks; - } - if (this.loadAndUnload.length>0){ - stockup.loadAndUnload = this.loadAndUnload.join(','); - } - if (params.outboundDate){ - stockup.outboundDate = params.outboundDate; - } - data.stockup = stockup; } - if (this.form.taskTime){ - data.taskTime = this.form.taskTime; + }, + confirmDriver() { + if (this.multipleSelection.length === 0) { + this.$message.warning('请选择至少一条数据'); + return; } - } - data.reservationIds = this.reservationIds; - console.log("this.data------------>",this.data); - console.log(">>>>>>>>>>>>",data); - deliveryTask(data).then((res) => { - this.$router.push({ - path: '/distribution/deliverylist/distributionDeliveryListmar', - name:'配送市配列表' - }); - }); - }, - changeVehicle(params) { - console.log(params); - this.vehticleList = params; - let b = []; - if (params) { - this.vehicleData.forEach(item => { - this.vehticleList.forEach(p => { - if (p == item.id) { - b.push(item); - console.log(this.driverInfo); - } - }); - if (params[0] === item.id) { - this.driverForm.masterVehicleNub = item.vehicleNub; + console.log('this.adada', this.multipleSelection); + this.isDriverShow = false; + //获取到表格的行坐标 + let a = 0; + this.driverInfo.forEach((item, index) => { + if (item.id === this.multipleSelection.id) { + a = index; } }); - this.vehticleInfo = b; - } - }, - changeDriver(params) { - this.driverList = params; - let a = []; - if (params) { - this.driverData.forEach(item => { - this.driverList.forEach(p => { - if (p == item.id) { - a.push(item); - console.log(this.driverInfo); - } - }); - if (params[0] === item.id) { - this.driverForm.masterDriverName = item.name; - } + this.driverForm.masterDriverName = this.driverInfo[a].name; + this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub; + }, + // //数据字典数据获取 + getDictionary() { + getDictionaryBiz('addvalue_serve_type').then(res => { + this.addvalueServeTypeData = res.data.data; }); - this.driverInfo = a; - } - }, - //上移 - moveUpVehictle(row) { - let i = 0; - this.vehticleInfo.forEach((item, index) => { - if (item.id === row.id) { - i = index; - } - }); - //获取当当前选中的下标，如果下标为第一个则不能上移 - if (i > 0) { - let a = this.vehticleInfo[i - 1]; - this.vehticleInfo.splice(i - 1, 1); - this.vehticleInfo.splice(i, 0, a); - } else { - this.$message({ - message: '已经是第一条，上移失败', - type: 'warning', + getDictionaryBiz('load_and_unload').then(res => { + this.loadAndUnloadData = res.data.data; }); - } - console.log(this.vehticleInfo); - }, - handleSelect(selection, row) { - // 阻止全选框原有逻辑 - this.$refs.multipleTable.clearSelection(); - if (row) { - if (selection.length === 1) { - this.multipleSelection = row; - this.$refs.multipleTable.toggleRowSelection(row, true); - } else if (selection.length > 1) { - let a = {}; - selection.forEach((s, index) => { - if (s.id === row.id) { - selection.splice(index, 1); - a = s; - } - }); - this.multipleSelection = selection; - this.$refs.multipleTable.toggleRowSelection(a, true); - } - } - }, - confirmDriver() { - if (this.multipleSelection.length === 0) { - this.$message.warning('请选择至少一条数据'); - return; - } - console.log('this.adada', this.multipleSelection); - this.isDriverShow = false; - //获取到表格的行坐标 - let a = 0; - this.driverInfo.forEach((item, index) => { - if (item.id === this.multipleSelection.id) { - a = index; - } - }); - this.driverForm.masterDriverName = this.driverInfo[a].name; - this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub; - }, - // //数据字典数据获取 - getDictionary() { - getDictionaryBiz('addvalue_serve_type').then(res => { - this.addvalueServeTypeData = res.data.data; - }); - getDictionaryBiz('load_and_unload').then(res => { - this.loadAndUnloadData = res.data.data; - }); - getDictionaryBiz('delivery_way').then(res => { - this.deliveryWayData = res.data.data; - }); - //三方外协来源 - getDictionaryBiz('tripartite_source').then(res => { - this.tripartiteSourceData = res.data.data; - }); - }, + getDictionaryBiz('delivery_way').then(res => { + this.deliveryWayData = res.data.data; + }); + //三方外协来源 + getDictionaryBiz('tripartite_source').then(res => { + this.tripartiteSourceData = res.data.data; + }); + }, ccc() { if (this.deliveryListId){ @@ -928,27 +964,89 @@ this.stockUpForm.stockupDate = new Date(); this.form.taskTime = new Date(); this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss'); - this.stockUpForm.otherFee = 0 ; - this.loadAndUnload = ["1","2"] ; - if (this.reservationIds){ - console.log("》》》》》》》》》》》》》》》",this.reservationIds); - let ids =this.reservationIds; - getReservationAddr(ids).then(res => { - console.log("------------->",res); - const reservationData = res.data.data; - this.page.total = reservationData.total; - this.data = reservationData.records; - console.log('>>>>>>>>>>>', this.data); - this.loading = false; - }); - } - if (this.deliveryListId){ - console.log("<<<<<<<<<<",this.deliveryListId); + this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss'); + this.stockUpForm.otherFee = 0; + this.loadAndUnload = ['1', '2']; + if (this.reservationIds) { + this.isoperation = false; + console.log('》》》》》》》》》》》》》》》', this.reservationIds); + let ids = this.reservationIds; + getReservationAddr(ids).then(res => { + console.log('------------->', res); + const reservationData = res.data.data; + this.page.total = reservationData.total; + this.data = reservationData.records; + console.log('>>>>>>>>>>>', this.data); + this.loading = false; + }); + } + if (this.deliveryListId) { + this.isoperation = true; + console.log('<<<<<<<<<<', this.deliveryListId); //市配计划编辑回显 - getMarketDeliveryList(this.deliveryListId).then(res=>{ - console.log(res.data.data); - }) + getMarketDeliveryList(this.deliveryListId).then(async res => { + console.log('--------------->', res.data.data); + const deliveryData = res.data.data; + this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate; + this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime; + this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId; + this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId; + this.stockUpForm.loader = deliveryData.stockupInfo.loaderId; + this.stockUpForm.taskTime = deliveryData.taskTime; + console.log('reservationInfo--------------->', res.data.data.reservationInfo); + this.data = deliveryData.reservationInfos; + if (deliveryData.kind === '1') { + //自主配送 + let self = deliveryData.deliverySelfVO; + let vehicle = await this.getvehicleData(); + console.log('___________________-->', vehicle); + let driver = await this.getMasterDriverData(); + let a = []; + let b = []; + let vehicleInfo = []; + vehicle.forEach(item => { + self.forEach(s => { + if (item.id === s.vehicleId) { + a.push(s.vehicleId); + vehicleInfo.push(item); + } + if (s.isMaster === 2) { + this.driverForm.masterVehicleNub = s.vehicleNub; + } + }); + }); + this.vehticleList = a; + this.vehicleIds = a; + console.log(' this.vehicleIds', this.vehicleIds); + this.vehticleInfo = vehicleInfo; + let driverInfo = []; + driver.forEach(item => { + self.forEach(s => { + if (item.id === s.driverId) { + b.push(s.driverId); + driverInfo.push(item); + } + if (s.isMaster === 2) { + this.driverForm.masterDriverName = s.driverName; + } + }); + }); + this.deliveryDriver = b; + this.driverList = b; + this.driverInfo = driverInfo; + } else { + let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO; + this.aaa = false; + this.bbb = true; + // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId; + this.waixieForm.tripartiteSource = "1"; + this.waixieForm.driverName = deliveryTripartiteVO.driverName ; + this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ; + this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ; + this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ; + } + }); } this.loading = false; },