diff --git a/src/api/finance/MerchantDepositSlip.js b/src/api/finance/MerchantDepositSlip.js
index c867eab5..51b88b70 100644
--- a/src/api/finance/MerchantDepositSlip.js
+++ b/src/api/finance/MerchantDepositSlip.js
@@ -12,3 +12,16 @@ export const postPageList = data => {
     data,
   });
 };
+
+/**
+ * 确认结算
+ * @param {*} data
+ * @returns
+ */
+export const postCheckBalance = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/checkBalance',
+    method: 'post',
+    data,
+  });
+};
\ No newline at end of file
diff --git a/src/api/finance/TransactionInformation.js b/src/api/finance/TransactionInformation.js
new file mode 100644
index 00000000..b5f00264
--- /dev/null
+++ b/src/api/finance/TransactionInformation.js
@@ -0,0 +1,40 @@
+import request from '@/axios';
+
+/**
+ * 查询异动信息
+ * @param {*} data
+ * @returns
+ */
+export const postFindOrderDetail = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/findOrderDetail',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 获取订单异动记录列表
+ * @param {*} data
+ * @returns
+ */
+export const postFindChangesRecordList = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/findChangesRecordList',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 新增异动信息
+ * @param {*} data
+ * @returns
+ */
+export const postAddChangesRecord = data => {
+  return request({
+    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/addChangesRecord',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 7b405909..aa03ec24 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -109,7 +109,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'planVolume',
+    prop: 'planNum',
     label: '预计数量',
     type: 1,
     values: '',
diff --git a/src/option/finance/MerchantDepositSlip.js b/src/option/finance/MerchantDepositSlip.js
index c83015d3..61fd5de1 100644
--- a/src/option/finance/MerchantDepositSlip.js
+++ b/src/option/finance/MerchantDepositSlip.js
@@ -267,20 +267,9 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'templateType',
-  //   label: '干线费',
-  //   type: 1,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
   {
-    prop: 'templateType',
-    label: '在库周期',
+    prop: 'freightFee',
+    label: '开单运费',
     type: 1,
     values: '',
     width: '150',
@@ -290,8 +279,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储计费区间',
+    prop: 'realFreightFee',
+    label: '实际运费',
     type: 1,
     values: '',
     width: '150',
@@ -301,8 +290,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储服务费合计',
+    prop: 'installFee',
+    label: '开单安装费',
     type: 1,
     values: '',
     width: '150',
@@ -312,8 +301,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储费',
+    prop: 'realInstallFee',
+    label: '实际安装费',
     type: 1,
     values: '',
     width: '150',
@@ -323,8 +312,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储管理费',
+    prop: 'quotationFee',
+    label: '开单保价费',
     type: 1,
     values: '',
     width: '150',
@@ -334,8 +323,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储分拣费',
+    prop: 'realQuotationFee',
+    label: '实际保价费',
     type: 1,
     values: '',
     width: '150',
@@ -345,8 +334,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '仓储操作费',
+    prop: 'claimingValue',
+    label: '开单申明价值',
     type: 1,
     values: '',
     width: '150',
@@ -356,8 +345,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送费服务费合计',
+    prop: 'realClaimingValue',
+    label: '实际申明价值',
     type: 1,
     values: '',
     width: '150',
@@ -367,8 +356,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送费',
+    prop: 'otherFee',
+    label: '开单其它费',
     type: 1,
     values: '',
     width: '150',
@@ -378,8 +367,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送装卸费',
+    prop: 'realOtherFee',
+    label: '实际其他费',
     type: 1,
     values: '',
     width: '150',
@@ -389,8 +378,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送分货费',
+    prop: 'returnFee',
+    label: '开单回扣',
     type: 1,
     values: '',
     width: '150',
@@ -400,8 +389,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送上楼费',
+    prop: 'realReturnFee',
+    label: '实际回扣',
     type: 1,
     values: '',
     width: '150',
@@ -411,8 +400,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送平移费',
+    prop: 'thirdOprationFee',
+    label: '开单三方操作费',
     type: 1,
     values: '',
     width: '150',
@@ -422,8 +411,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '配送公里数',
+    prop: 'realThirdOprationFee',
+    label: '实际三方操作费',
     type: 1,
     values: '',
     width: '150',
@@ -433,8 +422,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '安装费',
+    prop: 'xPay',
+    label: '开单现付',
     type: 1,
     values: '',
     width: '150',
@@ -444,8 +433,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '保价费',
+    prop: 'realXPay',
+    label: '实际现付',
     type: 1,
     values: '',
     width: '150',
@@ -455,8 +444,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '申明价值',
+    prop: 'dPay',
+    label: '开单到付',
     type: 1,
     values: '',
     width: '150',
@@ -466,8 +455,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '其他费用',
+    prop: 'realDPay',
+    label: '实际到付',
     type: 1,
     values: '',
     width: '150',
@@ -477,8 +466,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '回扣',
+    prop: 'hPay',
+    label: '开单回付',
     type: 1,
     values: '',
     width: '150',
@@ -488,8 +477,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '三方操作费',
+    prop: 'realHPay',
+    label: '实际回付',
     type: 1,
     values: '',
     width: '150',
@@ -499,8 +488,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '发货人',
+    prop: 'yPay',
+    label: '开单月结',
     type: 1,
     values: '',
     width: '150',
@@ -510,8 +499,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '发货手机号',
+    prop: 'realYPay',
+    label: '实际月付',
     type: 1,
     values: '',
     width: '150',
@@ -521,8 +510,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '发货地址',
+    prop: 'incomingTime',
+    label: '入库时间',
     type: 1,
     values: '',
     width: '150',
@@ -532,8 +521,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '到站',
+    prop: 'outingTime',
+    label: '出库时间',
     type: 1,
     values: '',
     width: '150',
@@ -543,8 +532,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '目的仓',
+    prop: 'warehouseServiceFee',
+    label: '开单仓库服务费',
     type: 1,
     values: '',
     width: '150',
@@ -554,8 +543,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '发站仓',
+    prop: 'realWarehouseServiceFee',
+    label: '实际仓库服务费',
     type: 1,
     values: '',
     width: '150',
@@ -565,8 +554,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '收货人',
+    prop: 'warehouseFee',
+    label: '开单仓储费',
     type: 1,
     values: '',
     width: '150',
@@ -576,8 +565,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '收货人手机号',
+    prop: 'realWarehouseFee',
+    label: '实际仓储费',
     type: 1,
     values: '',
     width: '150',
@@ -587,8 +576,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '收货地址',
+    prop: 'warehouseManageFee',
+    label: '开单仓储管理费',
     type: 1,
     values: '',
     width: '150',
@@ -598,8 +587,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '进货方式',
+    prop: 'realWarehouseManageFee',
+    label: '实际仓储管理费',
     type: 1,
     values: '',
     width: '150',
@@ -609,8 +598,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '客户车次',
+    prop: 'warehouseSortingFee',
+    label: '开单仓储分拣费',
     type: 1,
     values: '',
     width: '150',
@@ -620,8 +609,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '回单状态',
+    prop: 'realWarehouseSortingFee',
+    label: '实际仓储分拣费',
     type: 1,
     values: '',
     width: '150',
@@ -631,8 +620,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '运单备注',
+    prop: 'warehouseOperatingFee',
+    label: '开单仓储操作费',
     type: 1,
     values: '',
     width: '150',
@@ -642,8 +631,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '结算方',
+    prop: 'realWarehouseOperatingFee',
+    label: '实际仓储操作费',
     type: 1,
     values: '',
     width: '150',
@@ -653,8 +642,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '支付方式',
+    prop: 'deliveryServiceFee',
+    label: '开单配送服务费',
     type: 1,
     values: '',
     width: '150',
@@ -664,8 +653,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '付款方式',
+    prop: 'realDeliveryServiceFee',
+    label: '实际配送服务费',
     type: 1,
     values: '',
     width: '150',
@@ -675,8 +664,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '现付',
+    prop: 'deliveryFee',
+    label: '开单配送费',
     type: 1,
     values: '',
     width: '150',
@@ -686,8 +675,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '到付',
+    prop: 'realDeliveryFee',
+    label: '实际配送费',
     type: 1,
     values: '',
     width: '150',
@@ -697,8 +686,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '回付',
+    prop: 'deliveryLoadingFee',
+    label: '配送装卸费',
     type: 1,
     values: '',
     width: '150',
@@ -708,8 +697,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '月结',
+    prop: 'realDeliveryLoadingFee',
+    label: '实际配送装卸费',
     type: 1,
     values: '',
     width: '150',
@@ -719,8 +708,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '是否售后',
+    prop: 'deliverySortingFee',
+    label: '配送分拣费',
     type: 1,
     values: '',
     width: '150',
@@ -730,8 +719,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '售后价格',
+    prop: 'realDeliverySortingFee',
+    label: '实际配送分拣费',
     type: 1,
     values: '',
     width: '150',
@@ -741,8 +730,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '对账单总金额',
+    prop: 'deliveryUpfloorFee',
+    label: '开单配送上楼费',
     type: 1,
     values: '',
     width: '150',
@@ -752,8 +741,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '对账状态',
+    prop: 'realDeliveryUpfloorFee',
+    label: '实际配送上楼费',
     type: 1,
     values: '',
     width: '150',
@@ -763,8 +752,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '已对账金额',
+    prop: 'deliveryMoveFee',
+    label: '开单配送平移费',
     type: 1,
     values: '',
     width: '150',
@@ -774,8 +763,261 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
-    label: '未对账金额',
+    prop: 'realDeliveryMoveFee',
+    label: '实际平移费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryDistance',
+    label: '开单配送公里数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'realDeliveryDistance',
+    label: '实际配送公里数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'deliveryCrossingFee',
+    label: '开单超区费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'realDeliveryCrossingFee',
+    label: '实际超区费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalStatementFee',
+    label: '对账总金额',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'templateType',
+  //   label: '干线费',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '在库周期',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '仓储计费区间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '仓储服务费合计',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'shipperPerson',
+    label: '发货人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'shipperMobile',
+    label: '发货手机号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'shipperAddress',
+    label: '发货地址',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'destination',
+    label: '到站',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'departure',
+    label: '发站',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'departureWarehouseName',
+    label: '发站仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'consigneePerson',
+    label: '收货人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'consigneeMobile',
+    label: '收货人手机号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'consigneeAddress',
+    label: '收货地址',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'templateType',
+  //   label: '进货方式',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'customerTrain',
+    label: '客户车次',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'templateType',
+  //   label: '回单状态',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'waybillRemark',
+    label: '运单备注',
     type: 1,
     values: '',
     width: '150',
@@ -786,6 +1028,213 @@ export const columnList = [
   },
   {
     prop: 'templateType',
+    label: '结算方',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'payWay',
+    label: '支付方式',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'payType',
+    label: '支付类型',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'isChangesName',
+    label: '是否异动',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: 1 },
+      { label: '否', value: 0 },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'changesFee',
+    label: '异动金额',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'changesItems',
+    label: '异动条目',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: 1 },
+      { label: '否', value: 0 },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'changesRemark',
+    label: '异动备注',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: 1 },
+      { label: '否', value: 0 },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'templateType',
+  //   label: '付款方式',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '现付',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '到付',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '回付',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '月结',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '是否售后',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'templateType',
+  //   label: '售后价格',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'totalStatementFee',
+    label: '对账单总金额',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'statementStatus',
+    label: '对账状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'hasStatementFee',
+    label: '已对账金额',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  // {
+  //   prop: 'templateType',
+  //   label: '未对账金额',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  {
+    prop: 'statementCreateUser',
     label: '对账确认人',
     type: 1,
     values: '',
@@ -796,7 +1245,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'statementCreateTime',
     label: '对账确认时间',
     type: 1,
     values: '',
diff --git a/src/views/Pricesystem/Price/PriceBill.vue b/src/views/Pricesystem/Price/PriceBill.vue
index fb476b06..a929ff11 100644
--- a/src/views/Pricesystem/Price/PriceBill.vue
+++ b/src/views/Pricesystem/Price/PriceBill.vue
@@ -283,6 +283,9 @@
           style="width: 100%"
           v-model="details.form.startCity"
           filterable
+          :props="{
+            checkStrictly: true,
+          }"
           @change="value => handleChangeCity(value, 'start')"
           clearable
         >
@@ -297,6 +300,9 @@
         <el-cascader
           pleceholder="请选择目的地"
           :options="details.regionOptione"
+          :props="{
+            checkStrictly: true,
+          }"
           style="width: 100%"
           v-model="details.form.endCity"
           @change="value => handleChangeCity(value, 'end')"
diff --git a/src/views/Pricesystem/Price/PriceTrunkLine.vue b/src/views/Pricesystem/Price/PriceTrunkLine.vue
index 36518b70..8b3adaf1 100644
--- a/src/views/Pricesystem/Price/PriceTrunkLine.vue
+++ b/src/views/Pricesystem/Price/PriceTrunkLine.vue
@@ -289,6 +289,9 @@
           style="width: 100%"
           v-model="details.form.startCity"
           filterable
+          :props="{
+            checkStrictly: true,
+          }"
           @change="value => handleChangeCity(value, 'start')"
           clearable
         >
@@ -304,6 +307,9 @@
           pleceholder="请选择目的地"
           :options="details.regionOptione"
           style="width: 100%"
+          :props="{
+            checkStrictly: true,
+          }"
           v-model="details.form.endCity"
           @change="value => handleChangeCity(value, 'end')"
           filterable
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index b40cc930..ff4eaecf 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1164,9 +1164,11 @@
       </tablecmt>
 
       <div class="flex-c-c mt20">
-        <el-button icon="CircleClose" @click="() => (details.popUpShow.causeVisited = false)"
-          >取 消</el-button
-        >
+        <!-- 取消 -->
+        <el-button icon="CircleClose" @click="() => (details.popUpShow.causeVisited = false)">
+          取 消
+        </el-button>
+        <!-- 确认 -->
         <el-button type="primary" icon="CircleCheck" @click="handleSubmitCause">确 认</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/finance/MerchantDepositSlip.vue b/src/views/finance/MerchantDepositSlip.vue
index 67d8faab..46c02e5d 100644
--- a/src/views/finance/MerchantDepositSlip.vue
+++ b/src/views/finance/MerchantDepositSlip.vue
@@ -220,11 +220,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import {
-  getopenOrderAdvancePageList,
-  postOpenOrderFreezeByAdvanceIds,
-} from '@/api/waybill/TemporaryStorageList';
-import { postPageList } from '@/api/finance/MerchantDepositSlip';
+import { postPageList, postCheckBalance } from '@/api/finance/MerchantDepositSlip';
 import {
   downloadXls,
   setNodeHeight,
@@ -451,11 +447,30 @@ const handleConfirm = () => {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
-  }).then(() => {
-    ElMessage({
-      type: 'success',
-      message: '确认成功!',
-    });
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const _arr = [];
+      for (let index = 0; index < details.selectionList.length; index++) {
+        const value = details.selectionList[index];
+        _arr.push(value.orderInfoId);
+      }
+
+      const submitData = {
+        orderInfoIds: _arr,
+      };
+
+      const res = await postCheckBalance(submitData);
+      const { code, msg } = res.data;
+
+      if (code !== 200) return;
+      onLoad();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
   });
 };
 
@@ -474,7 +489,14 @@ const handleExport = () => {
 };
 
 /** 查看异动信息 */
-const ViewTransactionInformation = ({ row }) => {};
+const ViewTransactionInformation = ({ row }) => {
+  console.log('row :>> ', row);
+
+  $router.push({
+    path: '/finance/TransactionInformation',
+    query: { orderInfoId: row.orderInfoId },
+  });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/finance/TransactionInformation.vue b/src/views/finance/TransactionInformation.vue
index da894e48..889c86fe 100644
--- a/src/views/finance/TransactionInformation.vue
+++ b/src/views/finance/TransactionInformation.vue
@@ -1,108 +1,144 @@
 <template>
   <basic-container>
-    <!-- 标题 -->
-    <div class="header">异 动 信 息</div>
-
-    <!-- 主体内容 -->
-    <div class="main">
-      <!-- 运单 / 订单信息 -->
-      <div>
-        <!-- 标题 -->
-        <div class="header">订 单 信 息</div>
-
-        <!-- 信息 -->
-        <div class="info fwb">
-          <!-- <div class="flex"> -->
-
-          <!-- 订单信息 -->
-          <div class="fwb info_title">
-            <span class="title"> 订单号： </span>
-            <span class="text"> 1231231231 </span>
-          </div>
+    <div v-loading="details.loadingObj.pageLoading">
+      <!-- 标题 -->
+      <div class="header">异 动 信 息</div>
+
+      <!-- 主体内容 -->
+      <div class="main">
+        <!-- 运单 / 订单信息 -->
+        <div>
+          <!-- 标题 -->
+          <div class="header">订 单 信 息</div>
+
+          <!-- 信息 -->
+          <div class="info fwb">
+            <!-- 订单信息 -->
+            <div class="fwb info_title">
+              <span class="title"> 订单号： </span>
+              <span class="text"> {{ details.pageInfo.orderNo }} </span>
+            </div>
 
-          <!-- 运单信息 -->
-          <div class="fwb mt10 info_title mr10">
-            <span class="title"> 运单号： </span>
-            <span class="text"> 1231231231 </span>
-          </div>
-          <!-- </div> -->
+            <!-- 运单信息 -->
+            <div class="fwb mt10 info_title mr10">
+              <span class="title"> 运单号： </span>
+              <span class="text"> {{ details.pageInfo.waybillNo }} </span>
+            </div>
 
-          <div class="info_row mt10">
-            <div v-for="item in details.titleOption" :key="item.label">
-              <span class="title"> {{ item.label }} </span>
-              <span class="text"> 1231231231 </span>
+            <div class="info_row mt10">
+              <div v-for="item in details.titleOption" :key="item.label">
+                <span class="title"> {{ item.label }} </span>
+                <span class="text"> {{ details.pageInfo[item.prop] || '暂无数据' }} </span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <!-- 异动信息 -->
-      <div>
-        <!-- 标题 -->
-        <div class="header algin_center">
-          <span> 异 动 信 息 </span>
-          <span class="title_info">
-            （此处填写要登记的异动的金额，整数表示异动增款；负数表示异动减款）
-          </span>
-        </div>
+        <!-- 异动信息 -->
+        <div>
+          <!-- 标题 -->
+          <div class="header algin_center">
+            <span> 异 动 信 息 </span>
+            <span class="title_info">
+              （此处填写要登记的异动的金额，整数表示异动增款；负数表示异动减款）
+            </span>
+          </div>
 
-        <!-- 表单信息 -->
-        <el-form class="info" inline>
-          <template v-for="(item, index) in details.formOption" :key="item.label">
-            <el-form-item :label="item.label" v-if="item.type === 'number'">
-              <el-input-number
-                :value-on-clear="0"
-                :controls="false"
-                v-model="details.form[item.prop]"
-                :precision="2"
-                :step="1"
+          <!-- 表单信息 -->
+          <el-form class="info" ref="formRef" :model="details.form" inline :rules="details.rules">
+            <template v-for="(item, index) in details.formOption" :key="item.label">
+              <el-form-item :label="item.label" v-if="item.type === 'number'">
+                <el-input-number
+                  :value-on-clear="0"
+                  :controls="false"
+                  v-model="details.form[item.prop]"
+                  :precision="2"
+                  :step="1"
+                />
+              </el-form-item>
+            </template>
+
+            <el-form-item label="异动时间：" prop="changesTimeStr">
+              <el-date-picker
+                v-model="details.form.changesTimeStr"
+                type="datetime"
+                placeholder="请选择异动时间"
               />
             </el-form-item>
-          </template>
-
-          <el-form-item label="异动时间：">
-            <el-input />
-          </el-form-item>
-
-          <el-form-item label="结算网点：">
-            <el-input />
-          </el-form-item>
-
-          <el-form-item label="备注：" class="w100">
-            <el-input type="textarea" />
-          </el-form-item>
-
-          <el-form-item label="图片：" class="w100">
-            <el-upload
-              list-type="picture-card"
-              v-model:file-list="details.form.fileList"
-              drag
-              action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
-              multiple
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-            >
-              <el-icon><Plus /></el-icon>
-            </el-upload>
-          </el-form-item>
-        </el-form>
-      </div>
 
-      <!-- 异动信息 -->
-      <div>
-        <!-- 标题 -->
-        <div class="header algin_center">异 动 记 录</div>
-
-        <!-- 表格 -->
-        <div class="info">
-          <tablecmt
-            ref="tableNodeRef"
-            :columnList="details.columnList"
-            :tableData="details.data"
-            :loading="details.loadingObj.list"
-          />
+            <el-form-item label="结算网点：" prop="statisticsWarehouse">
+              <el-select
+                class="w100"
+                v-model="details.form.statisticsWarehouse"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="目的仓"
+                @change="
+                  val => {
+                    destinationWarehouseNameChange(val);
+                  }
+                "
+                :remote-method="value => debounce(remoteMethod(value), 500)"
+                :loading="details.loadingObj.loading"
+                clearable
+              >
+                <el-option
+                  v-for="item in details.warehouseList"
+                  :key="item.value"
+                  :label="item.warehouseName"
+                  :value="item.warehouseId"
+                />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="备注：" class="w100">
+              <el-input type="textarea" />
+            </el-form-item>
+
+            <el-form-item label="图片：" class="w100">
+              <el-upload
+                list-type="picture-card"
+                v-model:file-list="details.fileList"
+                drag
+                action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+                multiple
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove"
+              >
+                <el-icon><Plus /></el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-form>
+        </div>
+
+        <!-- 异动信息 -->
+        <div>
+          <!-- 标题 -->
+          <div class="header algin_center">异 动 记 录</div>
+
+          <!-- 表格 -->
+          <div class="info">
+            <tablecmt
+              ref="tableNodeRef"
+              :columnList="details.columnList"
+              :tableData="details.data"
+              :loading="details.loadingObj.list"
+            />
+          </div>
         </div>
       </div>
+
+      <!-- 底部站位 -->
+      <div class="footer"></div>
+
+      <!-- 底部按钮 -->
+      <div class="footer_container flex-c-c">
+        <!-- 关闭 -->
+        <el-button icon="CircleClose" @click="handleClose"> 关 闭 </el-button>
+        <!-- 提交 -->
+        <el-button icon="Position" type="primary" @click="handleSubmit"> 提 交 </el-button>
+      </div>
     </div>
   </basic-container>
 
@@ -113,23 +149,32 @@
 
 <script setup lang="ts">
 import { ref, reactive, toRefs } from 'vue';
+import {
+  postFindOrderDetail,
+  postAddChangesRecord,
+  postFindChangesRecordList,
+} from '@/api/finance/TransactionInformation';
+import { ElMessage, ElMessageBox } from 'element-plus';
 import type { UploadUserFile, UploadProps } from 'element-plus';
+import { useRoute, useRouter } from 'vue-router';
+import { getOpenOrderAdvanceFindWarehouseList } from '@/api/distribution/CreateOrder.js';
+import { debounce } from '@/utils/util';
+
+const $route = useRoute();
+const $router = useRouter();
 
 const details = reactive({
-  form: {
-    /** 异动类型 */
-    type: 'waybill',
-    fileList: [
-      {
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-      },
-      {
-        name: 'plant-1.png',
-        url: '/images/plant-1.png',
-      },
-    ] as UploadUserFile[],
-  },
+  form: {},
+  fileList: [
+    {
+      name: 'food.jpeg',
+      url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+    },
+    {
+      name: 'plant-1.png',
+      url: '/images/plant-1.png',
+    },
+  ] as UploadUserFile[],
   /** 弹窗 */
   popUpShow: {
     imgVisited: false,
@@ -138,6 +183,7 @@ const details = reactive({
   data: [],
   loadingObj: {
     list: false,
+    pageLoading: false,
   },
   columnList: [
     {
@@ -207,236 +253,226 @@ const details = reactive({
   formOption: [
     {
       label: '干线费：',
-      prop: 'num',
+      prop: 'freightFee',
       type: 'number',
     },
     {
       label: '提货费：',
-      prop: 'num',
+      prop: 'pickupFee',
       type: 'number',
     },
     {
       label: '仓储费：',
-      prop: 'num',
+      prop: 'warehouseFee',
       type: 'number',
     },
     {
       label: '仓储管理费：',
-      prop: 'num',
+      prop: 'warehouseManageFee',
       type: 'number',
     },
     {
       label: '仓储分拣费：',
-      prop: 'num',
+      prop: 'warehouseSortingFee',
       type: 'number',
     },
     {
       label: '仓储操作 / 装卸费：',
-      prop: 'num',
+      prop: 'warehouseOperatingFee',
       type: 'number',
     },
     {
       label: '配送费：',
-      prop: 'num',
+      prop: 'deliveryFee',
       type: 'number',
     },
     {
       label: '配送操作 / 装卸费：',
-      prop: 'num',
+      prop: 'deliveryLoadingFee',
       type: 'number',
     },
     {
       label: '配送分货费：',
-      prop: 'num',
+      prop: 'deliverySortingFee',
       type: 'number',
     },
     {
       label: '配送上楼费：',
-      prop: 'num',
+      prop: 'deliveryUpfloorFee',
       type: 'number',
     },
     {
       label: '配送平移费：',
-      prop: 'num',
+      prop: 'deliveryMoveFee',
       type: 'number',
     },
     {
       label: '安装费：',
-      prop: 'num',
+      prop: 'installFee',
       type: 'number',
     },
     {
-      label: '报价费：',
-      prop: 'num',
+      label: '保价费：',
+      prop: 'quotationFee',
       type: 'number',
     },
     {
       label: '申明价值：',
-      prop: 'num',
+      prop: 'claimingValue',
       type: 'number',
     },
     {
       label: '其它费用：',
-      prop: 'num',
+      prop: 'otherFee',
       type: 'number',
     },
     {
       label: '回扣：',
-      prop: 'num',
+      prop: 'returnFee',
       type: 'number',
     },
     {
       label: '第三方操作费：',
-      prop: 'num',
+      prop: 'thirdOprationFee',
       type: 'number',
     },
     {
       label: '内部结算：',
-      prop: 'num',
-      type: 'number',
-    },
-    {
-      label: '代收货款：',
-      prop: 'num',
-      type: 'number',
-    },
-    {
-      label: '代收货款已收：',
-      prop: 'num',
+      prop: 'hasStatisticsFee',
       type: 'number',
     },
     {
       label: '异动时间：',
-      prop: 'num',
+      prop: 'changesTimeStr',
       type: 'time',
     },
     {
       label: '结算网点：',
-      prop: 'num',
+      prop: 'statisticsWarehouse',
       type: 'select',
     },
     {
       label: '备注：',
-      prop: 'num',
+      prop: 'remark',
       type: 'textarea',
     },
   ],
   titleOption: [
     {
       label: '对账单总金额（元）：',
-      prop: 'num',
+      prop: 'totalStatementFee',
     },
     {
       label: '开单时间：',
-      prop: 'num',
+      prop: 'openTime',
     },
     {
       label: '发站：',
-      prop: 'num',
+      prop: 'departure',
     },
     {
       label: '到站：',
-      prop: 'num',
+      prop: 'destination',
     },
     {
       label: '品类：',
-      prop: 'num',
+      prop: 'goodsName',
     },
     {
       label: '发货单位：',
-      prop: 'num',
+      prop: 'shipper',
     },
     {
       label: '收货单位：',
-      prop: 'num',
+      prop: 'consignee',
     },
     {
       label: '收货人：',
-      prop: 'num',
+      prop: 'shipperPerson',
     },
     {
       label: '服务类型：',
-      prop: 'num',
+      prop: 'typeServers',
     },
     {
       label: '运单类型：',
-      prop: 'num',
+      prop: 'waybillType',
     },
     {
       label: '件数：',
-      prop: 'num',
+      prop: 'totalcount',
     },
     {
       label: '重量：',
-      prop: 'num',
+      prop: 'totalWeight',
     },
     {
       label: '体积：',
-      prop: 'num',
+      prop: 'totalVolume',
     },
     {
       label: '干线费：',
-      prop: 'num',
+      prop: 'realFreightFee',
     },
     {
       label: '提货费：',
-      prop: 'num',
+      prop: 'realPickupFee',
     },
     {
       label: '仓储费：',
-      prop: 'num',
+      prop: 'realWarehouseFee',
     },
     {
       label: '仓储管理费',
-      prop: 'num',
+      prop: 'realWarehouseManageFee',
     },
     {
       label: '仓储分拣费',
-      prop: 'num',
+      prop: 'realWarehouseSortingFee',
     },
     {
       label: '仓储操作 / 装卸费：',
-      prop: 'num',
+      prop: 'realWarehouseOperatingFee',
     },
     {
       label: '配送费：',
-      prop: 'num',
+      prop: 'realDeliveryFee',
     },
     {
       label: '配送操作 / 装卸费：',
-      prop: 'num',
+      prop: 'realDeliveryLoadingFee',
     },
     {
       label: '配送分货费',
-      prop: 'num',
+      prop: 'realDeliverySortingFee',
     },
     {
       label: '配送上楼费：',
-      prop: 'num',
+      prop: 'realDeliveryUpfloorFee',
     },
     {
       label: '配送平移费：',
-      prop: 'num',
+      prop: 'realDeliveryMoveFee',
     },
     {
       label: '安装费：',
-      prop: 'num',
+      prop: 'realInstallFee',
     },
     {
       label: '保价费：',
-      prop: 'num',
+      prop: 'realQuotationFee',
     },
     {
       label: '申明价值：',
-      prop: 'num',
+      prop: 'realClaimingValue',
     },
     {
       label: '其它费用：',
-      prop: 'num',
+      prop: 'realOtherFee',
     },
     {
       label: '回扣：',
-      prop: 'num',
+      prop: 'realReturnFee',
     },
     {
       label: '售后：',
@@ -444,21 +480,140 @@ const details = reactive({
     },
     {
       label: '异动金额：',
-      prop: 'num',
+      prop: 'abnormalFee',
     },
   ],
+  /** 页面数据 */
+  pageInfo: {},
+  /** 仓库节点list */
+  warehouseList: [],
+  rules: {
+    changesTimeStr: [{ required: true, message: '请选择异动时间', trigger: ['change', 'blur'] }],
+    statisticsWarehouse: [
+      { required: true, message: '请选择结算网点', trigger: ['change', 'blur'] },
+    ],
+  },
 });
 
-const { form } = toRefs(details);
+// 组件实例
+/** 表单 */
+const formRef = ref();
 
 const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
   details.dialogImageUrl = uploadFile.url!;
   details.popUpShow.imgVisited = true;
 };
 
+/** 获取订单异动记录列表 */
+const initTransactionList = async () => {
+  const res = await postFindChangesRecordList({ orderInfoId: $route.query.orderInfoId });
+  const { data, code } = res.data;
+  if (code !== 200) return;
+  details.data = data || [];
+};
+
+initTransactionList();
+
+const onLoad = async () => {
+  console.log('$route :>> ', $route);
+  try {
+    details.loadingObj.pageLoading = true;
+    for (let index = 0; index < details.formOption.length; index++) {
+      const value = details.formOption[index];
+      details.form[value.prop] = value.type === 'num' ? 0 : '';
+    }
+    const res = await postFindOrderDetail({ orderInfoId: $route.query.orderInfoId });
+
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+    details.pageInfo = data || {};
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+onLoad();
+
 const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
   console.log(uploadFile, uploadFiles);
 };
+
+/** 查询目的仓 */
+const remoteMethod = async val => {
+  try {
+    details.loadingObj.loading = true;
+    const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val });
+    const { data, code } = res.data;
+    if (code !== 200) return;
+    details.warehouseList = data || [];
+  } catch (error) {
+  } finally {
+    details.loadingObj.loading = false;
+  }
+};
+
+remoteMethod('');
+
+/** 目的仓选择时给目的仓名称赋值 */
+const destinationWarehouseNameChange = val => {
+  let _item: any = {};
+
+  for (const iterator of details.warehouseList) {
+    if (iterator.warehouseId !== val) continue;
+    _item = iterator;
+    break;
+  }
+
+  details.form.statisticsWarehouseName = _item.warehouseName || '';
+  details.form.statisticsWarehouseId = _item.warehouseId || '';
+
+  console.log('details.form :>> ', details.form);
+};
+
+/** 关闭 */
+const handleClose = () => {};
+
+/** 提交 */
+const handleSubmit = () => {
+  formRef.value.validate(async valid => {
+    if (!valid) return;
+
+    ElMessageBox.confirm('确定提交吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(async () => {
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = { ...details.form };
+        submitData.orderInfoId = $route.query.orderInfoId;
+        submitData.changesPhotoUrls = details.fileList.map(item => item.url);
+
+        const res = await postAddChangesRecord(submitData);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return;
+
+        ElMessage.success('提交成功');
+
+        handleClose();
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
+    });
+  });
+};
+
+/** 重置 */
+const handleReset = () => {
+  formRef.value.resetFields();
+};
 </script>
 
 <style scoped lang="scss">
@@ -536,6 +691,20 @@ const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
   }
 }
 
+// 底部站位
+.footer {
+  height: 60px;
+}
+
+// 底部按钮
+.footer_container {
+  position: fixed;
+  bottom: 30px;
+  left: 0;
+  z-index: 10;
+  width: 100%;
+}
+
 .algin_center {
   display: flex;
   align-items: center;
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 84381648..8b59dfec 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -638,28 +638,36 @@ const printTemplate = () => {
 };
 
 /** 入库 */
-const handlePutInStorage = row => {
+const handlePutInStorage = ({ row }) => {
   ElMessageBox.confirm('确认直接入库吗?', '警告', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   })
     .then(async () => {
-      const submitData = {
-        orderPackageCode: row.orderPackageCode,
-        /** 直接入库 */
-        incomingType: '3',
-      };
-
-      const res = await getopenOrderIncomingPackage(submitData);
-      const { code } = res.data;
-
-      if (code !== 200) return;
-      initPage();
-      ElMessage({
-        type: 'success',
-        message: '入库成功',
-      });
+      try {
+        details.loadingObj.pageLoading = true;
+
+        const submitData = {
+          orderPackageCode: row.orderPackageCode,
+          /** 直接入库 */
+          incomingType: '3',
+        };
+
+        const res = await getopenOrderIncomingPackage(submitData);
+        const { code } = res.data;
+
+        if (code !== 200) return;
+        onLoad();
+        ElMessage({
+          type: 'success',
+          message: '入库成功',
+        });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        details.loadingObj.pageLoading = false;
+      }
     })
     .catch(() => {});
 };
@@ -698,7 +706,7 @@ const handleBatchPutInStorage = () => {
         const { code } = res.data;
 
         if (code !== 200) return;
-        initPage();
+        onLoad();
         ElMessage({
           type: 'success',
           message: '入库成功',