From 39e64812289ed137c6f2b2c7a69798a52c66a049 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 24 Dec 2024 17:18:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportformsOption/CheckWaybillConfig.js       | 15 +++++++++++++--
 src/option/reportformsOption/DespatchConfig.js    | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/option/reportformsOption/CheckWaybillConfig.js b/src/option/reportformsOption/CheckWaybillConfig.js
index 96f5b5e0..41b7c594 100644
--- a/src/option/reportformsOption/CheckWaybillConfig.js
+++ b/src/option/reportformsOption/CheckWaybillConfig.js
@@ -15,8 +15,19 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'warehouseName',
-    label: '仓库',
+    prop: 'departureWarehouseName',
+    label: '始发仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
     type: 1,
     values: '',
     width: '150',
diff --git a/src/option/reportformsOption/DespatchConfig.js b/src/option/reportformsOption/DespatchConfig.js
index 96f5b5e0..41b7c594 100644
--- a/src/option/reportformsOption/DespatchConfig.js
+++ b/src/option/reportformsOption/DespatchConfig.js
@@ -15,8 +15,19 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'warehouseName',
-    label: '仓库',
+    prop: 'departureWarehouseName',
+    label: '始发仓',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
     type: 1,
     values: '',
     width: '150',