From 9a8a91e77e6a56797e2fb0a59d8db7c3f4df2ecd Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 22 Jul 2024 14:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8C=85=E4=BB=B6=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=AD=BE=E6=94=B6=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storagecost/index.js | 53 +- src/option/storagecost/OrderTotalWarehouse.js | 54 +- .../storagecost/Monthlyorderwarehousing.vue | 84 +- .../cost/storagecost/OrderTotalWarehouse.vue | 723 +++++++++++------- .../cost/storagecost/WarehouseMonthly.vue | 12 +- .../distributionDeliveryListedt.vue | 6 +- .../inventory/distrilbutionBillLadingView.vue | 10 +- .../parcelList/distributionParcelList.vue | 26 +- .../warehousesignedorder/SignedDetails.vue | 28 +- .../distributionStockArticle.vue | 1 + 10 files changed, 637 insertions(+), 360 deletions(-) diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js index e6ec9306..43fc6f3b 100644 --- a/src/api/storagecost/index.js +++ b/src/api/storagecost/index.js @@ -19,20 +19,45 @@ export const $_getMyWarehouseList = params => { //月度仓储成本统计导出 export const $_expenseWarehouseMonth = params => { - return request({ - url: '/api/logpm-statisticsdata/expenseWarehouseMonth/export-expenseWarehouseMonth', - method: 'get', - params, - responseType: 'blob' - }); - }; + return request({ + url: '/api/logpm-statisticsdata/expenseWarehouseMonth/export-expenseWarehouseMonth', + method: 'get', + params, + responseType: 'blob', + }); +}; // 月度订单仓储成本明细列表 export const $_Monthlyorderwarehousing = params => { - return request({ - url: '/api/logpm-statisticsdata/expenseOrderWarehouseMonth/list', - method: 'get', - params, - }); - }; - \ No newline at end of file + return request({ + url: '/api/logpm-statisticsdata/expenseOrderWarehouseMonth/list', + method: 'get', + params, + }); +}; +//月度订单仓储成本明细导出 +export const $_expenseOrderWarehouseMonth = params => { + return request({ + url: '/api/logpm-statisticsdata/expenseOrderWarehouseMonth/export-expenseOrderWarehouseMonth', + method: 'get', + params, + responseType: 'blob', + }); +}; +// 订单总仓储成本明细列表 +export const $_OrderTotalWarehouse = params => { + return request({ + url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/list', + method: 'get', + params, + }); +}; +// 订单总仓储成本明细导出 +export const $_expenseOrderWarehouseTotal = params => { + return request({ + url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/export-expenseOrderWarehouseTotal', + method: 'get', + params, + responseType: 'blob', + }); +}; diff --git a/src/option/storagecost/OrderTotalWarehouse.js b/src/option/storagecost/OrderTotalWarehouse.js index 81db5648..22e7df47 100644 --- a/src/option/storagecost/OrderTotalWarehouse.js +++ b/src/option/storagecost/OrderTotalWarehouse.js @@ -15,7 +15,7 @@ export const columnList = [ fixed: true, }, { - prop: 'a1', + prop: 'warehouseName', label: '目的仓', type: 2, values: '', @@ -26,7 +26,7 @@ export const columnList = [ head: false, }, { - prop: 'a2', + prop: 'orderCode', label: '订单编号 ', type: 2, values: '', @@ -37,7 +37,7 @@ export const columnList = [ head: false, }, { - prop: 'a3', + prop: 'shipmentNumber', label: '运单编号', type: 1, values: '', @@ -48,7 +48,7 @@ export const columnList = [ head: false, }, { - prop: 'a4', + prop: 'receivingUnit', label: '收货单位', type: 1, values: '', @@ -59,7 +59,7 @@ export const columnList = [ head: false, }, { - prop: 'a5', + prop: 'shippingUnit', label: '发货单位', type: 1, values: '', @@ -70,7 +70,7 @@ export const columnList = [ head: false, }, { - prop: 'a6', + prop: 'shipmenttype', label: '运单类型', type: 3, values: '', @@ -90,7 +90,7 @@ export const columnList = [ head: false, }, { - prop: 'a7', + prop: 'servicetype', label: '服务类型', type: 1, values: '', @@ -101,7 +101,7 @@ export const columnList = [ head: false, }, { - prop: 'a8', + prop: 'totalQuantity', label: '总件数', type: 1, values: '', @@ -112,7 +112,7 @@ export const columnList = [ head: false, }, { - prop: 'a9', + prop: 'originWarehouse', label: '发站仓', type: 1, values: '', @@ -123,7 +123,7 @@ export const columnList = [ head: false, }, { - prop: 'a11', + prop: 'consignmentInQuantity', label: '代入库仓件数', type: 1, values: '', @@ -134,7 +134,7 @@ export const columnList = [ head: false, }, { - prop: 'a12', + prop: 'consignmentInTotalCost', label: '代入库总成本', type: 1, values: '', @@ -145,7 +145,7 @@ export const columnList = [ head: false, }, { - prop: 'a13', + prop: 'consignmentOutQuantity', label: '代出库仓件数', type: 1, values: '', @@ -156,7 +156,7 @@ export const columnList = [ head: false, }, { - prop: 'a14', + prop: 'consignmentOutTotalCost', label: '代出库总成本', type: 1, values: '', @@ -167,7 +167,7 @@ export const columnList = [ head: false, }, { - prop: 'a15', + prop: 'contractedOperaCost', label: '代作业总成本', type: 1, values: '', @@ -178,7 +178,7 @@ export const columnList = [ head: false, }, { - prop: 'a16', + prop: 'warehouseRentalCost', label: '仓租成本', type: 1, values: '', @@ -189,7 +189,7 @@ export const columnList = [ head: false, }, { - prop: 'a17', + prop: 'warehousingCost', label: '仓储总成本', type: 1, values: '', @@ -199,17 +199,17 @@ export const columnList = [ sortable: true, head: false, }, - { - prop: 'a17', - label: '结算时间', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + // { + // prop: 'a17', + // label: '结算时间', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, // { // prop: 'createUserName', diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue index db0612fb..661ec076 100644 --- a/src/views/cost/storagecost/Monthlyorderwarehousing.vue +++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue @@ -59,7 +59,7 @@
- 导出
@@ -127,7 +127,11 @@ diff --git a/src/views/cost/storagecost/OrderTotalWarehouse.vue b/src/views/cost/storagecost/OrderTotalWarehouse.vue index cbe60c1d..cc40e8ad 100644 --- a/src/views/cost/storagecost/OrderTotalWarehouse.vue +++ b/src/views/cost/storagecost/OrderTotalWarehouse.vue @@ -1,304 +1,457 @@ - - - // 页面初始化方法 - - - - \ No newline at end of file +} + diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue index 70d00abd..bd1f4e7a 100644 --- a/src/views/cost/storagecost/WarehouseMonthly.vue +++ b/src/views/cost/storagecost/WarehouseMonthly.vue @@ -46,7 +46,7 @@
搜 索 - 清 空 + 清 空 @@ -282,6 +282,7 @@ const searchChange = () => { queryTop.value.warehouseName = queryTop.value.warehouse.join(','); } else { delete queryTop.value.warehouseName; + delete details.query.warehouseName; } if (queryTop.value.costSettlementMonth) { if (!queryTop.value.costSettlementYear) { @@ -296,6 +297,15 @@ const searchChange = () => { delete details.query.warehouse; //删除多余字段 onLoad(); }; +// 清空 +const searchReset = () => { + details.query = {}; + queryTop.value = {}; + details.columnList.forEach(item => { + item.values = ''; + }); + onLoad(); +}; // 每页多少条 const sizeChange = val => { details.page.pageSize = val; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 3655d9aa..86969b8d 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -4755,9 +4755,9 @@ export default { }); return; } - let temp = {}; - temp = this.LessThantruckloadListData.every(item => item.signingStatusName == '待签收'); - console.log(temp, 'temp'); + let temp =false; + temp = this.selectionList.every(item => item.signingStatusName == '待签收'); + console.log(temp, '批量签收状态'); if (!temp) { ElMessage({ message: `签收状态要都满足条件为‘待签收’才可以批量签收`, diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index 0a084a67..c26c6cf4 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -1621,7 +1621,15 @@ export default { type: 'warning', }) .then(() => { - this.loading = true; + let orderStatusName= this.selectionList.every(obj => obj.orderStatusName === '已签收'); + if(orderStatusName){ + ElMessage({ + message: '该订单已签收', + type: 'warning', + }); + return + } + this.loading = true; let data = { id: this.$route.query.id, packageIds: this.selectionList.map(item => item.id).join(','), diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index ce481ee5..e51cac71 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -385,6 +385,17 @@ export default { sortable: false, head: false, }, + + { + prop: 'signingType', + label: '签收方式', + type: 1, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderPackageStockupStatusName', label: '备货状态', @@ -709,6 +720,7 @@ export default { }, onLoad: debounce(async function (page, params = {}) { this.loading = true; + this.loadingObj.pageLoading = true; try { if (Object.keys(this.query).length === 0) return (this.data = []); @@ -736,6 +748,7 @@ export default { console.log('error :>> ', error); } finally { this.loading = false; + this.loadingObj.pageLoading = false; } }, 10), }; @@ -878,11 +891,11 @@ export default { showdrawer(value) { this.drawerShow = value; }, - init() { + async init() { this.height = this.setPx(document.body.clientHeight - 340); // 包件状态 - getDictionaryBiz('order_package_status').then(res => { + await getDictionaryBiz('order_package_status').then(res => { this.distributionType = res.data.data; this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr = res.data.data.map(item => { @@ -893,7 +906,7 @@ export default { }); // 装车状态 - getDictionaryBiz('order_package_loading_status').then(res => { +await getDictionaryBiz('order_package_loading_status').then(res => { this.distributionType = res.data.data; this.$functions.checkcColumnList( 'orderPackageLoadingStatusName', @@ -906,7 +919,7 @@ export default { }); // 备货状态 orderPackageStockupStatusName - getDictionaryBiz('order_package_stockup_status').then(res => { + await getDictionaryBiz('order_package_stockup_status').then(res => { this.distributionType = res.data.data; this.$functions.checkcColumnList( 'orderPackageStockupStatusName', @@ -919,7 +932,7 @@ export default { }); // 入库状态 - getDictionaryBiz('order_package_status').then(res => { +await getDictionaryBiz('order_package_status').then(res => { this.distributionType = res.data.data; this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr = res.data.data.map(item => { @@ -930,7 +943,7 @@ export default { }); // 预约状态 - getDictionaryBiz('order_package_reservation_status').then(res => { + await getDictionaryBiz('order_package_reservation_status').then(res => { this.distributionType = res.data.data; this.$functions.checkcColumnList( 'orderPackageReservationStatusName', @@ -941,6 +954,7 @@ export default { return item; }); }); + this.loadingObj.pageLoading = false; }, searchHide() { this.search = !this.search; diff --git a/src/views/warehouse/warehousesignedorder/SignedDetails.vue b/src/views/warehouse/warehousesignedorder/SignedDetails.vue index ecf06e42..f3c8ef9b 100644 --- a/src/views/warehouse/warehousesignedorder/SignedDetails.vue +++ b/src/views/warehouse/warehousesignedorder/SignedDetails.vue @@ -294,15 +294,25 @@ signforListDetail(); // 预约单号点击跳转 const reservationCodeClick = row => { console.log(row); - $router.push({ - path: '/distribution/signfor/distributionSignforedt', - query: { - id: row.signforId, - reservationId: row.reservationId, - name: `${row.reservationCode}待签收查看`, - isZero: 0, - }, - }); + if ($route.query.typeServiceName === '自提') { + $router.push({ + path: '/distribution/inventory/distrilbutionBillLadingView', + query: { + id: row.signforId, + name: `查看提货详情`, + }, + }); + } else { + $router.push({ + path: '/distribution/signfor/distributionSignforedt', + query: { + id: row.signforId, + reservationId: row.reservationId, + name: `${row.reservationCode}待签收查看`, + isZero: 0, + }, + }); + } }; diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue index 9b7ede8b..83fed4d9 100644 --- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue +++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue @@ -512,6 +512,7 @@ const view = value => { path: '/warehouse/warehousesignedorder/SignedDetails', query: { id: value.row.id, + typeServiceName:value.row.typeServiceName, }, }); };