From df4d0f2070f349b24c94bf904e10c09a88881007 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 22 Nov 2024 17:33:31 +0800
Subject: [PATCH] =?UTF-8?q?YT-1221=E9=9D=9E=E4=B8=B0=E7=94=B0=E8=A1=A5?=
 =?UTF-8?q?=E7=BB=99=E5=93=81=E5=8F=91=E8=B4=A7=EF=BC=8C=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=BA=94=E6=98=AF=E9=9D=9E=E4=B8=B0=E7=94=B0?=
 =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91=E8=B4=A7=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E7=89=88=E4=B9=9F=E5=BA=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?YT-1222=E9=9D=9E=E4=B8=B0=E7=94=B0=E8=A1=A5=E7=BB=99=E5=93=81?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=EF=BC=8C=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=B1=BB=E5=9E=8B=E5=BA=94=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverJobMain/deliverJobMain.data.ts     |  7 ++++---
 .../deliverRecordMain/deliverRecordMain.data.ts       |  7 ++++---
 .../deliverRequestMain/deliverRequestMain.data.ts     | 11 ++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 8aa858867..72ef90780 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -68,10 +68,11 @@ export const DeliverJobMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      isSearch: true,
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isSearch: false,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index aa1ef591c..6d87a4b22 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -108,10 +108,11 @@ export const DeliverRecordMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      isSearch: true,
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isSearch: false,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 9648aeb67..d9fff17f2 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -196,17 +196,14 @@ export const DeliverRequestMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isSearch: false,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
       }
     },
     {