From 9dc4cdb6b980cf39c150c926117ae89c8aa37430 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 23 Apr 2024 16:40:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7+=C2=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts        | 49 +++++++++++++++++--
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 0fa26091c..4541e64ad 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -82,6 +82,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '要货计划单号',
     field: 'ppNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -118,6 +119,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '联系人姓名',
     field: 'contactName',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -126,6 +128,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '联系人电话',
     field: 'contactPhone',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -134,6 +137,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '联系人电子邮件',
     field: 'contactEmail',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -142,6 +146,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '供应商发货仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -156,6 +161,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -165,6 +171,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '到月台代码',
     field: 'toDockCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -174,6 +181,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '时间窗口',
     field: 'timeWindow',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -190,6 +198,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -204,6 +213,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '承运商',
     field: 'carrierCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -213,6 +223,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'transferMode',
     dictType: DICT_TYPE.TRANSFER_MODE,
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -221,6 +232,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '车牌号',
     field: 'vehiclePlateNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -256,6 +268,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -274,6 +287,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -287,6 +301,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -309,6 +324,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -353,7 +369,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     isForm:false,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     table: {
       width: 150
@@ -373,6 +389,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -394,6 +411,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false
   },
   {
@@ -401,7 +419,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     isForm:false,
     table: {
@@ -422,7 +440,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -443,7 +461,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -554,12 +572,13 @@ export const SupplierdeliverRequestMainRules = reactive({
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '订单号',
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch:true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -626,6 +645,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
@@ -645,6 +665,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     tableForm: {
       disabled: true
     }
@@ -705,6 +726,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -728,6 +750,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '过期日期',
+    hiddenInMain:true,
     field: 'expireDate',
     formatter: dateFormatter2,
     detail: {
@@ -782,6 +805,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -802,6 +826,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '供应商计量数量',
     field: 'supplierPackQty',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -825,6 +850,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'supplierPackUnit',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    hiddenInMain:true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -838,6 +864,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '转换率',
+    hiddenInMain:true,
     field: 'convertRate',
     sort: 'custom',
     table: {
@@ -858,6 +885,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '单据号',
+    hiddenInMain:true,
     field: 'number',
     sort: 'custom',
     table: {
@@ -893,6 +921,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -903,6 +932,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -913,6 +943,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -923,6 +954,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -933,6 +965,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -943,6 +976,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -953,6 +987,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -976,6 +1011,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -995,6 +1031,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 180
@@ -1009,6 +1046,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
@@ -1016,6 +1054,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },

From f7eae42c2b99394a00a4b51a37e01d5267f254cb Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 23 Apr 2024 17:18:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6+?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts        | 67 ++++++++++++++++---
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 816f46cf4..d2131a944 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -46,16 +46,19 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isForm: false,
     isSearch: true,
   },
   {
-    label: '采购订单',
+    label: '采购订单号',
     field: 'ppNumber',
     sort: 'custom',
     table: {
       width: 180
     },
+    isSearch:true,
+    sortTableDefault:4,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -83,16 +86,21 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isSearch:true,
+    sortSearchDefault:3,
     isForm: true,
+    sortTableDefault:2
   },
   {
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
+    sortTableDefault:1,
     table: {
       width: 150
     },
     isSearch: true,
+    sortSearchDefault:2,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -159,7 +167,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '车牌号',
@@ -189,6 +197,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -198,6 +207,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -208,7 +218,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -220,7 +230,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -231,6 +241,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -240,6 +251,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -249,6 +261,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '到月台代码',
     field: 'toDockCode',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -258,6 +271,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -299,6 +313,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -308,6 +323,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -330,6 +346,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isForm: false,
+    isTable: false,
   },
   // {
   //   label: '截止时间',
@@ -380,8 +397,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
+    sortTableDefault:3,
     isForm:false,
     sort: 'custom',
     table: {
@@ -399,7 +417,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -420,7 +438,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -441,7 +459,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -488,6 +506,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isForm: false,
+    isTable: false,
     isSearch: false,
   },
   {
@@ -548,11 +567,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     isTableForm: false,
+    hiddenInMain:true,
     isForm: false
   },
   {
     label: '订单号',
     field: 'poNumber',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -596,6 +617,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:5,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -636,6 +658,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isForm: false,
   },
   {
@@ -645,6 +668,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isSearch:true,
+    sortTableDefault:6,
     tableForm:{
       disabled: true
     },
@@ -661,6 +686,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:7,
     isTableForm: false,
     isForm: false
   },
@@ -671,6 +697,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -681,6 +708,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -691,6 +719,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -728,6 +757,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         precision: 6
       },
     },
+    hiddenInMain:true,
     tableForm: {
       type: 'InputNumber',
       min: 1,
@@ -741,6 +771,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -764,6 +795,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:10,
     tableForm: {
       type: 'Select',
       disabled: true
@@ -782,6 +814,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         disabled: true
       }
     },
+    sortTableDefault:11,
     tableForm:{
       disabled:true
     },
@@ -794,6 +827,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:12,
     form: {
       componentProps: {
         isSearchList: true,
@@ -848,6 +882,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:13,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -891,6 +926,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -910,6 +946,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    sortTableDefault:8,
     table: {
       width: 150
     },
@@ -938,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -964,6 +1002,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -986,6 +1025,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:12,
     isTableForm: false,
     isForm: false
   },
@@ -1000,6 +1040,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
     tableForm: {
@@ -1022,6 +1063,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         precision: 6
       },
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -1035,6 +1077,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
     tableForm: {
@@ -1048,6 +1091,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -1064,6 +1108,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -1078,6 +1123,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -1088,6 +1134,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -1098,6 +1145,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -1108,6 +1156,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建者',
@@ -1116,6 +1165,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -1130,6 +1180,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {

From b0f1bce9577a73cc56598999fd544adbd36fdfb0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 23 Apr 2024 17:53:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1+=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptJobMain.data.ts            | 98 +++++++++++++++----
 1 file changed, 80 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 6b35d7e79..952bc0156 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { fa } from 'element-plus/es/locale'
 
 /**
  * @returns {Array} 采购收货任务主表
@@ -14,6 +15,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
+    sortSearchDefault:1
   },
   {
     label: '申请单号',
@@ -22,7 +24,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '发货单号',
@@ -31,11 +33,13 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isSearch: true
   },
   {
     label: '要货计划单号',
     field: 'ppNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -44,15 +48,18 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
+    sortTableDefault:1,
     table: {
       width: 150
     },
     isSearch: true,
+    sortSearchDefault:2
   },
   {
     label: '到月台代码',
     field: 'toDockCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -64,6 +71,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1010
   },
   {
     label: '数据来源',
@@ -87,6 +95,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1011
   },
   {
     label: '车牌号',
@@ -95,11 +104,13 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1012
   },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -108,6 +119,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -128,6 +140,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -151,6 +164,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -169,7 +183,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -187,6 +201,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -211,6 +226,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -222,6 +238,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -233,6 +250,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '岗位',
@@ -241,6 +259,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '承接人',
@@ -249,6 +268,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '承接时间',
@@ -261,6 +281,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -277,6 +298,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '完成时间',
@@ -289,6 +311,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -303,7 +326,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -314,7 +337,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -327,6 +350,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '到库区代码范围',
@@ -335,6 +359,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '业务类型',
@@ -343,6 +368,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '备注',
@@ -351,6 +377,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '创建者',
@@ -359,6 +386,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '创建时间',
@@ -371,6 +399,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -385,7 +414,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -404,7 +433,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -423,7 +452,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -442,7 +471,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -461,7 +490,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -480,7 +509,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -499,7 +528,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -518,7 +547,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -537,7 +566,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -556,7 +585,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -645,11 +674,15 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    sortTableDefault:1001,
+    sortSearchDefault:1002
   },
   {
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -661,6 +694,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1000,
+    sortSearchDefault:1000,
+    isSearch:true
   },
   {
     label: '替代批次',
@@ -669,6 +705,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到货日期',
@@ -681,6 +718,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -702,6 +740,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -723,6 +762,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -743,6 +783,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库位代码',
@@ -751,6 +792,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1005
   },
   {
     label: '到库位代码',
@@ -759,14 +801,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1006
   },
   {
-    label: '订单号',
+    label: '采购订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch:true,
+    
   },
   {
     label: '订单行',
@@ -785,7 +830,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:1003
   },
   {
     label: '包装规格',
@@ -796,6 +842,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1002
   },
   {
     label: '供应商计量数量',
@@ -804,6 +851,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
@@ -818,6 +866,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '转换率',
@@ -828,7 +877,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true,
   },
   {
     label: '从货主代码',
@@ -837,6 +887,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -845,6 +896,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -853,6 +905,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true
   },
   {
     label: '物料名称',
@@ -869,6 +922,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -877,6 +931,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -885,6 +940,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -895,7 +951,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    hiddenInMain:true,
   },
   {
     label: '计量单位',
@@ -907,6 +964,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1004
   },
   {
     label: '单据号',
@@ -915,6 +973,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '备注',
@@ -923,6 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建者',
@@ -931,6 +991,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -951,6 +1012,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    hiddenInMain:true,
   },
   {
     label: '操作',