From 3ef74462654b941013f19d72c129e87702f1646e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 4 Dec 2024 15:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8D=95=E5=BD=95=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/finance/WaybillAudit.js | 10 ++++ src/option/waybill/WaybillOrderList.js | 12 ++++- .../distribution/inventory/CreateOrder.vue | 49 ++++++++++-------- src/views/waybill/CreateZeroOrder.vue | 51 +++++++++++-------- src/views/waybill/WaybillOrderList.vue | 4 +- 5 files changed, 80 insertions(+), 46 deletions(-) diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js index 04315da1..b73dbb31 100644 --- a/src/option/finance/WaybillAudit.js +++ b/src/option/finance/WaybillAudit.js @@ -580,6 +580,16 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'completeDestination', + label: '到站全称', + type: 2, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'destinationWarehouseName', label: '目的仓', diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js index 6f8e99a9..ea7af6bf 100644 --- a/src/option/waybill/WaybillOrderList.js +++ b/src/option/waybill/WaybillOrderList.js @@ -60,7 +60,7 @@ export const columnList = [ label: '运单状态', type: 3, values: '', - width: '100', + width: '120', checkarr: [ { label: '未入库', value: '0' }, { label: '部分入库', value: '10' }, @@ -198,6 +198,16 @@ export const columnList = [ fixed: false, sortable: true, }, + { + prop: 'completeDestination', + label: '到站全称', + type: 2, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'goodsName', label: '货物名称', diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 3fdc870d..cde06239 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -3717,6 +3717,27 @@ const handleComputedPlanPrice = submitData => { } }; +const getTranslationArr = codeArr => { + const _nameArr = []; + let _item = {}; + + _nameArr[0] = details.regionOptione.find(val => val.value === codeArr[0]); + + _nameArr[1] = _nameArr[0].children.find(val => val.value === codeArr[1]); + + if (codeArr.length === 2) { + _item = _nameArr[1]; + } else { + _nameArr[2] = _nameArr[1].children.find(val => val.value === codeArr[2]); + _item = _nameArr[2]; + } + + return { + locationItem: _item, + nameArr: _nameArr, + }; +}; + /** 提交 */ const handleSubmit = (formEl: FormInstance | undefined) => { if (!formEl) return; @@ -3785,33 +3806,19 @@ const handleSubmit = (formEl: FormInstance | undefined) => { } // 筛选到站 - const _findeLocation = details.regionOptione - .find(val => val.value === destination[0]) - .children.find(val => val.value === destination[1]); + const { locationItem: _itemDestination, nameArr: dest_nameArr } = + getTranslationArr(destination); - let _item: any = {}; - if (destination.length === 2) { - _item = _findeLocation; - } else { - _item = _findeLocation.children.find(val => val.value === destination[2]); - } - submitData.destination = _item.label; - submitData.destinationCode = _item.value; + submitData.destination = _itemDestination.label; + submitData.destinationCode = _itemDestination.value; + submitData.completeDestination = dest_nameArr.map(val => val.label).join('/'); // 筛选发站 - const _findeDeparture = details.regionOptione - .find(val => val.value === departure[0]) - .children.find(val => val.value === departure[1]); - - let _itemDeparture: any = {}; - if (departure.length === 2) { - _itemDeparture = _findeDeparture; - } else { - _itemDeparture = _findeDeparture.children.find(val => val.value === departure[2]); - } + const { locationItem: _itemDeparture, nameArr: de_nameArr } = getTranslationArr(departure); submitData.departure = _itemDeparture.label; submitData.departureCode = _itemDeparture.value; + submitData.completeDeparture = de_nameArr.map(val => val.label).join('/'); console.log('submitData :>> ', submitData); diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index dc5ed6db..276c23ee 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -2884,6 +2884,27 @@ const handleComputedPlanPrice = submitData => { } }; +const getTranslationArr = codeArr => { + const _nameArr = []; + let _item = {}; + + _nameArr[0] = details.regionOptione.find(val => val.value === codeArr[0]); + + _nameArr[1] = _nameArr[0].children.find(val => val.value === codeArr[1]); + + if (codeArr.length === 2) { + _item = _nameArr[1]; + } else { + _nameArr[2] = _nameArr[1].children.find(val => val.value === codeArr[2]); + _item = _nameArr[2]; + } + + return { + locationItem: _item, + nameArr: _nameArr, + }; +}; + /** 提交 */ const handleSubmit = async (formEl: FormInstance | undefined) => { await nextTick(); @@ -2956,34 +2977,20 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { return ElMessage({ message: '请选择正确发站地址', type: 'warning' }); // 筛选到站 - const _findeLocation = details.regionOptione - .find(val => val.value === destination[0]) - .children.find(val => val.value === destination[1]); - - let _item: any = {}; - if (destination.length === 2) { - _item = _findeLocation; - } else { - _item = _findeLocation.children.find(val => val.value === destination[2]); - } + const { locationItem: _itemDestination, nameArr: dest_nameArr } = + getTranslationArr(destination); - submitData.destination = _item.label; - submitData.destinationCode = _item.value; + submitData.destination = _itemDestination.label; + submitData.destinationCode = _itemDestination.value; + submitData.completeDestination = dest_nameArr.map(val => val.label).join('/'); // 筛选发站 - const _findeDeparture = details.regionOptione - .find(val => val.value === departure[0]) - .children.find(val => val.value === departure[1]); - - let _itemDeparture: any = {}; - if (departure.length === 2) { - _itemDeparture = _findeDeparture; - } else { - _itemDeparture = _findeDeparture.children.find(val => val.value === departure[2]); - } + const { locationItem: _itemDeparture, nameArr: de_nameArr } = + getTranslationArr(departure); submitData.departure = _itemDeparture.label; submitData.departureCode = _itemDeparture.value; + submitData.completeDeparture = de_nameArr.map(val => val.label).join('/'); // let numFlag = false; diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index 5370a1b1..b587f465 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -190,7 +190,7 @@ background @size-change="sizeChange" @current-change="currentChange" - :current-page="page.currentPage" + :current-page="page.pageNum" :page-sizes="[30, 50, 80, 120]" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" @@ -572,7 +572,7 @@ const searchChange = () => { /** 清空表单 */ const searchReset = () => { details.query = {}; - details.page.currentPage = 1; + details.page.pageNum = 1; handleClearTableQuery(details.columnList); onLoad(details.page); };