From 83095ff90c411dd8dbd4b5677d905e0a95e6b52e Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 11 Mar 2025 17:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8=E8=AF=A6?=
=?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SalesDepartmentIncomeReport.js | 9 +
.../PackageAllTrunklineTimePageReport.js | 29 +-
.../reportforms/PackageStartTimePageReport.js | 343 ++++++++++++++++++
.../UpdateWaybillQualityPageReport.js | 77 ++--
src/router/views/index.js | 20 +-
.../PackageStartTimePageReportDetails.vue | 2 +-
.../PackageTransferTimePageReportDetails.vue | 2 +-
.../SalesDepartmentIncomeReport.vue | 53 +++
8 files changed, 484 insertions(+), 51 deletions(-)
diff --git a/src/api/reportforms/SalesDepartmentIncomeReport.js b/src/api/reportforms/SalesDepartmentIncomeReport.js
index 0ab48a91..78809da5 100644
--- a/src/api/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/api/reportforms/SalesDepartmentIncomeReport.js
@@ -45,3 +45,12 @@ export const postIncomingDetailExport = data => {
responseType: 'blob',
});
};
+
+/** 详情导出 */
+export const postDeptIncomingPageNew = data => {
+ return request({
+ url: '/api/logpm-report/reportIncoming/deptIncomingPageNew',
+ method: 'post',
+ data,
+ });
+};
diff --git a/src/option/reportforms/PackageAllTrunklineTimePageReport.js b/src/option/reportforms/PackageAllTrunklineTimePageReport.js
index 3bb1eb07..3b349e5b 100644
--- a/src/option/reportforms/PackageAllTrunklineTimePageReport.js
+++ b/src/option/reportforms/PackageAllTrunklineTimePageReport.js
@@ -385,10 +385,21 @@ export const columnListDetails = [
width: 55,
fixed: true,
},
+ {
+ prop: 'waybillNo',
+ label: '运单号',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'orderCode',
label: '订单号',
- type: 1,
+ type: 2,
values: '',
width: '180',
checkarr: [],
@@ -410,7 +421,7 @@ export const columnListDetails = [
{
prop: 'departureWarehouseName',
label: '始发仓',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -421,7 +432,7 @@ export const columnListDetails = [
{
prop: 'destinationWarehouseName',
label: '目的仓',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -432,7 +443,7 @@ export const columnListDetails = [
{
prop: 'trainNumber',
label: '客户车次号',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -514,7 +525,7 @@ export const columnListDetails = [
{
prop: 'orderPackageCode',
label: '包条码',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -537,7 +548,7 @@ export const columnListDetails = [
{
prop: 'serviceNum',
label: '服务号',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -572,7 +583,7 @@ export const columnListDetails = [
{
prop: 'weight',
label: '重量',
- type: 6,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -629,7 +640,7 @@ export const columnListDetails = [
{
prop: 'isDesIncomingName',
label: '是否目的仓入库',
- type: 1,
+ type: 3,
values: '',
width: '150',
checkarr: [
@@ -678,7 +689,7 @@ export const columnListDetails = [
{
prop: 'isOverTimeName',
label: '是否超时',
- type: 1,
+ type: 3,
values: '',
width: '150',
checkarr: [
diff --git a/src/option/reportforms/PackageStartTimePageReport.js b/src/option/reportforms/PackageStartTimePageReport.js
index 61e10182..987a3328 100644
--- a/src/option/reportforms/PackageStartTimePageReport.js
+++ b/src/option/reportforms/PackageStartTimePageReport.js
@@ -164,3 +164,346 @@ export const columnList = [
head: false,
},
];
+
+export const columnListDetails = [
+ {
+ prop: '',
+ label: '复选框',
+ type: 0,
+ width: 55,
+ fixed: true,
+ },
+ {
+ prop: '',
+ label: '序号',
+ type: 12,
+ values: '',
+ width: 55,
+ fixed: true,
+ },
+ {
+ prop: 'waybillNo',
+ label: '运单号',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'orderCode',
+ label: '订单号',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'nowWarehouseName',
+ label: '当前所在仓',
+ type: 2,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'departureWarehouseName',
+ label: '始发仓',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'destinationWarehouseName',
+ label: '目的仓',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'trainNumber',
+ label: '客户车次号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'isGcpName',
+ label: '干仓配',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [
+ { label: '否', value: 0 },
+ { label: '是', value: 1 },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'firstPackName',
+ label: '一级品类',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'secondPackName',
+ label: '二级品类',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'thirdPackName',
+ label: '三级品类',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'materialCode',
+ label: '物料编码',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'materialName',
+ label: '物料名称',
+ type: 1,
+ values: '',
+ width: '160',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'orderPackageCode',
+ label: '包条码',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'systemType',
+ label: '订单来源',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'serviceNum',
+ label: '服务号',
+ type: 2,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'senderNum',
+ label: '发货数量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'volume',
+ label: '体积',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'weight',
+ label: '重量',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'deliveryDate',
+ label: '基地发货日期',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'warehouseName',
+ label: '导入仓库',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'incomgingTime',
+ label: '入库时间',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'isStartingName',
+ label: '是否发运',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ { label: '否', value: 0 },
+ { label: '是', value: 1 },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'startTime',
+ label: '发运时间',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'startHours',
+ label: '实际发运时效',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'hoursTime',
+ label: '标准发运时效',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'createUserName',
+ label: '订单创建人',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+ {
+ prop: 'createTime',
+ label: '订单创建时间',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'isOverTimeName',
+ label: '是否超时',
+ type: 3,
+ values: '',
+ width: '150',
+ checkarr: [
+ { label: '否', value: 0 },
+ { label: '是', value: 1 },
+ ],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: false, //开启统计
+ },
+];
diff --git a/src/option/reportforms/UpdateWaybillQualityPageReport.js b/src/option/reportforms/UpdateWaybillQualityPageReport.js
index 79f0376a..3921c3f7 100644
--- a/src/option/reportforms/UpdateWaybillQualityPageReport.js
+++ b/src/option/reportforms/UpdateWaybillQualityPageReport.js
@@ -252,7 +252,7 @@ export const columnListDetails = [
head: false,
},
{
- prop: 'openWarehouseName',
+ prop: 'departureWarehouseName',
label: '开单网点',
type: 1,
values: '',
@@ -262,24 +262,23 @@ export const columnListDetails = [
sortable: true,
},
{
- prop: 'checkStatusName',
+ prop: 'waybillStatusName',
label: '状态',
type: 1,
values: '',
width: '130',
checkarr: [
- {
- label: '待审核',
- value: '0',
- },
- {
- label: '已通过',
- value: '1',
- },
- {
- label: '未通过',
- value: '2',
- },
+ { label: '未入库', value: '0' },
+ { label: '部分入库', value: '10' },
+ { label: '入库', value: '20' },
+ { label: '部分中转', value: '30' },
+ { label: '中转', value: '40' },
+ { label: '目的仓部分到达', value: '50' },
+ { label: '目的仓到达', value: '60' },
+ { label: '配送部分装车', value: '70' },
+ { label: '配送装车', value: '80' },
+ { label: '部分签收', value: '90' },
+ { label: '已签收', value: '100' },
],
fixed: false,
sortable: true,
@@ -303,26 +302,26 @@ export const columnListDetails = [
fixed: false,
sortable: true,
},
- {
- prop: 'agent',
- label: '制单员',
- type: 1,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- prop: 'openTime',
- label: '开单时间',
- type: 1,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // prop: 'agent',
+ // label: '制单员',
+ // type: 1,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // prop: 'openTime',
+ // label: '开单时间',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'applyTime',
label: '申请时间',
@@ -334,7 +333,7 @@ export const columnListDetails = [
sortable: true,
},
{
- prop: 'applyWarehouseName',
+ prop: 'warehouseName',
label: '申请网点',
type: 1,
values: '',
@@ -344,7 +343,7 @@ export const columnListDetails = [
sortable: true,
},
{
- prop: 'createUserName',
+ prop: 'agent',
label: '申请人',
type: 1,
values: '',
@@ -354,7 +353,7 @@ export const columnListDetails = [
sortable: true,
},
{
- prop: 'refer',
+ prop: 'updateReson',
label: '修改原因',
type: 1,
values: '',
@@ -364,7 +363,7 @@ export const columnListDetails = [
sortable: true,
},
{
- prop: 'operationRemark',
+ prop: 'updateContent',
label: '修改内容',
type: 1,
values: '',
@@ -384,7 +383,7 @@ export const columnListDetails = [
// sortable: true,
// },
{
- prop: 'checkTime',
+ prop: 'checkUpdateTime',
label: '审核时间',
type: 1,
values: '',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index ebcd3699..cae917c3 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1965,9 +1965,27 @@ export default [
keepAlive: true,
},
path: '/reportforms/PackageAllTrunklineTimePageReportDetails',
- name: '干线发运明细',
+ name: '干线时效明细',
component: () => import('@/views/reportforms/PackageAllTrunklineTimePageReportDetails.vue'),
},
+ {
+ meta: {
+ i18n: 'dict',
+ keepAlive: true,
+ },
+ path: '/reportforms/PackageStartTimePageReportDetails',
+ name: '干线发运明细',
+ component: () => import('@/views/reportforms/PackageStartTimePageReportDetails.vue'),
+ },
+ {
+ meta: {
+ i18n: 'dict',
+ keepAlive: true,
+ },
+ path: '/reportforms/PackageTransferTimePageReportDetails',
+ name: '干线中转明细',
+ component: () => import('@/views/reportforms/PackageTransferTimePageReportDetails.vue'),
+ },
{
meta: {
i18n: 'dict',
diff --git a/src/views/reportforms/PackageStartTimePageReportDetails.vue b/src/views/reportforms/PackageStartTimePageReportDetails.vue
index 44a4de07..936df337 100644
--- a/src/views/reportforms/PackageStartTimePageReportDetails.vue
+++ b/src/views/reportforms/PackageStartTimePageReportDetails.vue
@@ -113,7 +113,7 @@ import {
} from '@/utils/util';
import { useRoute, useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { columnListDetails } from '@/option/reportforms/PackageAllTrunklineTimePageReport';
+import { columnListDetails } from '@/option/reportforms/PackageStartTimePageReport';
// 获取路由实例
const $router = useRouter();
diff --git a/src/views/reportforms/PackageTransferTimePageReportDetails.vue b/src/views/reportforms/PackageTransferTimePageReportDetails.vue
index 7823e349..e5c53a5c 100644
--- a/src/views/reportforms/PackageTransferTimePageReportDetails.vue
+++ b/src/views/reportforms/PackageTransferTimePageReportDetails.vue
@@ -113,7 +113,7 @@ import {
} from '@/utils/util';
import { useRoute, useRouter } from 'vue-router';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { columnListDetails } from '@/option/reportforms/PackageAllTrunklineTimePageReport';
+import { columnListDetails } from '@/option/reportforms/PackageStartTimePageReport';
// 获取路由实例
const $router = useRouter();
diff --git a/src/views/reportforms/SalesDepartmentIncomeReport.vue b/src/views/reportforms/SalesDepartmentIncomeReport.vue
index 92b8fea4..c4358815 100644
--- a/src/views/reportforms/SalesDepartmentIncomeReport.vue
+++ b/src/views/reportforms/SalesDepartmentIncomeReport.vue
@@ -143,6 +143,7 @@
导出
+
@@ -214,6 +215,7 @@ import {
postDeptIncomingPage,
postFindbusinessLine,
postDeptIncomingExport,
+ postDeptIncomingPageNew,
} from '@/api/reportforms/SalesDepartmentIncomeReport';
import {
setNodeHeight,
@@ -551,6 +553,57 @@ const ExportData = async () => {
}
};
+const handleClick = async () => {
+ try {
+ details.loadingObj.list = true;
+
+ const submitData = { ...details.page, ...details.query };
+
+ for (const key in submitData) {
+ const element = submitData[key];
+
+ if (!element && element !== 0) delete submitData[key];
+ }
+
+ // 月
+ if (submitData.month) {
+ const _arr = submitData.month.split('-');
+ submitData.year = _arr[0];
+ submitData.month = _arr[1];
+ }
+
+ // 时间周期
+ else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+ submitData.startTimeStr = submitData.timeArr[0];
+ submitData.endTimeStr = submitData.timeArr[1];
+ }
+
+ if (
+ (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
+ !submitData.year &&
+ !submitData.month
+ ) {
+ details.data = [];
+ return ElMessage.warning('请选择时间');
+ }
+
+ delete submitData.timeArr;
+ delete submitData.total;
+
+ const res = await postDeptIncomingPageNew(submitData);
+ const { code, data } = res.data;
+ if (code !== 200) return;
+ details.data = getObjType(data.records) === 'array' ? data.records : [];
+ details.page.total = data.total;
+
+ handleTranslationDataSeclect(details.data, details.columnList);
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ details.loadingObj.list = false;
+ }
+};
+
/** 跳转详情 */
const handleJumpDetail = (row, column) => {
const query = {