From 52e34c1fe1dd3f84752fced19485d6f758df5da1 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 26 Apr 2024 15:53:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E8=A3=85?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptJobMain.data.ts             | 19 ++++++++++++++++++-
 .../productreceiptAssembleJobMain.data.ts     | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 3ecc36f5d..9a842b2af 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -670,6 +670,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -691,6 +692,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -712,6 +714,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -722,8 +725,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '到库位代码',
-    
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -731,6 +734,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '订单号',
+    hiddenInMain:true,
     field: 'woNumber',
     sort: 'custom',
     table: {
@@ -740,6 +744,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -748,6 +753,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -759,6 +765,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -788,6 +795,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -796,6 +804,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -804,6 +813,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -813,6 +823,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -824,6 +835,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -834,6 +846,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 180
@@ -842,6 +855,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -850,6 +864,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -858,6 +873,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -878,6 +894,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 27f646072..0a3a82783 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -672,6 +672,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -693,6 +694,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -714,6 +716,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -725,6 +728,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位代码',
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -733,6 +737,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'woNumber',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -741,6 +746,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -749,6 +755,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -760,6 +767,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -789,6 +797,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -797,6 +806,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -805,6 +815,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -814,6 +825,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -825,6 +837,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -835,6 +848,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 180
@@ -843,6 +857,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -851,6 +866,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -859,6 +875,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -879,6 +896,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150

From 8c28197e22030449f31d243c551423dab1c14754 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 26 Apr 2024 16:06:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptJobMain.data.ts                     | 11 +++++++++++
 .../productreceiptAssembleJobMain.data.ts             | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 9a842b2af..b85e7a8fa 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -652,6 +652,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -693,6 +694,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '过期日期',
     field: 'expireDate',
     hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -735,6 +737,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     hiddenInMain:true,
+    isTable:false,
     field: 'woNumber',
     sort: 'custom',
     table: {
@@ -745,6 +748,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '订单行',
     field: 'woLine',
     hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -753,6 +757,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -795,6 +800,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -804,6 +810,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -813,6 +820,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -846,6 +854,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -855,6 +864,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -894,6 +904,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 0a3a82783..e8f8bc2ea 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -654,6 +654,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -695,6 +696,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '过期日期',
     field: 'expireDate',
     hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -738,6 +740,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '订单号',
     field: 'woNumber',
     hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -747,6 +750,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '订单行',
     field: 'woLine',
     hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -755,6 +759,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -797,6 +802,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -806,6 +812,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -815,6 +822,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -848,6 +856,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -857,6 +866,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {
@@ -896,6 +906,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货主代码',
     field: 'toOwnerCode',
+    isTable:false,
     hiddenInMain:true,
     sort: 'custom',
     table: {

From 52823b1d2d25bcb7583f32a8ad08f5d76832890f Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 26 Apr 2024 16:18:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?2024-04-26=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=8D=95=E7=BB=88=E6=AD=A2=E3=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/orderDay/index.ts                 |  6 +-
 src/api/mes/workScheduling/index.ts           | 20 +++--
 .../mes/orderDay/components/BasicFormV2.vue   |  6 +-
 .../mes/orderDay/components/schedule.vue      | 42 +++++++++--
 src/views/mes/orderDay/index.vue              | 52 +++++++------
 src/views/mes/orderDay/orderDay.data.ts       | 21 ++++--
 src/views/mes/workScheduling/index.vue        | 75 ++++++++++++-------
 .../mes/workScheduling/workScheduling.data.ts | 36 ++++++---
 8 files changed, 171 insertions(+), 87 deletions(-)

diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts
index 00f348d3e..0ccc0f3ee 100644
--- a/src/api/mes/orderDay/index.ts
+++ b/src/api/mes/orderDay/index.ts
@@ -99,9 +99,9 @@ export const getPlanDevices = async (params)  => {
 
 ///发布计划
 export const publishPlan = async (data: OrderDayVO)  => {
-  return await request.post({ url: `/mes/orderday/publishPlan`,data })
+  return await request.postOriginal({ url: `/mes/orderday/publishPlan`,data })
 }
 //终止计划
-export const stopPlan = async (params)  => {
-  return await request.post({ url: `/mes/orderday/stopPlan`,params })
+export const stopPlan = async (id)  => {
+  return await request.post({ url: `/mes/orderday/stopPlan/`+id })
 }
\ No newline at end of file
diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index 08591d25b..d17a72c52 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -9,38 +9,42 @@ export const getWorkSchedulingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/mes/work-scheduling/senior', data })
+    return await request.post({ url: '/mes/workScheduling/senior', data })
   } else {
-    return await request.get({ url: `/mes/work-scheduling/page`, params })
+    return await request.get({ url: `/mes/workScheduling/page`, params })
   }
 }
 
 // 查询生产任务排产详情
 export const getWorkScheduling = async (id: number) => {
-  return await request.get({ url: `/mes/work-scheduling/get?id=` + id })
+  return await request.get({ url: `/mes/workScheduling/get?id=` + id })
 }
 
 // 新增生产任务排产
 export const createWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.post({ url: `/mes/work-scheduling/create`, data })
+  return await request.post({ url: `/mes/workScheduling/create`, data })
 }
 
 // 修改生产任务排产
 export const updateWorkScheduling = async (data: WorkSchedulingVO) => {
-  return await request.put({ url: `/mes/work-scheduling/update`, data })
+  return await request.put({ url: `/mes/workScheduling/update`, data })
+}
+// 更改生产任务状态
+export const updateWorkSchedulingStatus = async (data: any) => {
+  return await request.put({ url: `/mes/workScheduling/updateStatus`, data })
 }
 
 // 删除生产任务排产
 export const deleteWorkScheduling = async (id: number) => {
-  return await request.delete({ url: `/mes/work-scheduling/delete?id=` + id })
+  return await request.delete({ url: `/mes/workScheduling/delete?id=` + id })
 }
 
 // 导出生产任务排产 Excel
 export const exportWorkScheduling = async (params) => {
-  return await request.download({ url: `/mes/work-scheduling/export-excel`, params })
+  return await request.download({ url: `/mes/workScheduling/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/mes/work-scheduling/get-import-template' })
+  return request.download({ url: '/mes/workScheduling/get-import-template' })
 }
\ No newline at end of file
diff --git a/src/views/mes/orderDay/components/BasicFormV2.vue b/src/views/mes/orderDay/components/BasicFormV2.vue
index a155e9cdc..6c9c1b02c 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -4,11 +4,11 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
   <div style="max-height: 60vh;overflow-y: auto;">
     <Form
-      ref="formRef"
-      v-loading="formLoading"
+      ref="formRef" 
       :rules="rules"
       :schema="formSchema"
       :is-col="true"
@@ -304,7 +304,9 @@ if (props.isShowFooterButtton) {
 const buttonBaseClick = (val) => {
   // 保存
   if (val == 'save') {
+    
     submitForm()
+    
   }
   // 关闭
   else if (val == 'close') {
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 7ca6b31d2..cc2d11429 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -4,6 +4,7 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    :vLoading="formLoading"
   >
     <ContentWrap>
       <Descriptions
@@ -178,7 +179,7 @@
       </el-dialog>
     </ContentWrap>
     <template #footer>
-      <el-button @click="publishPlan">发布计划</el-button>
+      <el-button @click="publishPlan" >发布计划</el-button>
     </template>
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
   </Dialog>
@@ -211,11 +212,11 @@ const graph = ref<Graph>()
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const activeName = ref('process')
-const loading = ref(true)
+const formLoading = ref(false)
 const dialogFormVisibleUser = ref(false)
 const processData = ref([])
 const processCode = ref('')
-
+//const isPublish=ref(false)
 const queryParams:orderDayconfigApi.OrderDayQueryParamVo=ref()
 const props = defineProps({
   // 查询弹窗是否显示筛选按钮
@@ -411,7 +412,26 @@ const opensearchTable = (
     true
   )
 }
-const publishPlan= async ()=>{
+const publishPlan=()=>{
+     message.confirm("确认发布当前计划？","question").then(async () => {
+      //isPublish.value=true
+      //loading.value = true,
+      try{formLoading.value=true
+      doPublishPlan() }finally{
+        formLoading.value=false;
+      }
+     // loading.value = false,
+      dialogVisible.value = false,
+      //isPublish.value=false,
+      emit('close')
+     }).catch(() => {
+      message.info("已取消发布")
+     })
+     
+    
+}
+const doPublishPlan=  ()=>{
+  
   let data ={
   updateId: detailData.value.id,
   status: detailData.value.status,
@@ -432,8 +452,14 @@ const publishPlan= async ()=>{
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode
 }
-  console.log("-------",data)
-  await OrderDayApi.publishPlan(data)
+  //console.log("-------",data)
+  let res = OrderDayApi.publishPlan(data)
+  if(res.code==0){
+    message.success("计划发布成功")
+  }else {
+    message.error(res.msg)
+  }
+
 }
 // 弹层确定返回所选数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
@@ -623,6 +649,10 @@ const getTeamList = async (params:any) => {
 
 defineOptions({ name: 'SechledDetail' })
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+// 传递给父类
+const emit = defineEmits([
+  'close'
+])
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index a241bf85b..a4b55b138 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -57,11 +57,12 @@
     :isBusiness="false"
     :isSearchFilterButtonHide="true"
     @onChange="valueChange"
+   
   />
 
   <!-- 详情 -->
   <orderDetail ref="detailRef" :all-schemas="OrderDay.allSchemas" />
-  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75"/>
+  <scheduleDetail ref="scheduleDetailRef"  :all-schemas="OrderDay.allSchemas" :basicFormWidth="75" @close="publishClosed" />
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
@@ -81,8 +82,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import orderDetail from './components/orderDetail.vue'
 import scheduleDetail from './components/schedule.vue'
-import { Loading } from 'node_modules/element-plus/es/components/loading/src/service'
-import { loadavg } from 'os'
+
 defineOptions({ name: 'MesOrderDay' })
 
 const message = useMessage() // 消息弹窗
@@ -195,6 +195,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const publishClosed=()=>{
+    //console.log('publishClosed')
+    getList()
+}
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   //console.log('row',row)
@@ -206,6 +210,7 @@ const isShowMainButton = (row,val) => {
 }
 // 列表-操作按钮
 // 列表-操作按钮
+//TERMINALE("4", "已终止"),PROCESSING("3", "生产中"),PUBLISHED("2", "待开工"),WAITSECHUDLE("1", "待排产"),CANCELED("-2", "已取消"),WAITREADY("-1", "待齐套");
 const butttondata = (row) => {
      //console.log('row2',row)
     return [
@@ -227,11 +232,11 @@ const butttondata = (row) => {
     //   hasPermi: ''}), // 路由设置
       defaultButtons.mainListHandleBtn({label: '终止',
       name: 'stopPlan',
-      hide: isShowMainButton(row,['1','2','3']),
+      hide: isShowMainButton(row,['-1','1','2','3']),
       type: 'warning',
       icon: '',
       color: '',
-      hasPermi: ''}), // 路由设置
+      hasPermi: 'mes:orderDay:update'}), // 路由设置
     ]
 }
 
@@ -244,6 +249,8 @@ const buttonTableClick = async (val, row) => {
     handleDelete(row.id)
   } else if(val=='publish'){  //发布计划
     openScheduledDetail( '发布计划', row,row.planNoDay)
+  }else if(val=='stopPlan'){  //终止计划
+    stopPlan(row.id)
   }
 }
 
@@ -255,25 +262,23 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-
-  var isHave =OrderDay.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
   
   if (formType === 'create') {
-    await OrderDayApi.createOrderDay(data)
-    message.success(t('common.createSuccess'))
+    let ret=await OrderDayApi.createOrderDay(data)
+    if(ret===undefined || ret===null){
+      message.error(t('common.networkError'))
+    }else{
+      message.success(t('common.createSuccess'))
+    }
+   
   } else {
-    await OrderDayApi.updateOrderDay(data)
-    message.success(t('common.updateSuccess'))
+    let ret=await OrderDayApi.updateOrderDay(data)
+    if(ret.code==0){
+      message.success(t('common.updateSuccess'))
+    }else{
+      message.error(t('common.networkError'))
+    }
+    
   }
   
   basicFormRef.value.dialogVisible = false
@@ -318,7 +323,10 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-
+const stopPlan = async (id) => {
+   await OrderDayApi.stopPlan(id)
+   getList()
+}
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
index a67084f4d..23b0177c5 100644
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -263,7 +263,9 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'planDate',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
+    isForm:false,
+    isTable:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -286,11 +288,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     required: true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
-        //valueFormat: 'x',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
@@ -301,10 +304,12 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isReadonly:true,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
-        type: 'time',
-        dateFormat: 'HH:mm',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        timeFormat:"HH:mm"
       }
     },
   },
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index d41e3d2bc..59b9e7fe0 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -27,13 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #planMaserCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.planMaserCode)">
+      <template #schedulingCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
           <span>{{ row.planMaserCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -81,6 +81,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from './components/Detail.vue'
+import { async } from '@antv/x6/lib/registry/marker/async'
 
 defineOptions({ name: 'MesWorkScheduling' })
 
@@ -100,7 +101,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  //console.log('row',row)
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -115,9 +124,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:workScheduling:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:workScheduling:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:workScheduling:export'}), // 导出
+  //defaultButtons.defaultAddBtn({hasPermi:'mes:workScheduling:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:workScheduling:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:workScheduling:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -146,19 +155,36 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+// ONERROR("-3", "异常"),
+//     TERMINALE("-2", "已终止"),
+//     WAITBEGIN("-1", "待齐套"),
+//     READYTODO("0", "待开工"),
+//     WORKING("1", "生产中"),
+//     WAITMATERIAL("2", "待配料"),
+//     PAUSE("3", "已暂停"),
+//     WAITREPORT("4", "待报工"),
+//     WAITFCHECK("5", "待质检"),
+//     FINISHED("9", "已完成");
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:workScheduling:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:workScheduling:delete'}), // 删除
-]
+const butttondata=(row) =>{ return [
+  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
+  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // 
+  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), 
+  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), 
+  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // 
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+  } else if (val == 'terminate') { // 终止
+    changeBillStatus(row,"-2")
+  }else if (val == 'pause') { // 暂停
+    changeBillStatus(row,"3")
+  }else if (val == 'resume') { // 恢复
+    changeBillStatus(row,"0")
   }
 }
 
@@ -197,18 +223,15 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkScheduling')
 }
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await WorkSchedulingApi.deleteWorkScheduling(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+//  改变工单状态
+const changeBillStatus=async(row,status)=>{
+    ///message.alertWarning("暂不支持该功能")
+    let data={
+      id:row.id,
+      status:status
+    }
+     WorkSchedulingApi.updateWorkSchedulingStatus(data);
+     getList()
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/mes/workScheduling/workScheduling.data.ts b/src/views/mes/workScheduling/workScheduling.data.ts
index 3201a4e1f..81b8a9224 100644
--- a/src/views/mes/workScheduling/workScheduling.data.ts
+++ b/src/views/mes/workScheduling/workScheduling.data.ts
@@ -41,17 +41,16 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '计划编号',
     field: 'planMaserCode',
     sort: 'custom',
     isSearch: true,
-    isForm: false,
+    isForm: true,
   },
   {
-    label: '任务编号',
+    label: '工单编号',
     field: 'schedulingCode',
     sort: 'custom',
     isSearch: true,
@@ -89,7 +88,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划数量',
     field: 'planCount',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
   {
     label: '完工数量',
@@ -114,6 +113,12 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'flagDo',
     sort: 'custom',
     isSearch: true,
+    isForm:false,
+    dictType: DICT_TYPE.MESDO_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
   {
     label: '当前工序',
@@ -122,23 +127,30 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '当前任务号',
-    field: 'workingTaskSort',
+    label: '加工序号',
+    field: 'workSort',
     sort: 'custom',
     isForm: false,
   },
   {
-    label: '工单模式',
-    field: 'formType',
+    label: '当前任务号',
+    field: 'workingTaskSort',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
   },
+  
   {
-    label: '生产序号',
-    field: 'workSort',
+    label: '工单模式',
+    field: 'formType',
     sort: 'custom',
-    isForm: false,
+    isForm: true,
+    dictType: DICT_TYPE.MES_WORKBILL_MODEL,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    },
   },
+  
   {
     label: '操作',
     field: 'action',

From e92e1387f1b1ce43642e471bb079c0e9b836d515 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 26 Apr 2024 16:44:47 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=B8=8E=E6=98=BE=E9=9A=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain.data.ts    | 141 ++++++++++++------
 1 file changed, 98 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index a7e639626..bf1a2fda8 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -67,6 +67,25 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '生产计划单号',
     field: 'productionPlanNumber',
@@ -76,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     isForm: false,
+    isTable:false,
   },
   {
     label: '车间代码',
@@ -109,6 +129,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -133,6 +154,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1001,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -150,6 +172,24 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -157,6 +197,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -164,11 +205,11 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -178,6 +219,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -193,6 +235,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -224,6 +267,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -233,6 +277,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -255,6 +300,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -277,6 +323,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '部门',
@@ -300,27 +347,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'id'
         }
       }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTable: false,
   },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -341,7 +371,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -350,14 +381,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '自动提交',
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -378,7 +410,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -399,7 +431,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -436,22 +468,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '收货类型',
-    field: 'type',
-    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'scrap',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '操作',
     field: 'action',
@@ -637,6 +653,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -647,6 +665,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -655,8 +675,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -670,6 +691,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -680,6 +703,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -690,6 +715,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -705,8 +732,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'packUnit',
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -717,6 +745,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable: false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -730,6 +760,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -744,6 +776,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1003,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
@@ -791,6 +824,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1004,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -835,6 +869,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -856,6 +891,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -866,6 +903,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -876,6 +915,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -883,6 +924,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -904,6 +946,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    sortTableDefault:1007,
     isTable: true,
     sort: 'custom',
     table: {
@@ -921,6 +964,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    sortTableDefault:1008,
     sort: 'custom',
     table: {
       width: 180
@@ -942,6 +986,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -967,6 +1013,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '备注',
     field: 'remark',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -975,6 +1023,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1009,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -998,6 +1047,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1010,
     sort: 'custom',
     table: {
       width: 150
@@ -1008,6 +1058,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable: false,
+    hiddenInMain:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1031,6 +1083,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新者',
     field: 'updater',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -1041,6 +1095,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '操作',
     field: 'action',
+    hiddenInMain:true,
     isDetail: false,
     isForm: false ,
     table: {

From d5e6881a023e08ebe8d06eef621d43a1ebdd9a0a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 26 Apr 2024 17:09:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapJobMain.data.ts        | 107 +++++++++++++-----
 1 file changed, 81 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index d88c730ec..8e9809929 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产线代码',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -40,10 +44,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产线代码',
+    field: 'productionPlanNumber',
+    isTable:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '班组',
     field: 'team',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '班次',
     field: 'shift',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -60,6 +75,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -67,6 +83,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '申请时间',
     field: 'requestTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -87,6 +104,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '要求截止时间',
     field: 'requestDueTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -104,21 +122,10 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '过期时间',
     field: 'expiredTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -139,6 +146,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -160,6 +168,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -176,6 +185,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -186,6 +196,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '优先级增量',
     field: 'priorityIncrement',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -198,6 +209,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -205,6 +217,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接人',
     field: 'acceptUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -213,6 +226,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -233,6 +247,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成人',
     field: 'completeUserId',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -241,6 +256,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '完成时间',
     field: 'completeTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -261,9 +277,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
+    isTable:false,
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -274,7 +290,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -283,6 +299,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '业务类型',
     field: 'businessType',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -291,6 +308,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -299,6 +317,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -319,6 +338,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -327,6 +347,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -337,7 +358,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -356,7 +377,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -375,7 +396,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -394,7 +415,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -413,7 +434,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -432,7 +453,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -451,7 +472,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -470,7 +491,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -489,7 +510,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -508,7 +529,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -617,6 +638,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装号',
     field: 'packingNumber',
+    sortTableDefault:1003,
     sort: 'custom',
     table: {
       width: 150
@@ -625,6 +647,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -633,6 +657,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '批次',
     field: 'batch',
+    sortTableDefault:1002,
     sort: 'custom',
     table: {
       width: 150
@@ -641,6 +666,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
+    sortTableDefault:1008,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -662,6 +688,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable:false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -683,6 +711,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    sortTableDefault:1007,
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
@@ -694,6 +723,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库位代码',
     field: 'toLocationCode',
+    sortTableDefault:1009,
     sort: 'custom',
     table: {
       width: 150
@@ -702,6 +732,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'woNumber',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -710,6 +742,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单行',
     field: 'woLine',
+    hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -718,6 +752,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装数量',
     field: 'packQty',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -729,6 +765,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
+    sortTableDefault:1004,
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
     isTable: true,
@@ -740,6 +777,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料代码',
     field: 'itemCode',
+    sortTableDefault:1000,
     sort: 'custom',
     table: {
       width: 150
@@ -748,6 +786,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料名称',
     field: 'itemName',
+    sortTableDefault:1001,
     sort: 'custom',
     table: {
       width: 150
@@ -756,6 +795,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述1',
     field: 'itemDesc1',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -764,6 +805,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '物料描述2',
     field: 'itemDesc2',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -772,6 +815,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -781,6 +826,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1005,
     table: {
       width: 150
     },
@@ -792,6 +838,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计量单位',
     field: 'uom',
     dictType: DICT_TYPE.UOM,
+    sortTableDefault:1006,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -803,6 +850,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    isTable:false,
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -810,6 +859,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -818,6 +869,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1011,
     sort: 'custom',
     table: {
       width: 150
@@ -826,6 +878,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1010,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -847,6 +900,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
+    hiddenInMain:true,
     table: {
       width: 150
     },