From 3e4f2824137a1717c91cb24ed176794e05bf413f Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 9 Jan 2024 20:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arteryDistrilbutionBillLadingList.js      | 34 +++++++++----------
 .../distribution/artery/AddVehicleStowage.vue |  5 ++-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index aaffbdfe..2e8842a7 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -251,7 +251,7 @@ export const columnDetailList = [
   {
     prop: 'billladingCode',
     label: '提货批次',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -262,7 +262,7 @@ export const columnDetailList = [
   {
     prop: 'orderPackageCode',
     label: '包件码',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -273,7 +273,7 @@ export const columnDetailList = [
   {
     prop: 'driverName',
     label: '提货司机',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -283,7 +283,7 @@ export const columnDetailList = [
   {
     prop: 'carNumber',
     label: '提货车牌',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -293,7 +293,7 @@ export const columnDetailList = [
   {
     prop: 'waybillNo',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -303,7 +303,7 @@ export const columnDetailList = [
   {
     prop: 'orderCode',
     label: '合同号',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -313,7 +313,7 @@ export const columnDetailList = [
   {
     prop: 'destination',
     label: '目的地',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -323,7 +323,7 @@ export const columnDetailList = [
   {
     prop: 'incomingType',
     label: '入库类型',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -333,7 +333,7 @@ export const columnDetailList = [
   {
     prop: '',
     label: '是否齐套',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -343,7 +343,7 @@ export const columnDetailList = [
   {
     prop: 'trayCode',
     label: '托盘码',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -353,7 +353,7 @@ export const columnDetailList = [
   {
     prop: 'firstPickName',
     label: '一级品类',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -363,7 +363,7 @@ export const columnDetailList = [
   {
     prop: 'secondPickName',
     label: '二级品类',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -373,7 +373,7 @@ export const columnDetailList = [
   {
     prop: 'thirdPickName',
     label: '三级品类',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -383,7 +383,7 @@ export const columnDetailList = [
   {
     prop: 'materialName',
     label: '物料名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -393,7 +393,7 @@ export const columnDetailList = [
   {
     prop: 'brand',
     label: '品牌',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -403,7 +403,7 @@ export const columnDetailList = [
   {
     prop: '',
     label: '操作仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -413,7 +413,7 @@ export const columnDetailList = [
   {
     prop: 'createUserName',
     label: '操作人',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index aa207831..307f83ee 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -1336,9 +1336,9 @@ const handleAddWaybill = async (index: number) => {
           nodeName: details.pageInfo.startWarehouseInfo.warehouseName,
           orderCode: val.orderCode,
           waybillNo: val.waybillNo,
-          totalNum: val.stockNum,
+          totalNum: val.totalNum,
           planNum: val.stockNum,
-          type: 1,
+          type: val.type,
           finalNodeId: _node.nodeId,
         };
       }),
@@ -1519,7 +1519,6 @@ const addSubmit = async () => {
           value.nodeId = submitData.startWarehouseId;
           value.nodeName = submitData.startWarehouseName;
           value.finalNodeId = val.nodeId;
-          value.totalNum = 20;
           return value;
         }),
       ];