From d6697ae788cfb095fd917d5f8c2c13caa786e9de Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 09:16:17 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 1065befd7..64c7573dd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -139,9 +139,9 @@
     :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableFormRules="SupplierdeliverInspectionDetailRules"
-    :tableData="ploadQualityReportTableData"
-    @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
-    @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
+    :tableData="uploadQualityReportTableData"
+    @handleAddTable="handleAddQualityReport"
+    @handleDeleteTable="handleDeleteQualityReport"
     @submitForm="submitFormUploadQualityReport"
     :isShowReduceButton="true"
   >
@@ -617,7 +617,22 @@ const handleOpe = async (id: number) => {
   }
 }
 const ploadQualityReportRef = ref()
-const ploadQualityReportTableData = ref([])
+const uploadQualityReportTableData = ref([])
+
+const handleAddQualityReport = ()=>{
+  const tableFormKeys  = {}
+  SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  uploadQualityReportTableData.value.push(tableFormKeys)
+  console.log('handleAddQualityReport')
+}
+const handleDeleteQualityReport = (row,index)=>{
+  uploadQualityReportTableData.value.splice(index,1)
+  console.log('handleDeleteQualityReport',row)
+
+}
+
 /** 上传质量报告 */
 const handleUploadQualityReport  = async (row) => {
   console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
@@ -630,12 +645,12 @@ const handleUploadQualityReport  = async (row) => {
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
-  ploadQualityReportTableData.value = [tableFormKeys]
+  uploadQualityReportTableData.value = [tableFormKeys]
 }
 
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number
-  data.subList = ploadQualityReportTableData.value // 拼接子表数据参数
+  data.subList = uploadQualityReportTableData.value // 拼接子表数据参数
   if (formType === 'create') {
     await SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail(data)
     message.success(t('common.createSuccess'))

From 4894c88d1f3c0f749a654721eaafc4ccd641a0d0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 09:59:42 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=A1=A5=E6=96=99=20=E5=8F=91=E6=96=99=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=20=E4=B8=8A=E6=9E=B6--?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/issueJobMain/issueJobMain.data.ts   |   2 -
 .../issueRecordMain/issueRecordMain.data.ts   | 280 +++++++++++++-----
 .../issueRequestMain/issueRequestMain.data.ts |  11 +-
 .../productionreceiptJobMain.data.ts          |   4 +-
 .../productionreceiptRecordMain.data.ts       | 250 ++++++++++++----
 .../repleinshRecordMain.data.ts               | 196 +++++++++---
 .../repleinshRequestMain.data.ts              |   8 +-
 .../putawayRecordMain.data.ts                 |  16 +-
 8 files changed, 578 insertions(+), 189 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 37126a53c..4358a6a89 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -140,7 +140,6 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产线代码',
     field: 'detailProductionLineCode',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -150,7 +149,6 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '工位代码',
     field: 'detailWorkStationCode',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 96b413cba..8b5e1d6ca 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -13,8 +13,21 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,7 +35,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,16 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '车间代码',
@@ -40,6 +62,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -48,6 +71,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +80,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +93,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -84,6 +110,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -109,6 +136,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +157,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +174,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -164,6 +194,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +203,16 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -184,6 +225,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -193,14 +235,6 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -216,13 +250,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -231,6 +266,9 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区代码范围',
     field: 'fromAreaCodes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -243,13 +281,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -262,13 +301,14 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '使用在途库',
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -287,8 +327,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -302,6 +341,24 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -361,127 +418,160 @@ export const IssueRecordMainRules = reactive({
  */
 export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCode',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '工位代码',
-    field: 'workStationCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '从批次',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '到批次',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '工位代码',
+    field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false
   },
+  
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -490,23 +580,45 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
+  
   {
     label: '到库区代码',
     field: 'toAreaCode',
@@ -514,6 +626,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -522,6 +635,8 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
+
   },
   {
     label: '物料代码',
@@ -530,22 +645,28 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
   },
   {
-    label: '备注',
-    field: 'remark',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
     label: '创建时间',
@@ -558,6 +679,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -568,12 +690,13 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述1',
@@ -582,6 +705,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -590,6 +714,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -598,6 +723,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -606,18 +732,40 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain:true,
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
   },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
+  
   // {
   //   label: '代码',
   //   field: 'code',
@@ -626,17 +774,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '接口类型',
-    field: 'interfaceType',
-    dictType: DICT_TYPE.INTERFACE_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 68a181041..0efea8921 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -54,6 +54,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortSearchDefault:1,
   },
   {
     label: '车间代码',
@@ -85,7 +86,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isForm:false,
     isTable: true,
     sort: 'custom',
@@ -149,7 +149,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable:false,
     sort: 'custom',
     table: {
@@ -283,7 +282,6 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable:false,
     sort: 'custom',
     table: {
@@ -600,6 +598,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:4,
     sortTableDefault:6,
     isTableForm: false,
     isForm: false,
@@ -624,6 +624,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     sortTableDefault:5,
     sortSearchDefault:3,
     isTableForm: false,
@@ -649,7 +650,9 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     hiddenInMain:true,
+    sortSearchDefault:6,
   },
   {
     label: '到库位代码',
@@ -658,6 +661,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
     isTable:false,
     sortSearchDefault:6,
     sortTableDefault:1100,
@@ -671,6 +675,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
     sortSearchDefault:2,
     sortTableDefault:3,
     tableForm:{
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index 7aa47aac0..590a3eeec 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -13,6 +13,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true,
   },
   {
@@ -23,7 +24,6 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable: false,
-    isSearch: true,
   },
   {
     label: '车间代码',
@@ -99,7 +99,6 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -348,7 +347,6 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: false,
     sort: 'custom',
     table: {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index b1799c14d..5cdc61cf4 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -13,8 +13,21 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '发料记录单号',
     field: 'issueRecordNumber',
@@ -22,7 +35,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '车间代码',
@@ -40,6 +53,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -48,6 +62,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +71,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +84,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -84,6 +101,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     detai: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -109,6 +127,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +148,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +165,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -164,6 +185,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +194,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -180,6 +203,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -192,6 +216,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -208,26 +233,31 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从库区类型范围',
-    field: 'fromAreaTypes',
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -235,13 +265,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,13 +285,14 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
-    label: '使用在途库',
-    field: 'useOnTheWayLocation',
+    label: '是否可用',
+    field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -275,12 +307,11 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '是否可用',
-    field: 'available',
+    label: '使用在途库',
+    field: 'useOnTheWayLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -293,7 +324,25 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
         activeValue: 'TRUE'
       }
     }
-  }
+  },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -353,44 +402,54 @@ export const ProductionreceiptRecordMainRules = reactive({
  */
 export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCode',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '工位代码',
-    field: 'workStationCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
-    label: '在途库库位',
-    field: 'onTheWayLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '从批次',
@@ -399,6 +458,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到批次',
@@ -407,6 +469,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '库存状态',
@@ -419,6 +484,33 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -426,6 +518,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -434,6 +527,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库区代码',
@@ -442,6 +536,16 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
   },
   {
     label: '到库位代码',
@@ -450,6 +554,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位组代码',
@@ -458,6 +563,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -466,6 +572,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -474,6 +581,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -482,6 +590,19 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
+  },
+  
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
   },
   {
     label: '备注',
@@ -490,6 +611,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -502,6 +624,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -518,16 +641,8 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -535,6 +650,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
 
   {
@@ -544,6 +660,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -552,6 +669,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -560,21 +678,11 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -585,15 +693,8 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -601,6 +702,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到器具号',
@@ -609,23 +711,51 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '生产线代码',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
+
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    hiddenInMain:true,
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
   },
+  
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  
+  
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 3de9f2a92..95b6c3299 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -13,8 +13,21 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,7 +35,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
   },
   {
     label: '任务单号',
@@ -31,7 +44,16 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true
+    isTable: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -40,6 +62,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -48,6 +71,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '执行时间',
@@ -60,6 +85,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -76,6 +102,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -101,6 +128,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -121,6 +149,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -137,13 +166,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -156,6 +186,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -164,6 +195,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -172,6 +204,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -184,6 +217,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -208,6 +242,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -216,13 +251,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -235,13 +271,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,14 +291,14 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -275,6 +312,24 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -340,6 +395,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到包装号',
@@ -348,6 +405,38 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    hiddenInMain: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:8,
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
   },
   {
     label: '从批次',
@@ -356,6 +445,9 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:3,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '到批次',
@@ -364,6 +456,9 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortSearchDefault:4,
+    isSearch: true,
+    hiddenInMain: true
   },
   {
     label: '库存状态',
@@ -376,6 +471,24 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -383,6 +496,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库位代码',
@@ -391,6 +505,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '从库位组代码',
@@ -399,6 +514,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '从库区代码',
@@ -407,6 +523,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到货主代码',
@@ -415,6 +532,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位代码',
@@ -423,6 +541,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '到库位组代码',
@@ -431,6 +550,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -439,6 +559,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -447,6 +568,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -455,6 +577,18 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    sortSearchDefault:2,
+    sortTableDefault:4,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
   },
   {
     label: '备注',
@@ -463,6 +597,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -475,6 +610,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -491,14 +627,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    hiddenInMain:true,
   },
   {
     label: '物料描述1',
@@ -507,6 +636,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -515,6 +645,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -523,6 +654,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -531,29 +663,19 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '代码',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -564,6 +686,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   // {
   //   label: '任务明细ID',
@@ -580,6 +704,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
   {
     label: '到器具号',
@@ -588,6 +714,8 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
+
   },
 ]))
 
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 55ec5f36c..b3ab53b53 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -52,7 +52,6 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isForm:false,
     isTable: true,
     sort: 'custom',
@@ -77,7 +76,6 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
     isForm: false,
   },
   {
@@ -475,7 +473,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain:true,
-    sortSearchDefault:6,
+    sortSearchDefault:1000,
+    isSearch: true,
     sortTableDefault:1100,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -560,6 +559,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
     label: '单据号',
@@ -583,6 +583,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true,
+    sortSearchDefault:2,
     sortTableDefault:3,
     form: {
       // labelMessage: '信息提示说明！！！',
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index 39a2b2d4e..a98fc71f9 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -63,7 +63,6 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: false,
-
   },
   {
     label: '入库事务类型',
@@ -249,6 +248,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
     table: {
       width: 150
     },
@@ -669,18 +670,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  },
+  
   // {
   //   label: '代码',
   //   field: 'code',

From 0e1f24ce9d0a78a41da3fdd22e9213df79ac685c Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Sun, 28 Apr 2024 10:07:49 +0800
Subject: [PATCH 3/8] =?UTF-8?q?2024-04-28=20=E6=96=B0=E5=BB=BA=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E7=9A=84searcheTable=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=AD=A3=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/productOffline/index.ts           |   4 +-
 src/components/SearchTable/index.ts           |   2 +-
 src/components/SearchTableV2/index.ts         |   3 +
 .../SearchTableV2/src/SearchTableV2.vue       | 187 ++++++++++++++++++
 .../mes/orderDay/components/BasicFormV2.vue   |   2 +-
 5 files changed, 194 insertions(+), 4 deletions(-)
 create mode 100644 src/components/SearchTableV2/index.ts
 create mode 100644 src/components/SearchTableV2/src/SearchTableV2.vue

diff --git a/src/api/mes/productOffline/index.ts b/src/api/mes/productOffline/index.ts
index c5434f931..8d504ad7e 100644
--- a/src/api/mes/productOffline/index.ts
+++ b/src/api/mes/productOffline/index.ts
@@ -64,8 +64,8 @@ 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 })
   }
 }
diff --git a/src/components/SearchTable/index.ts b/src/components/SearchTable/index.ts
index 28289593f..4293a0555 100644
--- a/src/components/SearchTable/index.ts
+++ b/src/components/SearchTable/index.ts
@@ -1,3 +1,3 @@
 import SearchTable from './src/SearchTable.vue'
 
-export { SearchTable }
+export { SearchTable}
diff --git a/src/components/SearchTableV2/index.ts b/src/components/SearchTableV2/index.ts
new file mode 100644
index 000000000..655979c12
--- /dev/null
+++ b/src/components/SearchTableV2/index.ts
@@ -0,0 +1,3 @@
+import SearchTable from './src/SearchTableV2.vue'
+
+export { SearchTable }
diff --git a/src/components/SearchTableV2/src/SearchTableV2.vue b/src/components/SearchTableV2/src/SearchTableV2.vue
new file mode 100644
index 000000000..cfee305e9
--- /dev/null
+++ b/src/components/SearchTableV2/src/SearchTableV2.vue
@@ -0,0 +1,187 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      :allSchemas="allSchemasRef"
+    />
+    <ContentWrap>
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :selection="true"
+        :reserveSelection="true"
+        row-key="id"
+      />
+    </ContentWrap>
+    <template #footer>
+      <div class="flex items-center">
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null), // 筛选
+]
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref()
+const getPage:any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref()
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const multipleBol = ref(false)
+const searchConditionRef = ref()
+
+const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
+  dialogTitle.value = titleName
+  tableObjectRef.value = tableObject
+  searchDialogVisible.value = true
+  multipleBol.value = multiple
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns
+}
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any ) => {
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns.filter(item => (item.field !== 'action'))
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  multipleBol.value = multiple
+  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = titleName
+  const {tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
+  })
+  tableObjectRef.value = tableObject
+  searchConditionRef.value = searchCondition
+  if (searchCondition) tableObjectRef.value.params = searchCondition;
+
+  // 获得表格的各种操作
+  const { getList } = tableMethods
+  // setSearchParamsRef.value = setSearchParams
+  setSearchParamsRef.value = tableObject.params
+  getListRef.value = getList
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach(key => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      });
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters.push({
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      });
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else {
+      Object.keys(searchConditionRef.value).forEach(key => {
+        searchData.filters = [{
+          action: "==",
+          column: key,
+          value: searchConditionRef.value[key]
+        }]
+      });
+    }
+  }
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+
+defineExpose({ open,openData }) // 提供 open 方法，用于打开弹窗
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  const selections = searchTableRef.value.selections
+  // 如果不是多选的
+  if(!multipleBol.value){
+    if(selections.length > 1 || selections.length == 0) {
+      message.warning('请选择一条数据！')
+      formLoading.value = false
+      return
+    }
+    // 多选
+  }else{
+    if(selections.length == 0) {
+      message.warning('至少选择一条数据！')
+      formLoading.value = false
+      return
+    }
+  }
+ 
+  try {
+    searchDialogVisible.value = false
+    // 发送操作成功的事件
+    emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value)
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ 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 6c9c1b02c..8715c9abb 100644
--- a/src/views/mes/orderDay/components/BasicFormV2.vue
+++ b/src/views/mes/orderDay/components/BasicFormV2.vue
@@ -23,7 +23,7 @@
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>
 <script setup lang="ts">
-import { SearchTable } from '@/components/SearchTable'
+import { SearchTable } from '@/components/SearchTableV2'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 

From a34b2b698fb66d4b6b26e4e441247f86ad9d1a13 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 10:14:05 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueMain.data.ts                | 229 ++++++++++--------
 1 file changed, 122 insertions(+), 107 deletions(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 297908077..36dd09bfa 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -54,30 +54,20 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '生产计划单号',
-    field: 'productionPlanNumber',
+    label: '状态',
+    field: 'status',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
     form: {
-      labelMessage: '同时影响车间 生产线 班组 班次',
+      value: '1',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '生产计划信息', // 查询弹窗标题
-        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'status',
-          value:'6',
-          isMainValue: false
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
+        disabled: true
       }
     }
   },
@@ -119,25 +109,6 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选班次', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '班次信息', // 查询弹窗标题
-        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
-        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
-      }
-    }
-  },
   {
     label: '班组',
     field: 'team',
@@ -158,20 +129,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '状态',
-    field: 'status',
+    label: '班次',
+    field: 'shift',
     sort: 'custom',
     table: {
       width: 150
     },
-    dictType: DICT_TYPE.PLAN_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
     form: {
-      value: '1',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选班次', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '班次信息', // 查询弹窗标题
+        searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类
+        searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法
       }
     }
   },
@@ -238,6 +210,35 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      labelMessage: '同时影响车间 生产线 班组 班次',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产计划', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '生产计划信息', // 查询弹窗标题
+        searchAllSchemas: ProductionMain.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionMainApi.getProductionMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'status',
+          value:'6',
+          isMainValue: false
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -253,7 +254,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -274,6 +275,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       value: 'Issue',
       componentProps: {
@@ -287,7 +289,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -308,7 +310,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -329,7 +331,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -356,6 +358,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -374,6 +377,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -383,6 +387,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -405,6 +410,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -454,6 +460,63 @@ export const PreparetoissueMainRules = reactive({
  * @returns {Array} 备料计划子表
  */
 export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '工位',
+    field: 'workStation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'prodLine',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshop',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+    },
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -541,63 +604,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     },
   },
-  {
-    label: '工位',
-    field: 'workStation',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
-      }
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择工位', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '工位信息', // 查询弹窗标题
-        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
-        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productionLineCode',
-          value:'prodLine',
-          message: '请填写生产线代码！',
-          isMainValue: true
-        },{
-          key:'workshopCode',
-          value:'workshop',
-          message: '请填写车间代码！',
-          isMainValue: true
-        },{
-          key:'available',
-          value:'TRUE',
-          isMainValue: false
-        }] 
-    },
-  },
+  
   {
     label: '截止时间',
     field: 'dueTime',
@@ -609,6 +616,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     tableForm: {
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -631,6 +639,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       componentProps: {
         disabled: true
@@ -645,6 +654,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -657,6 +667,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -676,6 +687,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -686,6 +698,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
@@ -700,6 +713,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -723,6 +737,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     tableForm:{
       type: 'Select',
       default: 'TRUE'

From 25af88bb3cb522edd45cc4179137b8ee3384adc0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 11:53:30 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productrepairRecordMain.data.ts           |  89 +++++--
 .../productrepairRequestMain/index.vue        |   2 +-
 .../productrepairRequestMain.data.ts          | 228 +++++++++++-------
 3 files changed, 217 insertions(+), 102 deletions(-)

diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 19d07630a..ad8395324 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -15,6 +15,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -23,15 +24,18 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    sortTableDefault:2,
   },
   {
-    label: '车间代码',
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
+
   },
   {
     label: '班组',
@@ -40,6 +44,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '班次',
@@ -48,6 +53,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '出库事务类型',
@@ -56,6 +62,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '入库事务类型',
@@ -64,6 +71,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '执行时间',
@@ -76,6 +84,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -96,6 +105,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -117,6 +127,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -137,6 +148,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -153,13 +165,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -173,6 +186,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '备注',
@@ -181,6 +195,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建者',
@@ -189,6 +204,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建时间',
@@ -201,6 +217,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -225,13 +242,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -241,6 +259,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -251,7 +270,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -328,62 +347,70 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       show:false
     },
+    hiddenInMain:true,
   },
   {
-    label: '生产线代码',
+    label: '返修生产线',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
-    label: '工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '成品库位代码',
-    field: 'fgFromLocationCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    hiddenInMain:true,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '成品库位',
+    field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
   },
   {
     label: '生产日期',
@@ -396,6 +423,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -417,6 +445,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -433,6 +462,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -445,6 +475,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位组代码',
@@ -453,6 +484,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -461,6 +493,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -469,6 +502,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -477,6 +511,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
     label: '备注',
@@ -485,6 +520,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -497,6 +533,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -513,6 +550,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料名称',
@@ -521,6 +559,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '物料描述1',
@@ -529,6 +568,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -537,6 +577,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -545,6 +586,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -553,6 +595,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
     form: {
       component: 'InputNumber',
     }
@@ -563,10 +606,20 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+    sortTableDefault:13,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'Bom来源库位',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:18,
   },
   // {
   //   label: '任务明细ID',
@@ -594,6 +647,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: 'Bom版本',
@@ -602,6 +656,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
     tableForm: {
       disabled: true,
       isInpuFocusShow: true,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index b95fd4b00..ae8d0a998 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -232,7 +232,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField == 'packingNumber'){
+      if(formField == 'itemCode'){
         row['containerNumber'] = val[0]['containerNumber']
         row['itemCode'] = val[0]['itemCode']
         row['packingNumber'] = val[0]['packingNumber']
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 8128a5378..fc3fb00f5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -60,14 +60,36 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1,
   },
   {
-    label: '车间代码',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -86,6 +108,54 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '返修生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
   {
     label: '班组',
     field: 'team',
@@ -93,6 +163,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -117,6 +188,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -141,6 +213,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -148,7 +221,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -162,6 +235,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -177,6 +251,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -199,6 +274,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -217,6 +293,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -230,6 +307,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -252,6 +330,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -270,6 +349,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -286,25 +366,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    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: 'updateTime',
@@ -316,6 +378,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -334,6 +397,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -341,7 +405,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -362,7 +426,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -383,7 +447,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -472,63 +536,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       show: false
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '返修生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        }]
-      }
-    }
-  },
-  {
-    label: '返修工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
@@ -574,8 +594,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     field: 'fromLocationCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 160
     },
+    sortTableDefault:18,
     tableForm: {
       disabled: true
     },
@@ -586,12 +607,13 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:7,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工序代码',
@@ -629,8 +651,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    sortTableDefault:10,
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       componentProps:{
@@ -645,13 +674,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:15,
     tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage
+      disabled: true,
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择物料',
+      // searchField: 'packingNumber',
+      // searchTitle: '库存余额信息',
+      // searchAllSchemas: Balance.allSchemas,
+      // searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -666,15 +697,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '成品库位代码',
+    label: '成品库位',
     field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
     tableForm: {
       disabled: true
     },
+    isTable: true,
     form: {
       componentProps:{
         disabled: true
@@ -688,6 +721,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     tableForm: {
       disabled: true
     },
@@ -704,6 +739,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:13,
     tableForm: {
       disabled: true
     },
@@ -728,6 +764,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true,
       type: 'Select'
     },
+    hiddenInMain:true,
+    sortTableDefault:18,
     form: {
       componentProps:{
         disabled: true
@@ -742,6 +780,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTableForm: false,
+    hiddenInMain: true,
+    isTable: false,
     form: {
       componentProps: {
         disabled: true
@@ -755,6 +795,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -767,6 +809,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -786,6 +830,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -797,6 +843,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
+    sortTableDefault:11,
     isForm: false,
   },
   {
@@ -806,6 +853,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -816,6 +865,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -826,16 +877,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '数量',
+    label: '返修数量',
     field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:16,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -859,6 +913,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:17,
     tableForm: {
       type: 'Select'
     }
@@ -874,6 +929,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -893,6 +950,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -903,6 +962,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:12,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本

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

---
 .../productputawayAssembleJobMain/index.vue                     | 2 +-
 .../productputawayAssembleRecordMain/index.vue                  | 2 +-
 .../productputawayAssembleRequestMain/index.vue                 | 2 +-
 .../productputawayAssembleRequestMain.data.ts                   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index 8b9f68017..ea0170c8b 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -62,7 +62,7 @@
     :detailAllSchemas="ProductputawayJobDetail.allSchemas"
     :detailAllSchemasRules="ProductputawayJobDetailRules"
     :searchTableParams="searchTableParams"
-    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPage"
+    :apiPage="ProductputawayJobDetailApi.getProductputawayJobDetailPageAssemble"
   />
 </template>
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index 6d4c8b645..3061645f5 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -57,7 +57,7 @@
     :allSchemas="ProductputawayRecordMain.allSchemas"
     :detailAllSchemas="ProductputawayRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductputawayRecordDetailRules"
-    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPage"
+    :apiPage="ProductputawayRecordDetailApi.getProductputawayRecordDetailPageAssemble"
   />
 </template>
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 4b1e35ce1..5a5726392 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
@@ -66,7 +66,7 @@
     :detailAllSchemasRules="ProductputawayRequestDetailRules"
     :apiCreate="ProductputawayRequestDetailApi.createProductputawayRequestDetail"
     :apiUpdate="ProductputawayRequestDetailApi.updateProductputawayRequestDetail"
-    :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPage"
+    :apiPage="ProductputawayRequestDetailApi.getProductputawayRequestDetailPageAssemble"
     :apiDelete="ProductputawayRequestDetailApi.deleteProductputawayRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index abe333bba..595e7845e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -727,6 +727,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '操作',
     field: 'action',
+    hiddenInMain:true,
     isDetail: false,
     isForm: false ,
     table: {

From c2157253b7583bceef8b0c576c921ed6dc0d2678 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 13:29:10 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressJobMain.data.ts             | 176 +++++++++------
 .../productredressRecordMain.data.ts          | 200 +++++++++++-------
 .../productredressRequestMain.data.ts         | 104 +++++----
 3 files changed, 296 insertions(+), 184 deletions(-)

diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index f856e1a44..9629bcc5a 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -55,6 +55,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -77,6 +78,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -99,6 +101,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -151,6 +154,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+
   },
   {
     label: '承接时间',
@@ -163,6 +168,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -191,6 +197,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+
   },
   {
     label: '完成时间',
@@ -203,6 +211,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -367,6 +376,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -380,6 +390,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -398,6 +409,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -411,6 +423,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -429,6 +442,39 @@ export const ProductredressJobDetailRules = reactive({
 })
 
 export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '回收数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -438,8 +484,44 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -489,22 +571,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isForm: false
   // },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '物品描述1',
     field: 'itemDesc1',
@@ -512,6 +579,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '物品描述2',
@@ -520,6 +589,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -528,40 +599,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable:false,
+    hiddenInMain:true,
   },
   // {
   //   label: '单据号',
@@ -571,24 +610,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '订单号',
     field: 'woNumber',
@@ -596,6 +618,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '订单行',
@@ -604,6 +628,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '备注',
@@ -612,6 +638,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '创建者',
@@ -620,6 +648,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -632,6 +662,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -651,6 +683,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   {
     label: '最后更新时间',
@@ -663,6 +697,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
index 7ad1d9b66..af0629dc4 100644
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@@ -43,6 +43,18 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isForm:false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   // {
   //   label: '生产计划单号',
   //   field: 'productionPlanNumber',
@@ -93,6 +105,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -115,6 +128,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -144,6 +158,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -166,6 +181,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -255,6 +271,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    isTable:false,
     table: {
       width: 150
     },
@@ -270,6 +287,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -289,6 +307,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '最后更新时间',
@@ -301,6 +320,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -323,13 +343,20 @@ export const ProductredressRecordDetailRules = reactive({
 
 export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isForm: false,
   },
   {
     label: '批次',
@@ -341,62 +368,117 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '回收数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     }
   },
   {
-    label: '物品名称',
-    field: 'itemName',
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物品描述1',
-    field: 'itemDesc1',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '物品描述2',
-    field: 'itemDesc2',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
+  
+  
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '物品描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true
   },
   {
     label: '生产日期',
@@ -418,6 +500,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable:false,
+    hiddenInMain: true,
     isForm: false
   },
   {
@@ -431,6 +515,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -442,64 +528,20 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
+  
+  
   {
     label: 'BOM版本',
     field: 'bomVersion',
     sort: 'custom',
     table: {
       width: 150
-    }
-  },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    sort: 'custom',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '到库区代码',
-    field: 'toAreaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
+    },
+    isTable:false,
+    hiddenInMain: true,
   },
+  
+  
   // {
   //   label: '到货主代码',
   //   field: 'toOwnerCode',
@@ -514,7 +556,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '创建者',
@@ -524,6 +568,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
@@ -545,7 +591,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '最后更新者',
@@ -555,6 +603,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '最后更新时间',
@@ -576,6 +626,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable:false,
+    hiddenInMain: true,
   }
 ]))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index b06172a41..b70dabe87 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -75,6 +75,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -97,6 +98,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -172,7 +174,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
   },
   {
-    label: '备注',
+    label: '原因',
     field: 'remark',
     sort: 'custom',
     isTable:false,
@@ -216,6 +218,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -231,6 +234,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -250,6 +254,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -262,6 +267,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -294,16 +300,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   //   field: 'bomVersion',
   //   sort: 'custom',
   // },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    isTableForm: false,
-  },
+  
   {
     label: '物料代码',
     field: 'itemCode',
@@ -374,6 +371,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
   },
   {
     label: '物品描述2',
@@ -384,21 +382,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '数量',
-    field: 'qty',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
@@ -412,10 +402,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '回收数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -430,8 +418,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '库位',
-    field: 'toLocationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -446,8 +434,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -462,10 +450,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -479,8 +466,10 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150
@@ -495,8 +484,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '库存状态',
+    field: 'inventoryStatus',
     sort: 'custom',
     table: {
       width: 150
@@ -511,8 +500,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
+    label: '库位',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -526,6 +515,29 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    hiddenInMain:true,
+
+  },{
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    isTableForm: false,
+    hiddenInMain:true,
+  },
+  
   {
     label: '备注',
     field: 'remark',
@@ -533,6 +545,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true
   },
   {
     label: '创建者',
@@ -543,6 +557,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
+    hiddenInMain:true
   },
   {
     label: '创建时间',
@@ -555,6 +571,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -574,6 +592,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
     isForm: false,
     isTableForm: false,
   },
@@ -588,6 +608,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable:false,
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -600,11 +622,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  
   {
     label: '操作',
     field: 'action',
     isForm: false,
     isTableForm: false,
+    hiddenInMain:true,
     table: {
       width: 150,
       fixed: 'right'

From 07ebce7aa5979ee3efc5af2cb4910209c8aa5b01 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Sun, 28 Apr 2024 13:38:29 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/mail/template/MailTemplateForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/system/mail/template/MailTemplateForm.vue b/src/views/system/mail/template/MailTemplateForm.vue
index d771921a5..ade78f131 100644
--- a/src/views/system/mail/template/MailTemplateForm.vue
+++ b/src/views/system/mail/template/MailTemplateForm.vue
@@ -115,6 +115,7 @@ const onChange = async (field, cur) => {
 }
 
 const resetReceiverType = () => {
+  if (!formRef.value) return
   // 初始化设置值
     const setV = {
       roleIdList: [],