Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/distribution/distributionStockArticle.js

@@ -56,7 +56,7 @@ export const stockArticExport = row => {
  */
 export const getClientList = (current, size, params) => {
   return request({
-    url: '/api/logpm-distribution/distributionStockArticle/clientList',
+    url: '/api/logpm-distribution/maill/clientList',
     method: 'get',
     params: {
       ...params,
@@ -65,6 +65,15 @@ export const getClientList = (current, size, params) => {
     },
   });
 };
+// 导出
+export const $_exportmaillOrder = (params) => {
+  return request({
+    url: '/api/logpm-distribution/maill/export-maillOrder',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
 
 export const getListOne = (current, size, params) => {
   //查询订单数据

src/api/storagecost/index.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 // 月度仓储成本统计表接口
 export const $_Getlist = params => {
   return request({
-    url: '/api/logpm-statisticsdata/expenseWarehouseMonth/list',
+    url: '/api/logpm-statisticsdata/expenseWarehouseMonth/page',
     method: 'get',
     params,
   });
@@ -30,7 +30,7 @@ export const $_expenseWarehouseMonth = params => {
 // 月度订单仓储成本明细列表
 export const $_Monthlyorderwarehousing = params => {
   return request({
-    url: '/api/logpm-statisticsdata/expenseOrderWarehouseMonth/list',
+    url: '/api/logpm-statisticsdata/expenseOrderWarehouseMonth/page',
     method: 'get',
     params,
   });
@@ -47,7 +47,7 @@ export const $_expenseOrderWarehouseMonth = params => {
 // 订单总仓储成本明细列表
 export const $_OrderTotalWarehouse = params => {
   return request({
-    url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/list',
+    url: '/api/logpm-statisticsdata/expenseOrderWarehouseTotal/page',
     method: 'get',
     params,
   });
@@ -61,3 +61,49 @@ export const $_expenseOrderWarehouseTotal = params => {
     responseType: 'blob',
   });
 };
+
+// 配送-仓库月度配送成本表
+export const $_WarehouseDeliveryCost = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchWarehouseMonth/page',
+    method: 'get',
+    params,
+  });
+};
+// 配送-仓库月度配送成本表-导出
+export const $_expenseDispatchWarehouseMonth = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchWarehouseMonth/export-expenseDispatchWarehouseMonth',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
+
+// 配送-订单总成本明细表
+export const $_OrderTotalCostDetail = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchOrderDetail/page',
+    method: 'get',
+    params,
+  });
+};
+
+// 配送-订单总成本明细表-导出
+export const $_expenseDispatchOrderDetail= params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchOrderDetail/export-expenseDispatchOrderDetail',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
+
+// 配送-财务审单
+export const $_Financialreview = params => {
+  return request({
+    url: '/api/logpm-statisticsdata/expenseDispatchFinancialReview/page',
+    method: 'get',
+    params,
+  });
+};

src/option/storagecost/Financialreview.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'a1',
+    prop: 'bookingReferenceNumber',
     label: '预约计划编号',
     type: 2,
     values: '',
@@ -26,7 +26,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a2',
+    prop: 'trainNumber',
     label: '车次号',
     type: 1,
     values: '',
@@ -37,7 +37,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a3',
+    prop: 'deliveryDate',
     label: '配送日期',
     type: 1,
     values: '',
@@ -48,7 +48,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a4',
+    prop: 'destinationWarehouse',
     label: '目的仓',
     type: 3,
     values: '',
@@ -59,7 +59,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a5',
+    prop: 'customerName',
     label: '客户名称',
     type: 1,
     values: '',
@@ -70,7 +70,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'orderCode',
     label: '订单自编号',
     type: 1,
     values: '',
@@ -81,7 +81,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'distributionType',
     label: '配送类型',
     type: 1,
     values: '',
@@ -101,7 +101,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'financialAuditStatus',
     label: '财务审核状态',
     type: 1,
     values: '',
@@ -112,7 +112,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'deliveryVehicle',
     label: '配送车辆',
     type: 1,
     values: '',
@@ -123,7 +123,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'distributionModel',
     label: '配送车型',
     type: 1,
     values: '',
@@ -134,7 +134,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'carrierName',
     label: '承运方名称',
     type: 1,
     values: '',
@@ -145,7 +145,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'carrierType',
     label: '承运方类型',
     type: 1,
     values: '',
@@ -156,7 +156,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'deliveryDriver',
     label: '配送司机',
     type: 1,
     values: '',
@@ -167,7 +167,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'plannedTotalQuantity',
     label: '计划总件数',
     type: 1,
     values: '',
@@ -178,7 +178,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'totalOrderQuantity',
     label: '订单总数',
     type: 1,
     values: '',
@@ -189,7 +189,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'inventoryItemCount',
     label: '库存品件数',
     type: 1,
     values: '',
@@ -200,7 +200,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'totalLoadedPieces',
     label: '装车总件数',
     type: 1,
     values: '',
@@ -211,7 +211,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'totalReceiptCost',
     label: '签收总件数',
     type: 1,
     values: '',
@@ -222,7 +222,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'totalDistributionCost',
     label: '配送总成本',
     type: 1,
     values: '',
@@ -233,7 +233,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'distributionCost',
     label: '配送成本',
     type: 1,
     values: '',
@@ -244,7 +244,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'inventoryDistributionCost',
     label: '库存品配送成本',
     type: 1,
     values: '',
@@ -255,7 +255,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'tagRemovalCost',
     label: '撕标签成本',
     type: 1,
     values: '',
@@ -266,7 +266,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'stairCarryingFee',
     label: '上楼费成本',
     type: 1,
     values: '',
@@ -277,7 +277,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'goodsAllocationCost	',
     label: '分货费成本',
     type: 1,
     values: '',
@@ -288,7 +288,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'repositioningCost',
     label: '平移费成本',
     type: 1,
     values: '',
@@ -299,7 +299,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'handlingCost',
     label: '装卸费成本',
     type: 1,
     values: '',
@@ -310,7 +310,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'mileageCost',
     label: '公里数成本',
     type: 1,
     values: '',
@@ -321,7 +321,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'subsidizedKilometerCost',
     label: '补贴公里数成本',
     type: 1,
     values: '',
@@ -332,7 +332,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'excessZoneMileageCost',
     label: '超区公里费成本',
     type: 1,
     values: '',
@@ -343,7 +343,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'locationSubsidyCost',
     label: '点位补贴费成本',
     type: 1,
     values: '',
@@ -354,7 +354,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'minimumGuaranteeCost',
     label: '保底费成本',
     type: 1,
     values: '',
@@ -365,7 +365,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'fuelCost',
     label: '油费成本',
     type: 1,
     values: '',
@@ -376,7 +376,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'otherCosts	',
     label: '其他成本',
     type: 1,
     values: '',
@@ -387,7 +387,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'remarks',
     label: '备注',
     type: 1,
     values: '',
@@ -398,7 +398,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'financialAuditTime',
     label: '财务审核时间',
     type: 1,
     values: '',
@@ -409,7 +409,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'financialAuditor',
     label: '财务审核人',
     type: 1,
     values: '',

src/option/storagecost/OrderTotalCostDetail.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-      prop: 'a1',
+    prop: 'brand',
     label: '品牌',
     type: 2,
     values: '',
@@ -26,7 +26,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a2',
+    prop: 'orderCode',
     label: '订单编号',
     type: 2,
     values: '',
@@ -37,9 +37,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a3',
+    prop: 'waybillNumber',
     label: '运单号',
-      type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -48,9 +48,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a4',
+    prop: 'destinationWarehouse',
     label: '目的仓',
-      type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -59,9 +59,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a5',
+    prop: 'shippingOrg',
     label: '发货单位',
-      type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -70,9 +70,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a6',
+    prop: 'consigneeOrg',
     label: '收货单位',
-      type: 3,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -81,9 +81,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a7',
+    prop: 'waybillType',
     label: '运单类型',
-      type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [
@@ -101,9 +101,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a8',
+    prop: 'documentCreationTime',
     label: '开单时间',
-      type: 1,
+    type: 4,
     values: '',
     width: '150',
     checkarr: [],
@@ -112,9 +112,9 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a9',
+    prop: 'goodsCategories	',
     label: '货物品类',
-      type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -123,7 +123,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a11',
+    prop: 'categoryPieceCount',
     label: '品类件数',
     type: 1,
     values: '',
@@ -134,7 +134,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a12',
+    prop: 'categoryCount',
     label: '品类数',
     type: 1,
     values: '',
@@ -145,7 +145,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a13',
+    prop: 'totalQuantity',
     label: '总件数',
     type: 1,
     values: '',
@@ -156,7 +156,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a14',
+    prop: 'totalWeight',
     label: '总重量',
     type: 1,
     values: '',
@@ -167,7 +167,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a15',
+    prop: 'totalVolume',
     label: '总体积',
     type: 1,
     values: '',
@@ -178,7 +178,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a16',
+    prop: 'totalDistributionCost',
     label: '配送总成本',
     type: 1,
     values: '',
@@ -189,7 +189,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a17',
+    prop: 'distributionCost',
     label: '配送成本',
     type: 1,
     values: '',
@@ -200,7 +200,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a17',
+    prop: 'inventoryDistributionCost',
     label: '撕标签成本',
     type: 1,
     values: '',
@@ -211,7 +211,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a17',
+    prop: 'stairCarryingFee',
     label: '上楼费成本',
     type: 1,
     values: '',
@@ -222,7 +222,7 @@ export const columnList = [
     head: false,
   },
   {
-      prop: 'a18',
+    prop: 'goodsAllocationCost',
     label: '分货费成本',
     type: 1,
     values: '',
@@ -233,7 +233,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'repositioningCost',
     label: '平移费成本',
     type: 1,
     values: '',
@@ -244,7 +244,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'handlingCost',
     label: '装卸费成本',
     type: 1,
     values: '',
@@ -255,7 +255,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'mileageCost',
     label: '公里数成本',
     type: 1,
     values: '',
@@ -266,7 +266,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'subsidizedKilometerCost',
     label: '补贴公里数成本',
     type: 1,
     values: '',
@@ -277,7 +277,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'excessZoneMileageCost',
     label: '超区公里费成本',
     type: 1,
     values: '',
@@ -288,7 +288,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'locationSubsidyCost',
     label: '点位补贴费成本',
     type: 1,
     values: '',
@@ -299,7 +299,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'minimumGuaranteeCost',
     label: '保底费成本',
     type: 1,
     values: '',
@@ -310,7 +310,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'fuelCost',
     label: '油费成本',
     type: 1,
     values: '',
@@ -321,7 +321,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'otherCosts',
     label: '其他成本',
     type: 1,
     values: '',
@@ -332,7 +332,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'deliveryKilometers',
     label: '配送公里数',
     type: 1,
     values: '',
@@ -343,18 +343,7 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
-        label: '超区公里费',
-        type: 1,
-        values: '',
-        width: '150',
-        checkarr: [],
-        fixed: false,
-        sortable: true,
-        head: false,
-      },
-      {
-        prop: 'a18',
+    prop: 'shipper',
     label: '发货人',
     type: 1,
     values: '',
@@ -365,9 +354,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'shippingPhone',
     label: '发货人手机号',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -376,9 +365,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'shippingAddress',
     label: '发货地址',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -387,9 +376,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'arrivalStation',
     label: '到站',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -398,9 +387,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'departureWarehouse',
     label: '发站仓',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -409,9 +398,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'consignee',
     label: '收货人',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -420,9 +409,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'consigneePhone',
     label: '收货人手机号',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -431,9 +420,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'consigneeAddress',
     label: '收货地址',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -442,9 +431,9 @@ export const columnList = [
     head: false,
   },
   {
-        prop: 'a18',
+    prop: 'customerTrip',
     label: '客户车次',
-        type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -463,4 +452,3 @@ export const columnList = [
   //     sortable: false,
   //   },
 ];
-  

src/option/storagecost/WarehouseDeliveryCost.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'a1',
+    prop: 'destinationWarehouse',
     label: '目的仓',
     type: 2,
     values: '',
@@ -26,9 +26,9 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a2',
+    prop: 'costSettlementTime',
     label: '成本结算时间',
-    type: 1,
+    type: 4,
     values: '',
     width: '150',
     checkarr: [],
@@ -37,7 +37,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a3',
+    prop: 'totalTrainService',
     label: '车次总数',
     type: 1,
     values: '',
@@ -48,7 +48,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a4',
+    prop: 'distributionPlanQuantity',
     label: '计划总数',
     type: 1,
     values: '',
@@ -59,7 +59,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a5',
+    prop: 'totalOrderQuantity',
     label: '订单总数',
     type: 1,
     values: '',
@@ -70,7 +70,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a6',
+    prop: 'plannedTotalQuantity',
     label: '计划总件数',
     type: 1,
     values: '',
@@ -81,7 +81,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'inventoryItemCount',
     label: '库存品件数',
     type: 1,
     values: '',
@@ -92,7 +92,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'totalLoadedPieces',
     label: '装车总件数',
     type: 1,
     values: '',
@@ -103,7 +103,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'totalReceiptCost',
     label: '签收总件数',
     type: 1,
     values: '',
@@ -114,7 +114,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'totalDistributionCost',
     label: '配送总成本',
     type: 1,
     values: '',
@@ -125,7 +125,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'distributionCost',
     label: '配送成本',
     type: 1,
     values: '',
@@ -136,7 +136,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'inventoryDistributionCost',
     label: '库存品配送成本',
     type: 1,
     values: '',
@@ -147,7 +147,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'stairCarryingFee',
     label: '上楼费成本',
     type: 1,
     values: '',
@@ -158,7 +158,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'goodsAllocationCost',
     label: '分货费成本',
     type: 1,
     values: '',
@@ -169,7 +169,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'repositioningCost',
     label: '平移费成本',
     type: 1,
     values: '',
@@ -180,7 +180,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'handlingCost',
     label: '装卸费成本',
     type: 1,
     values: '',
@@ -191,7 +191,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'mileageCost',
     label: '公里数成本',
     type: 1,
     values: '',
@@ -202,7 +202,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'subsidizedKilometerCost',
     label: '补贴公里数成本',
     type: 1,
     values: '',
@@ -213,7 +213,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'excessZoneMileageCost',
     label: '超区公里费成本',
     type: 1,
     values: '',
@@ -224,7 +224,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'locationSubsidyCost',
     label: '点位补贴费成本',
     type: 1,
     values: '',
@@ -235,7 +235,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'minimumGuaranteeCost',
     label: '保底费成本',
     type: 1,
     values: '',
@@ -246,7 +246,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'fuelCost',
     label: '油费成本',
     type: 1,
     values: '',
@@ -257,7 +257,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'a7',
+    prop: 'otherCosts',
     label: '其他成本',
     type: 1,
     values: '',

src/views/basicdata/brand/basicClient.vue

@@ -192,6 +192,7 @@
           >
             <el-button type="primary" icon="Download"> 点击下载 </el-button>
           </a>
+          <el-button type="primary" icon="Download" @click="ckFileverification">文件校验</el-button>
         </div>
 
         <div v-loading="loadingObj.UploadLoadong">
@@ -210,6 +211,31 @@
           </el-upload>
         </div>
       </el-dialog>
+
+
+
+      <el-dialog title="文件校验" append-to-body v-model="Fileverification" width="555px">
+        <div>
+          <el-divider content-position="left">文件校验</el-divider>
+        </div>
+
+        <div v-loading="FileverificationLoadong">
+          <el-upload
+            class="upload-demo"
+            drag
+            :headers="headers"
+            action="/api/logpm-basicdata/basicdataClient/checkImportBasicDataClient"
+            :before-upload="handleBeforeUpload"
+            :on-success="handleSuccess"
+            :on-error="handleClose"
+            multiple
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">拖拽文件或 <em>点击上传</em></div>
+          </el-upload>
+        </div>
+      </el-dialog>
+
       <!-- 表单模块 -->
       <el-dialog
         :title="title"
@@ -519,6 +545,8 @@ export default {
       excelForm: {},
       fromloading: true,
       excelBox: false,
+      Fileverification:false,
+      FileverificationLoadong:false,
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -1140,6 +1168,10 @@ export default {
     handleCo(file, fileList) {
       this.showImgViewer = false;
     },
+    // 文件校验
+    ckFileverification(){
+      this.Fileverification=true;//开启弹窗
+    },
     //文件上传前的一些业务需要的校验
     beforeUploadFn(file, fileList) {
       // console.log("上传校验");
@@ -1692,7 +1724,12 @@ export default {
     /** 上传文件 */
     handleBeforeUpload(file) {
       console.log('file :>> ', file);
+      if(this.Fileverification){
+        this.FileverificationLoadong=true
+        // 文件校验
+      }else{
         this.loadingObj.UploadLoadong = true;
+      }
 
       // 获取文件类型
       const _fileNameArr = file.name.split('.');
@@ -1705,22 +1742,39 @@ export default {
       if (whiteArr.indexOf(_fileType) !== -1) return true;
 
       this.$message.warning('请传入xls或xlsx格式的文件');
+      if(this.Fileverification){
+        this.FileverificationLoadong=false
+        // 文件校验
+      }else{
       this.loadingObj.UploadLoadong = false;
+      }
       return false;
     },
 
     /** 长传成功 */
     handleSuccess(res) {
       console.log('res :>> ', res);
-      this.loadingObj.UploadLoadong = false;
+      if(this.Fileverification){
+        this.FileverificationLoadong=true
+        // 文件校验
+      }else{
+        this.loadingObj.UploadLoadong = true;
+      }
       if (res.code !== 200) return this.$message.warning('上传失败');
       this.$message.success('上传成功');
+      if(this.loadingObj.submitLoading){
         onLoad(this.page);
+      }
     },
 
     /** 上传失败 */
     handleClose(res) {
+      if(this.Fileverification){
+        this.FileverificationLoadong=false
+        // 文件校验
+      }else{
         this.loadingObj.UploadLoadong = false;
+      }
       // UploadAjaxError
       let msgData = JSON.parse(res['message']);
       console.log(msgData, 'msgData');

src/views/cost/Deliverycostmanagement/Financialreview.vue

@@ -19,7 +19,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-              <el-button type="primary" @click="AddInfo"><el-icon><Plus /></el-icon>导出</el-button>
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Plus /></el-icon>导出</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -87,6 +89,8 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/Financialreview.js';
+import { $_getMyWarehouseList,$_Financialreview } from '@/api/storagecost/index.js';
+
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
@@ -138,7 +142,7 @@
   columnList,
 
   /** 列表数据 */
-    data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -200,12 +204,9 @@
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
   test(details.query);
-      
 };
 // 实例函数
-  const test=(val)=>{
-  
-  }
+const test = val => {};
 /** 表格表头时间选择 */
 const timesc = (index, row) => {
   console.log(index, row);
@@ -267,11 +268,34 @@
   });
 }
 // 页面初始化
-const onLoad=()=>{
+const onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
+  };
   
+  details.loadingObj.list=true;
+  $_Financialreview(data).then(res => {
+    if (res.data.code == 200) {
+      details.data = res.data.data.records || [];
+      details.page.total = res.data.data.total; //页码
     }
+  }).catch((error)=>{
+    console.log(error,'错误信息');
+  }).finally(()=>{
+    details.loadingObj.list=false;
+  });;
+};
 
 // 页面初始化方法
+const PageOnload = () => {
+  onLoad(); //获取列表参数
+};
+// 页面初始化方法
+PageOnload();
+
 </script>
 
 <style scoped lang="scss">
@@ -300,4 +324,3 @@ const onLoad=()=>{
   flex-direction: column;
 }
 </style>
-  

src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue

@@ -36,7 +36,7 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddInfo"
+            <el-button type="primary" @click="exportExcel"
               ><el-icon><Plus /></el-icon>导出</el-button
             >
           </div>
@@ -104,6 +104,8 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/OrderTotalCostDetail.js';
+import { $_getMyWarehouseList,$_OrderTotalCostDetail ,$_expenseDispatchOrderDetail} from '@/api/storagecost/index.js';
+
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
@@ -111,6 +113,7 @@ import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -157,7 +160,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -262,7 +265,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad()
 };
 // 顶部搜索
 const searchHide = () => {
@@ -284,9 +287,57 @@ function updateDictionary(targetArray, dictionaryType) {
   });
 }
 // 页面初始化
-const onLoad = () => {};
-
+const  onLoad = value => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
+  };
+  details.loadingObj.list=true
+  $_OrderTotalCostDetail(data).then(res => {
+    if (res.data.code == 200) {
+      details.data = res.data.data.records || [];
+      details.page.total = res.data.data.total; //页码
+    }
+  }).catch(error=>{
+    console.log(error);
+  }).finally(()=>{
+    details.loadingObj.list=false
+  });
+};
+const PageOnload = () => {
+  onLoad(); //获取列表参数
+};
+// 页面初始化方法
+PageOnload();
 // 页面初始化方法
+// 导出
+const exportExcel = () => {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      console.log(details.query, '搜索参数');
+      details.loadingObj.list = true;
+      let data = {
+        ...details.query,
+      };
+      console.log(data, '要提交的数据');
+      $_expenseDispatchOrderDetail(data).then(res => {
+        details.loadingObj.list = false;
+        downloadXls(res.data, `订单总成本明细表.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
+      });
+    })
+    .catch(() => {});
+};
+
 </script>
 
 <style scoped lang="scss">

src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue

@@ -55,7 +55,7 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddInfo"
+            <el-button type="primary" @click="exportExcel"
               ><el-icon><Plus /></el-icon>导出</el-button
             >
           </div>
@@ -126,13 +126,18 @@
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/WarehouseDeliveryCost.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { $_getMyWarehouseList } from '@/api/storagecost/index.js';
+import {
+  $_getMyWarehouseList,
+  $_WarehouseDeliveryCost,
+  $_expenseDispatchWarehouseMonth,
+} from '@/api/storagecost/index.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -181,7 +186,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -243,7 +248,7 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
-  test(details.query);
+  onLoad();
 };
 // 实例函数
 const test = val => {};
@@ -257,6 +262,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
+  processRowProperty(index, row, details);
 };
 
 /** 表格表头输入框搜索 */
@@ -274,7 +280,7 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 每页多少条
 const sizeChange = val => {
@@ -286,7 +292,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad();
 };
 // 顶部搜索
 const searchHide = () => {
@@ -308,7 +314,29 @@ function updateDictionary(targetArray, dictionaryType) {
   });
 }
 // 页面初始化
-const onLoad = () => {};
+const onLoad = value => {
+  details.loadingObj.list = true;
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...value,
+  };
+  $_WarehouseDeliveryCost(data)
+    .then(res => {
+      console.log(res, '获取数据');
+      if (res.data.code == 200) {
+        details.data = res.data.data.records || [];
+        details.page.total = res.data.data.total; //页码
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
+};
 
 // 页面初始化方法
 
@@ -334,12 +362,51 @@ const MyWarehouseList = () => {
   });
 };
 const PageOnload = () => {
+  onLoad(); //初始化数据
   MyWarehouseList(); //获取仓库
   monthFn();
 };
 
 //页面初始化方法
 PageOnload();
+const exportExcel = () => {
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      console.log(details.query, '搜索参数');
+      details.loadingObj.list = true;
+      let data = {
+        ...details.query,
+      };
+      console.log(data, '要提交的数据');
+      $_expenseDispatchWarehouseMonth(data)
+        .then(res => {
+          downloadXls(res.data, `仓库月度配送成本表.xlsx`);
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+        })
+        .catch(error => {
+          console.log(error);
+        })
+        .finally(() => {
+          details.loadingObj.list = false;
+        });
+    })
+    .catch(() => {});
+};
+// 清空
+const searchReset = () => {
+  details.columnList.forEach(item => {
+    item.values = '';
+  });
+  details.query = {};
+  onLoad();
+};
 </script>
 
 <style scoped lang="scss">

src/views/cost/storagecost/WarehouseMonthly.vue

@@ -318,7 +318,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  onLoad(); //获取列表参数
 };
 // 顶部搜索
 const searchHide = () => {

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -96,7 +96,7 @@
           <ul>
             <li>
               <img src="../../../../public/img/bg/Delivery.png" /> 市配总车次{{
-                statistics.vehiclesNub
+                statistics.marketNub
               }}
             </li>
             <li>
@@ -109,11 +109,11 @@
                 statistics.minventoryTotal
               }}
             </li>
-            <li>
+            <!-- <li>
               <img src="../../../../public/img/bg/distribution.png" />市配订单总数{{
                 statistics.marketNub
               }}
-            </li>
+            </li> -->
           </ul>
         </div>
       </div>

src/views/mail/order/list.vue

@@ -59,6 +59,9 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button> -->
+            <el-button type="danger" icon="el-icon-edit" @click="exportExcel" 
+              >导出</el-button
+            >
             <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if="handler"
               >转预约单</el-button
             >
@@ -354,17 +357,19 @@ import {
   update,
   remove,
   addStock,
+  $_exportmaillOrder,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
 import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
 import { addClient } from '@/api/distribution/distributionClientMessage';
 import { addService } from '@/api/distribution/distributionServiceLog';
 import option from '@/option/distribution/distributionStockArticle';
+import { downloadXls, deepClone } from '@/utils/util';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { handleClearTableQuery } from '@/utils/util';
-
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   data() {
     return {
@@ -1047,6 +1052,42 @@ export default {
         },
       });
     },
+
+    // 导出
+   exportExcel(){
+  ElMessageBox.confirm('是否导出数据?', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+ 
+     this.loading = true;
+      let data = {
+        ...this.query,
+      };
+      if(this.selectionList.length){
+        data.ids = this.selectionList.map(item => item.id).join(',');
+      }
+      console.log(data, '要提交的数据');
+      $_exportmaillOrder(data).then(res => {
+        downloadXls(res.data, `商场订单.xlsx`);
+        ElMessage({
+          message: '导出成功',
+          type: 'success',
+        });
+      }).catch((error)=>{
+        console.log(error,'导出失败');
+        ElMessage({
+          message: '导出失败',
+          type: 'error',
+        });
+      }).finally(()=>{
+        this.loading =false;
+      });
+    })
+    .catch(() => {});
+},
     //通知提货
     handleCallDeliveryOwn(row) {
       console.log('row', row);
@@ -1322,13 +1363,21 @@ export default {
             // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
             // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
             // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
+            // i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
+            // i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
+            // i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
+            // i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
+            // i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
+            // i.notReceived = parseInt(i.totalNumber) - parseInt(i.incomingNum);
+            // i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity);
+
+
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
           i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
           i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
           i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
           i.notReceived = parseInt(i.totalNumber) - parseInt(i.incomingNum);
-            i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity);
             return i;
           });
           this.loading = false;