diff --git a/src/api/storagecost/index.js b/src/api/storagecost/index.js
index 222d7820..e7324d98 100644
--- a/src/api/storagecost/index.js
+++ b/src/api/storagecost/index.js
@@ -92,7 +92,7 @@ export const $_WarehouseDeliveryCost = params => {
// 配送-仓库月度配送成本表-导出
export const $_expenseDispatchWarehouseMonth = params => {
return request({
- url: '/api/logpm-statisticsdata/expenseDispatchWarehouseMonth/export-expenseDispatchWarehouseMonth',
+ url: '/api/logpm-statisticsdata/expenseDispatchWarehouseMonth/export',
method: 'get',
params,
responseType: 'blob',
@@ -111,7 +111,7 @@ export const $_OrderTotalCostDetail = params => {
// 配送-订单总成本明细表-导出
export const $_expenseDispatchOrderDetail = params => {
return request({
- url: '/api/logpm-statisticsdata/expenseDispatchOrderDetail/export-expenseDispatchOrderDetail',
+ url: '/api/logpm-statisticsdata/expenseDispatchOrderDetail/export',
method: 'get',
params,
responseType: 'blob',
@@ -170,7 +170,7 @@ export const $_Traincostbreakdownsubmitpage = params => {
// 配送-车次成本明细-导出
export const $_expenseDispatchTrainDetail = params => {
return request({
- url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/export-expenseDispatchTrainDetail',
+ url: '/api/logpm-statisticsdata/expenseDispatchTrainDetail/export',
method: 'get',
params,
responseType: 'blob',
diff --git a/src/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue b/src/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue
index aaf4f748..4f00c43f 100644
--- a/src/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue
+++ b/src/components/ArteryPrintTemplateV2/ArteryPrintTemplateV2.vue
@@ -84,15 +84,6 @@
卸车件数 |
异常备注 |
-
-
- {{ item }}
- |
-
@@ -280,6 +271,18 @@ const InitData = () => {
break;
}
+ if (!_flag) {
+ for (let j = _orderList.length - 1; j >= 0; j--) {
+ const item = _orderList[j];
+ console.log('j :>> ', j);
+
+ if (item.consignee !== val.consignee) continue;
+ _orderList.splice(j, 0, val);
+ _flag = true;
+ break;
+ }
+ }
+
!_flag && _orderList.push(val);
}
diff --git a/src/option/storagecost/OrderTotalCostDetail.js b/src/option/storagecost/OrderTotalCostDetail.js
index 5c20ef2e..7c9edbf0 100644
--- a/src/option/storagecost/OrderTotalCostDetail.js
+++ b/src/option/storagecost/OrderTotalCostDetail.js
@@ -17,7 +17,7 @@ export const columnList = [
{
prop: 'brand',
label: '品牌',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -61,7 +61,7 @@ export const columnList = [
{
prop: 'shippingOrg',
label: '发货单位',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -72,7 +72,7 @@ export const columnList = [
{
prop: 'consigneeOrg',
label: '收货单位',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -83,7 +83,7 @@ export const columnList = [
{
prop: 'waybillType',
label: '运单类型',
- type: 3,
+ type: 1,
values: '',
width: '150',
checkarr: [
@@ -100,31 +100,53 @@ export const columnList = [
sortable: true,
head: false,
},
+ // {
+ // prop: 'documentCreationTime',
+ // label: '开单时间',
+ // type: 4,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
+ // {
+ // prop: 'goodsCategories ',
+ // label: '货物品类',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
+ // {
+ // prop: 'categoryPieceCount',
+ // label: '品类件数',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
+ // {
+ // prop: 'categoryCount',
+ // label: '品类数',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
{
- prop: 'documentCreationTime',
- label: '开单时间',
- type: 4,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'goodsCategories ',
- label: '货物品类',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'categoryPieceCount',
- label: '品类件数',
+ prop: 'totalQuantity',
+ label: '总件数',
type: 1,
values: '',
width: '150',
@@ -132,10 +154,11 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
- prop: 'categoryCount',
- label: '品类数',
+ prop: 'reviewNumber',
+ label: '复核件数',
type: 1,
values: '',
width: '150',
@@ -143,10 +166,11 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
- prop: 'totalQuantity',
- label: '总件数',
+ prop: 'settlementNumber',
+ label: '结算件数',
type: 1,
values: '',
width: '150',
@@ -154,6 +178,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'totalWeight',
@@ -165,6 +190,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'totalVolume',
@@ -176,6 +202,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'totalDistributionCost',
@@ -187,6 +214,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'distributionCost',
@@ -198,6 +226,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'inventoryDistributionCost',
@@ -209,6 +238,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'stairCarryingFee',
@@ -220,6 +250,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'goodsAllocationCost',
@@ -231,6 +262,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'repositioningCost',
@@ -242,6 +274,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'handlingCost',
@@ -253,6 +286,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'mileageCost',
@@ -264,6 +298,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'subsidizedKilometerCost',
@@ -275,6 +310,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'excessZoneMileageCost',
@@ -286,6 +322,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'locationSubsidyCost',
@@ -297,6 +334,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'minimumGuaranteeCost',
@@ -308,6 +346,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'fuelCost',
@@ -319,6 +358,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'otherCosts',
@@ -330,6 +370,19 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
+ },
+ {
+ prop: 'changeAmount',
+ label: '异动金额',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ isshowSummary: true,
},
{
prop: 'deliveryKilometers',
@@ -341,6 +394,7 @@ export const columnList = [
fixed: false,
sortable: true,
head: false,
+ isshowSummary: true,
},
{
prop: 'shipper',
@@ -356,7 +410,7 @@ export const columnList = [
{
prop: 'shippingPhone',
label: '发货人手机号',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -367,7 +421,7 @@ export const columnList = [
{
prop: 'shippingAddress',
label: '发货地址',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -378,7 +432,7 @@ export const columnList = [
{
prop: 'arrivalStation',
label: '到站',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -389,7 +443,7 @@ export const columnList = [
{
prop: 'departureWarehouse',
label: '发站仓',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -400,7 +454,7 @@ export const columnList = [
{
prop: 'consignee',
label: '收货人',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -411,7 +465,7 @@ export const columnList = [
{
prop: 'consigneePhone',
label: '收货人手机号',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -422,7 +476,7 @@ export const columnList = [
{
prop: 'consigneeAddress',
label: '收货地址',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -433,7 +487,7 @@ export const columnList = [
{
prop: 'customerTrip',
label: '客户车次',
- type: 2,
+ type: 1,
values: '',
width: '150',
checkarr: [],
diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js
index c66f57cf..aff0d3cc 100644
--- a/src/option/storagecost/Traincostbreakdown.js
+++ b/src/option/storagecost/Traincostbreakdown.js
@@ -17,7 +17,7 @@ export const columnList = [
{
prop: 'deliveryVehicle',
label: '配送车辆',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -28,7 +28,7 @@ export const columnList = [
{
prop: 'distributionModel',
label: '配送车型',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -39,7 +39,7 @@ export const columnList = [
{
prop: 'trainNumber',
label: '车次号',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -50,10 +50,19 @@ export const columnList = [
{
prop: 'settlementStatus',
label: '结算状态',
- type: 1,
+ type: 3,
values: '',
width: '150',
- checkarr: [],
+ checkarr: [
+ {
+ label: '已结算',
+ value: '已结算',
+ },
+ {
+ label: '未结算',
+ value: '未结算',
+ },
+ ],
fixed: false,
sortable: true,
head: false,
@@ -72,7 +81,7 @@ export const columnList = [
{
prop: 'destinationWarehouse',
label: '目的仓',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
diff --git a/src/option/storagecost/WarehouseDeliveryCost.js b/src/option/storagecost/WarehouseDeliveryCost.js
index b1e65801..5c7da1b2 100644
--- a/src/option/storagecost/WarehouseDeliveryCost.js
+++ b/src/option/storagecost/WarehouseDeliveryCost.js
@@ -26,9 +26,9 @@ export const columnList = [
head: false,
},
{
- prop: 'costSettlementTime',
+ prop: 'settlementTime',
label: '成本结算时间',
- type: 4,
+ type: 6,
values: '',
width: '150',
checkarr: [],
@@ -47,28 +47,28 @@ export const columnList = [
sortable: true,
head: false,
},
- {
- prop: 'distributionPlanQuantity',
- label: '计划总数',
- type: 1,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
- {
- prop: 'totalOrderQuantity',
- label: '订单总数',
- type: 1,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- head: false,
- },
+ // {
+ // prop: 'distributionPlanQuantity',
+ // label: '计划总数',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
+ // {
+ // prop: 'totalOrderQuantity',
+ // label: '订单总数',
+ // type: 1,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: false,
+ // },
{
prop: 'plannedTotalQuantity',
label: '计划总件数',
@@ -267,6 +267,28 @@ export const columnList = [
sortable: true,
head: false,
},
+ {
+ prop: 'changeAmount',
+ label: '异动金额',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
+ {
+ prop: 'settlementAmount',
+ label: '结算金额',
+ type: 1,
+ values: '',
+ width: '150',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'createUserName',
label: '操作',
diff --git a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
index ce71748d..61b2ce30 100644
--- a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
+++ b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
@@ -6,7 +6,7 @@
-
+
搜 索
@@ -37,7 +37,10 @@
@@ -109,8 +112,7 @@ import {
$_expenseDispatchOrderDetail,
} from '@/api/storagecost/index.js';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty, setNodeHeight } from '@/utils/util';
-import functions from '@/utils/functions.js';
+import { processRowProperty, setNodeHeight,processRowPropertyName } from '@/utils/util';
import { ElMessageBox, ElMessage } from 'element-plus';
import { downloadXls ,handleClearTableQuery} from '@/utils/util';
import { useStore } from 'vuex';
@@ -220,8 +222,8 @@ const showdrawer = _flag => {
/** 表格表头输入框搜索 */
const inputsc = (index, row) => {
details.query[row.prop] = index;
- processRowProperty(index, row, details);
- test(details.query);
+ processRowPropertyName(index, row, details.query);
+ onLoad()
};
// 实例函数
const test = val => {};
@@ -243,7 +245,7 @@ const btnsc = val => {
};
/** 表格表头下拉框选择 */
const selectsc = (index, row) => {
- processRowProperty(index, row, details);
+ processRowPropertyName(index, row, details.query);
};
/** 表格表头复选框选择 */
const selectionChange = list => {
@@ -252,6 +254,7 @@ const selectionChange = list => {
};
// 网页顶部搜索按钮
const searchChange = () => {
+
onLoad(queryTop.value);
};
// 清空
@@ -378,7 +381,8 @@ const exportExcel = () => {
.el-fr-d {
width: 100%;
display: flex;
- justify-content: space-between;
+ // justify-content: space-between;
+ justify-content: flex-end;
:deep(.el-btn) {
margin-right: 0;
width: 15%;
diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
index badc0b6f..9e6cab51 100644
--- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
+++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
@@ -5,9 +5,23 @@
-
+
+
+
+
+
搜 索
清 空
@@ -19,9 +33,9 @@