From 9ceb824af890c382493753928859bcee21dab3d5 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 11 Dec 2024 16:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |   15 +
 src/types/descriptions.d.ts                   |    1 +
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptJobMain.data.ts            |    2 +-
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptRequestMain.data.ts        |    2 +-
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptJobMain.data.ts            |    2 +-
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptRequestMain.data.ts        |    2 +-
 .../purchaseMain/purchaseMain.data.ts         |  616 +++----
 .../purchasePlanMain/purchasePlanMain.data.ts |  757 ++++----
 .../supplierdeliverRecordMain/index.vue       |    1 +
 .../supplierdeliverRecordMain.data.ts         |  302 ++-
 .../supplierdeliverRequestMain/index.vue      |   16 +-
 .../supplierdeliverRequestMain/labelForm.vue  |   30 +-
 .../supplierdeliverRequestMain.data.ts        | 1621 ++++++++---------
 .../purchasereceiptJobMain.data.ts            |    2 +-
 .../purchasereceiptRecordMain.data.ts         |    2 +-
 .../purchasereceiptRequestMain.data.ts        |    2 +-
 21 files changed, 1699 insertions(+), 1684 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index ca9f37c87..98488d09a 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -38,6 +38,7 @@ const props = defineProps({
     default: () => ({})
   }
 })
+const schema = ref(props.schema)
 
 const { getPrefixCls } = useDesign()
 
@@ -82,6 +83,20 @@ const showAll = () =>{
   isShow.value = !isShow.value
  
 }
+
+// 默认排序
+const updateSort = (val) => {
+  console.log(999,val)
+  val.forEach(item=>{
+    if(!item.sortDetailDefault){
+      item.sortDetailDefault = 999 // 默认999
+    }
+  })
+  val.sort((column1,column2)=>{
+    return column1.sortDetailDefault - column2.sortDetailDefault
+  })
+}
+updateSort(schema.value)
 </script>
 
 <template>
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 62810c7ef..aa45d6b70 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -12,4 +12,5 @@ export interface DescriptionsSchema {
   valueFilter?: function // 展示的过滤函数
   slotFilter?:boolean // 插槽自定义内容
   dictType?: string // add by 星语：支持 dict 字典数据
+  sortDetailDefault?: string | number
 }
diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 7b3cc3d58..6577c20d8 100644
--- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index fc56577e1..3cb60fdd1 100644
--- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..d418e93e9 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index bab1d6b8f..33bbd3263 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f826010e..0f880d9d8 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1098,7 +1098,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 7b3cc3d58..6577c20d8 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..d418e93e9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 1bf964235..b8db76398 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index d46203baa..2f24ec276 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1099,7 +1099,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index f4f225edb..d2aeaf6af 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -17,11 +17,33 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    sortTableDefault: 1,
     table: {
       width: 180,
       fixed: 'left'
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 1000,
+    sortTableDefault: 2,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -54,54 +76,50 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
-    }
-  },
-  {
-    label: '订单类型',
-    field: 'type',
-    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    sortTableDefault: 3,
   },
   {
-    label: '行类型',
-    field: 'poLineType',
+    label: '供应商名称',
+    field: 'supplierName',
+    dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
+    isForm: false,
     sort: 'custom',
+    sortTableDefault:4,
     table: {
       width: 150
     },
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
     isTable: true,
-    isForm:false,
     isSearch: true,
-    sortSearchDefault:1000,
     sort: 'custom',
+    sortTableDefault: 5,
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+  // {
+  //   label: '行类型',
+  //   field: 'poLineType',
+  //   isTable: false,
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
   {
     label: '订单日期',
     field: 'orderDate',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -110,6 +128,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 6,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -134,6 +153,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -144,6 +164,15 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '税率',
     field: 'taxRate',
@@ -151,6 +180,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -162,52 +192,41 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单备注',
-    field: 'poRmks',
+    label: '支付周期',
+    field: 'paymentCycle',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
+    isForm: false,
     table: {
       width: 150
     },
   },
-
   {
-    label: '管理编号',
-    field: 'poContract',
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '版本',
-    field: 'version',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '当前阶段',
-    field: 'currentStage',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        style: {width:'100%'},
-        min: 0
-      }
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:false,
   },
   {
     label: '是否寄存订单',
@@ -219,7 +238,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm:false,
+    isForm: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -230,54 +249,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
+    label: '订单备注',
+    field: 'poRmks',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable: false,
     isForm:false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
-    sort: 'custom',
-    isTable:false,
     table: {
       width: 150
     },
   },
+
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '管理编号',
+    field: 'poContract',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
+    isForm:false,
     table: {
       width: 150
     },
   },
-  
+
   {
     label: '业务类型',
     field: 'businessType',
@@ -294,20 +286,52 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
+  {
+    label: '数据来源区分',
+    field: 'dataSource',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+    }
+  },
+  // {
+  //   label: '当前阶段',
+  //   field: 'currentStage',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       min: 0
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   isTable:false,
+  // },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable:false,
+    isTable: true,
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -335,48 +359,17 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
+  
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   isTable: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -432,33 +425,20 @@ export const PurchaseMainRules = reactive({
  * @returns {Array} 采购订单子表
  */
 export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    isTableForm: false,
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '行号',
     field: 'lineNumber',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     tableForm:{
       disabled:true,
       isSearchList: true, // 开启查询弹窗
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     table: {
@@ -527,29 +507,18 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
- {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+  {
+    label: '行类型',
+    field: 'poLineType',
     isTable: true,
-    isTableForm:true,
-    form:{
-      componentProps: {
-        disabled:true
-      }
-    },
-    tableForm:{
-      disabled: true,
-      type:'Select',
-    },
+    isSearch: false,
+    sort: 'custom',
     table: {
       width: 150
     },
- },
+  },
   {
-    label: '订单数量',
+    label: '采购订单数量',
     field: 'orderQty',
     table: {
       width: 150
@@ -557,78 +526,86 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:false,
+        disabled: false,
         min: 1,
         precision: 6
       }
     },
     tableForm: {
-      disabled:false,
-      hidden:false,
+      disabled: false,
+      hidden: false,
       type: 'InputNumber',
       min: 1,
       precision: 6
     },
   },
   {
-    label: '默认收货库区',
-    field: 'defaultAreaCode',
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     table: {
       width: 150
     },
     form: {
+      component: 'InputNumber',
       componentProps: {
-        disabled: true
+        disabled: false,
+        min: 1,
+        precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    hiddenInMain: true,
+    tableForm: {
+      disabled: false,
+      hidden: false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
   },
   {
-    label: '库区描述',
-    field: 'areaDescription',
-    table: {
-      width: 150
-    },
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
     form: {
       componentProps: {
         disabled: true
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
+      width: 150
+    },
   },
-  // {
-  //   label: 'ERP库位',
-  //   field: 'erpLocationCode',
-  //   dictType : DICT_TYPE.ERP_LOCATION,
-  //   dictClass: 'string',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   isTableForm: false,
-  //   isForm: false,
-  // },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    hiddenInMain: true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '包装数量',
-    field: 'packQty',
-    hiddenInMain:true,
+    label: t('ts.单价'),
+    field: 'singlePrice',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -637,25 +614,29 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '包装规格',
-    hiddenInMain:true,
-    field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    isTable: true,
+    label: '金额',
+    field: 'amount',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    hiddenInMain:true,
+    label: '库存标包数量',
+    field: 'packQty',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -669,13 +650,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '库存标包规格',
+    hiddenInMain: true,
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
-    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -683,42 +665,60 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '转换率',
-    field: 'convertRate',
+    label: '库存计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0
+        disabled: true
       }
     },
-    hiddenInMain:true,
-     table: {
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
       width: 150
     },
+  },
+
+  {
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
+    isTable: false,
   },
   // {
-  //   label: t('ts.已计划数量'),
-  //   field: 'plannedQty',
+  //   label: 'ERP库位',
+  //   field: 'erpLocationCode',
+  //   dictType : DICT_TYPE.ERP_LOCATION,
+  //   dictClass: 'string',
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:true,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     },
-  //     value: 1
-  //   },
   //   isTableForm: false,
   //   isForm: false,
+  //   isTable: false,
   // },
   {
-    label: t('ts.已发货数量'),
-    field: 'shippedQty',
+    label: t('ts.已计划数量'),
+    field: 'plannedPurchaseQty',
     table: {
       width: 150
     },
@@ -734,13 +734,31 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: t('ts.已发货数量'),
+    field: 'shippedPurchaseQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
+    },
+    isTableForm: false,
+    isForm: false,
+  },
   {
     label: t('ts.已收货数量'),
-    field: 'receivedQty',
+    field: 'receivedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -754,11 +772,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: t('ts.已退货数量'),
-    field: 'returnedQty',
+    field: 'returnedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -772,11 +790,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: t('ts.已上架数量'),
-    field: 'putawayQty',
+    field: 'putawayPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 1,
@@ -788,30 +806,44 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+ 
+ 
   {
-    label: t('ts.单价'),
-    field: 'singlePrice',
+    label: '库区描述',
+    field: 'areaDescription',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
+        disabled: true
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
+
   {
-    label: '金额',
-    field: 'amount',
+    label: '项目代码',
+    field: 'projectCode',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+  },
+ 
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
     hiddenInMain:true,
+    table: {
+      width: 150
+    },
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -820,33 +852,23 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm:{
-      type:'Select',
-      default: 'TRUE',
-      inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
+  
   {
     label: '超收百分比',
     field: 'overReceivingPercent',
@@ -867,53 +889,19 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: true,
-    isTableForm: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    hiddenInMain:false,
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:false,
-    isForm: false,
-  },
   // {
-  //   label: '最后更新时间',
-  //   field: 'updateTime',
-  //   isTableForm: false,
+  //   label: '创建时间',
+  //   field: 'createTime',
   //   isTable: true,
-  //   hiddenInMain:false,
+  //   isTableForm: false,
   //   formatter: dateFormatter,
   //   detail: {
   //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
   //   },
   //   table: {
-  //     width: 150
+  //     width: 180
   //   },
+  //   hiddenInMain:false,
   //   isForm: false,
   //   form: {
   //     component: 'DatePicker',
@@ -926,23 +914,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   // {
-  //   label: '最后更新者',
-  //   field: 'updater',
+  //   label: '创建者',
+  //   field: 'creator',
   //   isTableForm: false,
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:false,
   //   isForm: false,
-  //   // form: {
-  //   //   component: 'DatePicker',
-  //   //   componentProps: {
-  //   //     style: {width:'100%'},
-  //   //     type: 'datetime',
-  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //   //     valueFormat: 'x',
-  //   //   }
-  //   // }
   // },
   {
     label: '备注',
@@ -951,6 +930,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 6df67790c..c3dd44e4d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -17,7 +17,7 @@ const { t } = useI18n() // 国际化
 export const PurchasePlanMain = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '要货计划单号',
+      label: '单据号',
       field: 'number',
       sort: 'custom',
       isForm: false,
@@ -56,19 +56,6 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: 'SPARC订单号',
-      field: 'orderCode',
-      sort: 'custom',
-      isForm: false,
-      table: {
-        width: 180,
-        fixed: 'left'
-      },
-      sortTableDefault: 1,
-      sortSearchDefault: 4,
-      isSearch: true
-    },
     {
       label: '供应商代码',
       field: 'supplierCode',
@@ -139,42 +126,21 @@ export const PurchasePlanMain = useCrudSchemas(
       isTable: true,
       isForm: false
     },
-    //仅是主列表页面的筛选搜索条件
-    {
-      label: '送达日期',
-      field: 'deliveryDate',
-      sort: 'custom',
-      isDetail: false,
-      isTable: false,
-      isForm: false,
-      isTableForm: false,
-      isSearch: true,
-      sortSearchDefault: 3,
-      formatter: dateFormatter2,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          // type: 'datetimerange',
-          type: 'daterange',
-          defaultTime: [new Date('1 '), new Date('1 ')]
-        }
-      }
-    },
     {
-      label: '采购订单',
+      label: '订单号',
       field: 'poNumber',
       sort: 'custom',
       sortSearchDefault: 11,
+      sortTableDefault: 6,
       formatter: dateFormatter2,
       table: {
         width: 150
       },
-      isTable: false,
+      isTable: true,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          disabled:true,
+          disabled: true,
           enterSearch: true,
           dialogWidth: '1085px', //搜索出来弹窗的宽度
           isSearchList: true,
@@ -221,32 +187,40 @@ export const PurchasePlanMain = useCrudSchemas(
     },
     {
       label: '送达日期',
+      sortTableDefault:5,
       field: 'deliveryDate',
-      table: {
-        width: 180
-      },
+      sort: 'custom',
+      isDetail: true,
+      isTable: true,
+      isForm: true,
+      isTableForm: false,
+      isSearch: true,
+      sortSearchDefault: 3,
       formatter: dateFormatter2,
-      sortTableDefault: 13,
-      form: {
+      search: {
         component: 'DatePicker',
         componentProps: {
-          type: 'date',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          // type: 'datetimerange',
+          type: 'daterange',
+          defaultTime: [new Date('1 '), new Date('1 ')]
         }
       },
+      table: {
+        width: 150
+      },
       detail: {
-        dateFormat: 'YYYY-MM-DD'
+        dateFormat:'YYYY-MM-DD'
       }
     },
     {
       label: '采购订单类型',
       field: 'type',
       sort: 'custom',
-      sortTableDefault: 13,
+      sortTableDefault: 7,
       dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
       dictClass: 'string',
-      isTable: true,
+      isTable: false,
       isForm: true,
       table: {
         width: 150
@@ -258,51 +232,6 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '预测版本',
-      field: 'activeVersion',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
-      table: {
-        width: 150
-      },
-    },
-    {
-      label: '来源',
-      field: 'source',
-      sort: 'custom',
-      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
-      dictClass: 'string',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
-      table: {
-        width: 150
-      },
-    },
-    {
-      label: '便次',
-      field: 'deliNo',
-      sort: 'custom',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 13,
-      table: {
-        width: 150
-      },
-    },
-    {
-      label: '班次',
-      field: 'xxxxx',
-      sort: 'custom',
-      isTable: true,
-      isForm: false,
-      sortTableDefault: 14,
-      table: {
-        width: 150
-      },
-    },
     {
       label: '收货人',
       field: 'contacts',
@@ -310,6 +239,7 @@ export const PurchasePlanMain = useCrudSchemas(
       table: {
         width: 150
       },
+      sortTableDefault: 8,
       form: {
         componentProps: {
           disabled: false
@@ -323,6 +253,7 @@ export const PurchasePlanMain = useCrudSchemas(
       table: {
         width: 150
       },
+      sortTableDefault: 9,
       form: {
         componentProps: {
           disabled: false
@@ -340,75 +271,135 @@ export const PurchasePlanMain = useCrudSchemas(
       isForm: false
     },
     {
-      label: '开始时间',
-      field: 'beginTime',
+      label: '仓库代码',
+      field: 'warehouseCode',
       sort: 'custom',
       table: {
         width: 150
       },
       isTable: false,
+      isForm: false
+    },
+    {
+      label: '月台代码',
+      field: 'dockCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
       isForm: false,
-      isDetail: false,
-      form: {
-        component: 'TimePicker',
-        componentProps: {
-          format: 'HH:mm'
-        }
-      }
+      isTable: false
     },
     {
-      label: '结束时间',
-      field: 'endTime',
+      label: '业务类型',
+      field: 'businessType',
       sort: 'custom',
       table: {
         width: 150
       },
-      isTable: false,
       isForm: false,
-      isDetail: false,
+      isTable: false,
       form: {
-        component: 'TimePicker',
+        value: 'PurchaseReceipt',
         componentProps: {
-          format: 'HH:mm'
+          disabled: true
         }
       }
     },
     {
-      label: '仓库代码',
-      field: 'warehouseCode',
+      label: '班次',
+      field: 'shift',
       sort: 'custom',
+      isTable: false,
+      isForm: false,
+      sortTableDefault: 14,
       table: {
         width: 150
       },
+    },
+    {
+      label: 'SPARC订单号',
+      field: 'orderCode',
+      sort: 'custom',
+      isForm: false,
       isTable: false,
-      isForm: false
+      table: {
+        width: 180,
+      },
+      sortSearchDefault: 4,
+      isSearch: true
     },
     {
-      label: '月台代码',
-      field: 'dockCode',
+      label: '便次',
+      field: 'deliNo',
       sort: 'custom',
+      isTable: false,
+      isForm: false,
+      sortTableDefault: 13,
       table: {
         width: 150
       },
+    },
+  
+ 
+    {
+      label: '预测版本',
+      field: 'activeVersion',
+      isTable: false,
       isForm: false,
-      isTable: false
+      sortTableDefault: 13,
+      table: {
+        width: 150
+      },
     },
     {
-      label: '业务类型',
-      field: 'businessType',
+      label: '来源',
+      field: 'source',
+      sort: 'custom',
+      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
+      dictClass: 'string',
+      isTable: false,
+      isForm: false,
+      sortTableDefault: 13,
+      table: {
+        width: 150
+      },
+    },
+    {
+      label: '开始时间',
+      field: 'beginTime',
       sort: 'custom',
       table: {
         width: 150
       },
+      isTable: false,
       isForm: false,
+      isDetail: false,
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          format: 'HH:mm'
+        }
+      }
+    },
+    {
+      label: '结束时间',
+      field: 'endTime',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
       isTable: false,
+      isForm: false,
+      isDetail: false,
       form: {
-        value: 'PurchaseReceipt',
+        component: 'TimePicker',
         componentProps: {
-          disabled: true
+          format: 'HH:mm'
         }
       }
     },
+    
 
     // {
     //   label: '自动发布',
@@ -474,7 +465,8 @@ export const PurchasePlanMain = useCrudSchemas(
       field: 'creator',
       sort: 'custom',
       isForm: false,
-      isTable: false,
+      isTable: true,
+      sortTableDefault: 1000,
       table: {
         width: 150
       }
@@ -483,9 +475,9 @@ export const PurchasePlanMain = useCrudSchemas(
       label: '创建时间',
       field: 'createTime',
       isTable: true,
+      sortTableDefault: 1000,
       isForm: false,
       formatter: dateFormatter,
-      sortTableDefault: 15,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
@@ -512,54 +504,54 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
+    // {
+    //   label: '最后更新者',
+    //   field: 'updater',
+    //   sort: 'custom',
+    //   isForm: false,
+    //   isTable: false,
+    //   table: {
+    //     width: 150
+    //   }
+    // },
+    // {
+    //   label: '最后更新时间',
+    //   field: 'updateTime',
+    //   isTable: false,
+    //   isForm: false,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: { width: '100%' },
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
     {
-      label: '最后更新者',
-      field: 'updater',
+      label: '备注',
+      field: 'remark',
       sort: 'custom',
-      isForm: false,
-      isTable: false,
       table: {
         width: 150
-      }
+      },
+      isTable: false,
+      isForm: false,
+      isDetail: false
     },
     {
-      label: '最后更新时间',
-      field: 'updateTime',
-      isTable: false,
-      isForm: false,
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
-    },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isTable: false,
-      isForm: false,
-      isDetail: true
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isDetail: false,
+      label: '操作',
+      field: 'action',
+      isDetail: false,
       isForm: false,
       table: {
         width: 250,
@@ -586,65 +578,65 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
-    {
-      label: '要货计划单号',
-      field: 'number',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      table: {
-        width: 180
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '采购订单号',
-      field: 'poNumber',
-      isSearch: true,
-      isTable: true,
-      sortTableDefault: 11,
-      sortSearchDefault: 11,
-      isForm: false,
-      isTableForm: false,
-      table: {
-        width: 150
-      },
-      search: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          dialogWidth: '1085px', //搜索出来弹窗的宽度
-          isSearchList: true,
-          enterSearch: true,
-          searchListPlaceholder: '请选择采购订单',
-          searchField: 'number',
-          searchTitle: '采购订单信息',
-          searchAllSchemas: PurchaseMain.allSchemas,
-          searchPage: PurchaseMainApi.getPurchaseMainPage,
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'supplierCode',
-              value: 'supplierCode',
-              message: '请填写供应商代码！',
-              isMainValue: true
-            },
-            {
-              key: 'status',
-              value: 2,
-              isMainValue: false
-            }
-          ]
-        }
-      }
-    },
+    // {
+    //   label: '要货计划单号',
+    //   field: 'number',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   table: {
+    //     width: 180
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '采购订单号',
+    //   field: 'poNumber',
+    //   isSearch: true,
+    //   isTable: true,
+    //   sortTableDefault: 11,
+    //   sortSearchDefault: 11,
+    //   isForm: false,
+    //   isTableForm: false,
+    //   table: {
+    //     width: 150
+    //   },
+    //   search: {
+    //     // labelMessage: '信息提示说明！！！',
+    //     componentProps: {
+    //       dialogWidth: '1085px', //搜索出来弹窗的宽度
+    //       isSearchList: true,
+    //       enterSearch: true,
+    //       searchListPlaceholder: '请选择采购订单',
+    //       searchField: 'number',
+    //       searchTitle: '采购订单信息',
+    //       searchAllSchemas: PurchaseMain.allSchemas,
+    //       searchPage: PurchaseMainApi.getPurchaseMainPage,
+    //       searchCondition: [
+    //         {
+    //           key: 'available',
+    //           value: 'TRUE',
+    //           isMainValue: false
+    //         },
+    //         {
+    //           key: 'supplierCode',
+    //           value: 'supplierCode',
+    //           message: '请填写供应商代码！',
+    //           isMainValue: true
+    //         },
+    //         {
+    //           key: 'status',
+    //           value: 2,
+    //           isMainValue: false
+    //         }
+    //       ]
+    //     }
+    //   }
+    // },
     {
       label: '订单行',
       field: 'poLine',
@@ -653,6 +645,7 @@ export const PurchasePlanDetail = useCrudSchemas(
         width: 150
       },
       sortTableDefault: 12,
+      hiddenInMain: true,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
@@ -709,7 +702,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      sortTableDefault: 5,
       sortSearchDefault: 5,
       isSearch: true,
       form: {
@@ -747,6 +739,17 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
+    {
+      label: '品名',
+      field: 'itemName',
+      table: {
+        width: 150
+      },
+      isTableForm: false,
+      isForm: false,
+      isTable: false,
+      isDetail:false
+    },
     {
       label: '物料状态',
       field: 'itemStatus',
@@ -754,8 +757,8 @@ export const PurchasePlanDetail = useCrudSchemas(
       dictType: DICT_TYPE.ITEM_STATUS,
       dictClass: 'string',
       isTable: true,
-      sortTableDefault: 10,
       sortSearchDefault: 10,
+      hiddenInMain: true,
       table: {
         width: 150
       },
@@ -770,53 +773,59 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '默认收货库区',
-      field: 'defaultAreaCode',
+      label: '受入号',
+      field: 'receivedNumber',
+      sort: 'custom',
+      sortSearchDefault: 7,
       table: {
         width: 150
       },
+      isTableForm: true,
+      hiddenInMain: true,
+      isForm: true,
       form: {
         componentProps: {
           disabled: true
         }
       },
       tableForm: {
+        type: 'Select',
         disabled: true
-      },
-      sortTableDefault: 7,
-      isTableForm: true,
-      isForm: true,
-      isTable: true
+      }
     },
     {
-      label: '库区描述',
-      field: 'areaDescription',
+      label: '计划采购数量',
+      field: 'planQty',
+      sort: 'custom',
+      sortSearchDefault: 9,
       table: {
         width: 150
       },
+      tableForm: {
+        type: 'InputNumber',
+        precision: 6
+      },
       form: {
+        component: 'InputNumber',
         componentProps: {
-          disabled: true
+          min: 0,
+          precision: 6
         }
-      },
-      tableForm: {
-        disabled: true
-      },
-      isTableForm: true,
-      isForm: true,
-      isTable: false
+      }
     },
+
     {
-      label: '受入号',
-      field: 'receivedNumber',
+      label: '计划采购计量单位',
+      field: 'uom',
       sort: 'custom',
-      sortTableDefault: 7,
-      sortSearchDefault: 7,
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: false,
+      sortSearchDefault: 10,
+      hiddenInMain: true,
       table: {
         width: 150
       },
-      isTableForm: true,
-      isForm: true,
       form: {
         componentProps: {
           disabled: true
@@ -831,7 +840,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       label: '订单数量',
       field: 'orderQty',
       sort: 'custom',
-      sortTableDefault: 8,
       sortSearchDefault: 8,
       table: {
         width: 150
@@ -846,25 +854,31 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
     {
-      label: '计划数量',
-      field: 'planQty',
+      label: '采购标包数量',
+      field: 'purchaseStdQty',
+      sort: 'custom',
+      sortSearchDefault: 8,
+      isForm: false,
+      isSearch: false,
+      isTableForm: false,
+    },
+    {
+      label: '采购计量单位',
+      field: 'purchaseStdUom',
+      dictType: DICT_TYPE.UOM,
       sort: 'custom',
-      sortTableDefault: 9,
       sortSearchDefault: 9,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        type: 'InputNumber',
-        precision: 6
-      },
-      form: {
-        component: 'InputNumber',
-        componentProps: {
-          min: 0,
-          precision: 6
-        }
-      }
+      isForm: false,
+      isSearch: false,
+      isTableForm: false,
+    },
+    {
+      label: '转换率',
+      field: 'conventRate',
+      sort: 'custom',
+      sortSearchDefault: 9,
+      isForm: false,
+      isSearch: false,
     },
     {
       label: '已发货数量',
@@ -876,46 +890,26 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false,
       isTable: true,
+      hiddenInMain: true,
     },
-    // {
-    //   label: '在途数量',
-    //   field: 'notReceiveQty',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTableForm: false,
-    //   sortTableDefault: 7,
-    //   isForm: false,
-    //   isTable: true,
-    // },
     {
-      label: '计量单位',
-      field: 'uom',
+      label: '收货数量',
+      field: 'receivedQty',
       sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string',
-      isTable: true,
-      sortTableDefault: 10,
-      sortSearchDefault: 10,
       table: {
         width: 150
       },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      }
+
+      hiddenInMain: true,
+      isTableForm: false,
+      isForm: false,
+      isTable: true,
     },
 
-    
+
     {
-      label: '已收货数量',
-      field: 'receivedQty',
+      label: '受入地',
+      field: 'receivedLocation',
       sort: 'custom',
       table: {
         width: 150
@@ -923,81 +917,136 @@ export const PurchasePlanDetail = useCrudSchemas(
 
       isTableForm: false,
       isForm: false,
-      isTable: false,
-      sortTableDefault: 6
-    },
-    {
-      label: '是否可用',
-      field: 'available',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string',
       isTable: true,
-      isTableForm: false,
-      isForm: false,
       hiddenInMain: true,
-      sort: 'custom',
+    },
+    {
+      label: '默认收货库区',
+      field: 'defaultAreaCode',
       table: {
         width: 150
       },
-      tableForm: {
-        type: 'Select',
-        inactiveValue: 'FALSE',
-        disabled: true
-      },
       form: {
-        component: 'Switch',
-        value: 'TRUE',
         componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
+          disabled: true
         }
-      }
-    },
-    {
-      label: '最后更新者',
-      field: 'updater',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      table: {
-        width: 150
       },
-      isForm: false
+      tableForm: {
+        disabled: true
+      },
+      isTableForm: true,
+      isForm: true,
+      isTable: true,
+      hiddenInMain: true,
     },
     {
-      label: '最后更新时间',
-      field: 'updateTime',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
+      label: '库区描述',
+      field: 'areaDescription',
       table: {
-        width: 180
+        width: 150
       },
-      isForm: false,
       form: {
-        component: 'DatePicker',
         componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
+          disabled: true
         }
-      }
-    },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
+      },
+      tableForm: {
+        disabled: true
+      },
+      isTableForm: true,
+      isForm: true,
+      isTable: false,
       hiddenInMain: true,
-      isTableForm: false,
-      table: {
-        width: 150
-      }
     },
+ 
+   
+   
+    // {
+    //   label: '在途数量',
+    //   field: 'notReceiveQty',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   isTableForm: false,
+    //   sortTableDefault: 7,
+    //   isForm: false,
+    //   isTable: true,
+    // },
+   
+
+    // {
+    //   label: '是否可用',
+    //   field: 'available',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   isTableForm: false,
+    //   isForm: false,
+    //   hiddenInMain: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     inactiveValue: 'FALSE',
+    //     disabled: true
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '最后更新者',
+    //   field: 'updater',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   table: {
+    //     width: 150
+    //   },
+    //   isForm: false
+    // },
+    // {
+    //   label: '最后更新时间',
+    //   field: 'updateTime',
+    //   sort: 'custom',
+    //   isTableForm: false,
+    //   hiddenInMain: true,
+    //   formatter: dateFormatter,
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   },
+    //   table: {
+    //     width: 180
+    //   },
+    //   isForm: false,
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       style: { width: '100%' },
+    //       type: 'datetime',
+    //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       valueFormat: 'x'
+    //     }
+    //   }
+    // },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   hiddenInMain: true,
+    //   isTableForm: false,
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     {
       label: '操作',
       field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 64c8ef6a9..6754f0406 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -64,6 +64,7 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
+    :isShowPackNumber="true"
     :annexTable="[
       {
         label: '质检明细',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 91c16dbe6..3d1210f6d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -16,8 +16,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
       width: 180
@@ -33,13 +33,14 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 180
     },
-    isSearch: true
+    isSearch: true,
+    isTable:false
   },
   {
     label: '供应商代码',
@@ -50,6 +51,15 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
   {
     label: '联系人姓名',
     field: 'contactName',
@@ -57,6 +67,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '联系人电话',
@@ -65,6 +76,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '联系人电子邮件',
@@ -73,6 +85,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从仓库代码',
@@ -81,6 +94,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -89,6 +103,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到月台代码',
@@ -97,6 +112,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '时间窗口',
@@ -105,6 +121,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '计划到货时间',
@@ -133,6 +150,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '运输方式',
@@ -142,6 +160,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '车牌号',
@@ -150,6 +169,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -158,6 +178,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '入库事务类型',
@@ -166,6 +188,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '执行时间',
@@ -186,6 +210,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail:false
   },
   {
     label: '生效日期',
@@ -207,6 +233,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -227,6 +254,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '截止时间',
@@ -247,6 +276,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '部门',
@@ -255,17 +286,20 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isDetail: false
   },
   {
     label: '业务类型',
@@ -274,6 +308,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '备注',
@@ -282,6 +318,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '创建时间',
@@ -311,6 +349,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建者',
@@ -319,6 +358,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '是否可用',
@@ -330,6 +370,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail: false
   },
   {
     label: '操作',
@@ -403,9 +444,10 @@ export const SupplierdeliverRecordMainRules = reactive({
  */
 export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -427,37 +469,24 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '品名',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '供应商发货数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
@@ -467,8 +496,19 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '供应商发货计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -478,8 +518,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '库存记录单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -488,9 +529,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '包装名称',
-    field: 'packName',
-    dictClass: 'string',
+    label: '转换率',
+    field: 'convertRate',
     isTable: true,
     sort: 'custom',
     table: {
@@ -498,23 +538,39 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable:false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -533,7 +589,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -554,7 +610,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -575,91 +631,100 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
   },
-  
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
- 
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
+
   {
     label: '物料描述1',
     field: 'itemDesc1',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -668,103 +733,22 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '最后操作时间',
-  //   field: 'updateTime',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  // },
-  // {
-  //   label: '最后操作人',
-  //   field: 'updater',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+ 
   {
     label: '操作',
     hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c9a88b9c4..7b5a0dce2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -218,7 +218,9 @@ import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import Decimal from "decimal.js"  // 具体文件中引入
 const { loadStart, loadDone } = usePageLoading()
+import { cloneDeep } from 'lodash-es'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -681,6 +683,7 @@ const buttonTableClick = async (val, row) => {
               // await getDetailList()
               count.value++
               await getGenerateLabelList(row)
+
               formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
             }
           })
@@ -719,6 +722,11 @@ const getGenerateLabelList = async (row) => {
       item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
+      if (!Decimal(item.convertRate) || Decimal(item.convertRate) == 1) {
+        item.balanceQty = item.qty
+      } else {
+        item.balanceQty =  parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5))
+      }
       let obj = item?.boxPackaging[0]
       if (obj) {
         item.packUnit = obj.packUnit
@@ -778,7 +786,7 @@ const footButtonClick = async (val) => {
       message.warning('托的包装数量要大于箱的包装数量,请修改')
       return
     }
-    const data = JSON.parse(JSON.stringify(detatableData1.value))
+    const data = cloneDeep(detatableData1.value)
     labelFormRef.value.openLabel(data)
   } else if (val == 'close') {
     formLabelRef.value.dialogVisible = false
@@ -790,6 +798,11 @@ const formSelectChangeLabel = (field, val, row) => {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
     if (obj) {
       row.packQty = obj.packQty
+      if (!Decimal(row.convertRate) || Decimal(row.convertRate) == 1) {
+        row.purchaseStdQty = row.packQty
+      } else {
+        row.purchaseStdQty = parseFloat(Decimal(parseFloat(row.packQty)).div(Decimal(parseFloat(row.convertRate))).toNumber().toFixed(5))
+      }
       // 如果没有数量可以输入
       if (!row.packQty) {
         SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
@@ -1164,6 +1177,7 @@ const submitFormLabel = async (list) => {
     const data = {
       subList: list
     }
+    console.log(33,data)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index f2b7a16f7..2e8d8b4b4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -154,15 +154,15 @@
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="150" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="150" prop="uom" align="center">
+      <el-table-column label="库存数量" width="150" prop="balanceQty" align="center" />
+      <el-table-column label="库存计量单位" width="150" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
       <!-- <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
       <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
       <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" /> -->
-      <el-table-column label="箱规格" width="200" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="200" prop="packQty" align="center" />
+      <el-table-column label="包装规格" width="200" prop="packUnit" align="center" />
+      <el-table-column label="库存标包数量" width="200" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"
@@ -230,9 +230,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息和箱信息是否都存在
   if (row.secondPackUnit && row.secondPackQty && row.packUnit && row.packQty) {
     // 总共需要多少箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 放满的多少箱
-    row.manXiangQty = Math.floor(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.manXiangQty = Math.floor(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
     row.otherNumber = Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
     // 数量%托数量  获取总共几托
@@ -245,9 +245,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
     console.log(11, row.tuoInManNumber)
     // 数量除以托数量获取余数
     row.lastNumber =
-      parseFloat(row.qty) >= parseFloat(row.tuoInManNumber)
-        ? accuracyFun.subtract(parseFloat(row.qty), parseFloat(row.tuoInManNumber))
-        : parseFloat(row.qty)
+      parseFloat(row.balanceQty) >= parseFloat(row.tuoInManNumber)
+        ? accuracyFun.subtract(parseFloat(row.balanceQty), parseFloat(row.tuoInManNumber))
+        : parseFloat(row.balanceQty)
     // 循环托
     row.packageList = []
     for (let i = 0; i < row.allTuoQty; i++) {
@@ -314,7 +314,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 只有箱规格
   if (!row.secondPackUnit && row.packUnit && row.packQty) {
     // 数量%每箱数量  获取总共几箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     row.packageList = []
     row.allTuoQty = ''
     row.allTuoQty1 = 1
@@ -325,7 +325,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
       row.packageList[i] = {
         id: oneId.value,
         // xPoNumber: i + 1,
-        qtyOne: row.qty,
+        qtyOne: row.balanceQty,
         isTuo: 0 //无托
       }
     }
@@ -338,7 +338,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
           // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
-        cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+        cur.lastNumber = parseFloat(row.balanceQty) % parseFloat(row.packQty)
         // 如果有余数
         if (cur.lastNumber) {
           // 最后一条信息直接展示余数的信息
@@ -407,16 +407,14 @@ const submitForm = () => {
         )
         // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
-      console.log(111, item.allNumber)
-      console.log(222, parseFloat(item.qty))
-      return item.allNumber != parseFloat(item.qty)
+      return item.allNumber != parseFloat(item.balanceQty)
     })
     console.log(222, obj)
     // return
     // const isBol = arr.some((item) => item == false)
     if (obj) {
       message.warning(
-        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.qty}】`
+        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.balanceQty}】`
       )
       return
     }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index ad3c3c283..782a7a79c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -60,20 +60,35 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    detail: {
+      sortDetailDefault:1,
+    },
     isSearch: true,
     isForm: false
   },
+ 
   {
-    label: '单据号',
-    field: 'number',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: false,
     sort: 'custom',
     table: {
-      width: 180,
-      fixed: 'left'
+      width: 150
     },
-    isTable:false,
-    isForm: false,
-    isSearch: true,
+    sortTableDefault: 2,
+    detail: {
+      sortDetailDefault: 2,
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '供应商代码',
@@ -82,8 +97,13 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
+    isTable: true,
     isSearch: true,
+
+    sortTableDefault: 5,
+    detail: {
+      sortDetailDefault:5,
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -106,7 +126,21 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    sortTableDefault: 6,
+    isTable: true,
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isDetail:false,
+    detail: {
+      sortDetailDefault: 6,
+    }
+  },
   {
     label: '要货计划单号',
     field: 'ppNumber',
@@ -115,7 +149,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    sortTableDefault:9,
+    // sortTableDefault:9,
+    sortTableDefault: 4,
     form: {
       // labelMessage: '信息提示说明！！！', 
       componentProps: {
@@ -158,12 +193,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           isFormModel: true
         }], // 失去焦点校验参数
       }
+    },
+    detail: {
+      sortDetailDefault: 4,
     }
   },
   {
     label: '要求到货时间',
     field: 'arriveTime',
     formatter: dateFormatter,
+    isDetail:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -184,7 +223,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '采购订单',
+    label: '订单号',
     field: 'poNumber',
     isForm:true,
     isTable:false,
@@ -196,32 +235,19 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+
   {
-    label: '计划到货时间',
-    field: 'planArriveTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
+    isTable:false,
     table: {
-      width: 180
-    },
-    isTable:true,
-    sortTableDefault:6,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
   },
   {
-    label: '发货联系人姓名',
-    field: 'contactName',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
     isTable:false,
     table: {
@@ -229,24 +255,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '发货联系人电话',
-    field: 'contactPhone',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
+    isDetail:true,
     table: {
       width: 150
     },
   },
   // {
-  //   label: '联系人电子邮件',
-  //   field: 'contactEmail',
-  //   sort: 'custom',
-  //   isTable:false,
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
   //   label: '供应商发货仓库代码',
   //   field: 'fromWarehouseCode',
   //   sort: 'custom',
@@ -261,6 +279,16 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   },
   //   isForm: true
   // },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -291,7 +319,29 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    // sortTableDefault:6,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
   {
     label: '承运商',
     field: 'carrierCode',
@@ -320,20 +370,20 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  // {
-  //   label: '业务类型',
-  //   field: 'businessType',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     value: 'SupplierDeliver',
-  //     componentProps: {
-  //       disabled: true,
-  //     }
-  //   }
-  // },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'SupplierDeliver',
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',
@@ -341,7 +391,27 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable: false
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '是否上架',
+    field: 'isPutaway',
+    sort: 'custom',
+    dictClass: 'string',
+    isForm: false,
+    isTableForm: false,
+    isTable: false,
+    detail: {
+      dictType: 'primary',
+      valueFilter: (value) => {
+        if (value == 1) {
+          return `是`
+        } else {
+          return '否'
+        }
+      }
+    }
   },
   {
     label: '创建时间',
@@ -351,7 +421,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    isTable:false,
+    isTable:true,
     table: {
       width: 180
     },
@@ -373,64 +443,68 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortSearchDefault: 1000,
+    sortTableDefault: 1000,
     isForm: false
   },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    isTable:false,
+    isTable: true,
+    sortSearchDefault: 1000,
+    sortTableDefault: 1000,
     table: {
       width: 150
     },
     isForm: false
   },
-  {
-    label: '申请时间',
-    field: 'requestTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    formatter: dateFormatter,
-    detaul: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
+  // {
+  //   label: '申请时间',
+  //   field: 'requestTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '截止时间',
+  //   field: 'dueTime',
+  //   formatter: dateFormatter,
+  //   detaul: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
   // {
   //   label: '部门',
   //   field: 'departmentCode',
@@ -454,143 +528,124 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //     }
   //   }
   // },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
-    isSearch: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:false,
-    isForm: false
-  },
-  {
-    label: '自动提交',
-    field: 'autoCommit',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable:false,
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoCommit,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoAgree,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '自动执行',
-    field: 'autoExecute',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
-    form: {
-      component: 'Switch',
-      value: requestsettingData.autoExecute,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
-  {
-    label: '直接生成记录',
-    field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'Switch',
-      value: requestsettingData.directCreateRecord,
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true,
-      }
-    }
-  },
+ 
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   isTable:false,
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:false,
+  //   isForm: false
+  // },
+  // {
+  //   label: '自动提交',
+  //   field: 'autoCommit',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable:false,
+  //   sort: 'custom',
+  //   isForm:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoCommit,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动通过',
+  //   field: 'autoAgree',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoAgree,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '自动执行',
+  //   field: 'autoExecute',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false,
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.autoExecute,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '直接生成记录',
+  //   field: 'directCreateRecord',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isForm: false,
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: requestsettingData.directCreateRecord,
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE',
+  //       disabled: true,
+  //     }
+  //   }
+  // },
   {
     label: '操作',
     field: 'action',
@@ -664,32 +719,91 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    // sortTableDefault:10,
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        disabled: true,
+        // isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
+          {
+            key: 'isAll',
+            value: '1',
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
       }
     },
     tableForm: {
-      disabled: true
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'flag',
+          value: 1,
+          isMainValue: false
+        },
+        {
+          key: 'isAll',
+          value: '1',
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
     }
   },
+  
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
-    isSearch:true,
     table: {
       width: 150
     },
-    sortTableDefault:3,
     form: {
       componentProps: {
         disabled: true
@@ -700,243 +814,162 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '申请发货数量',
-    field: 'qty',
+    label: '品番',
+    field: 'itemCode',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },
-    sortTableDefault:4,
+    // sortTableDefault:3,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0,
-        precision: 6
+        disabled: true
       }
     },
     tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
+      disabled: true
     }
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    sortTableDefault:7,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm: {
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
   },
   {
-    label: '供应商批次',
-    field: 'supplierBatch',
+    label: '物料描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:8,
-    tableForm: {
-      disabled: false
-    }
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
   },
   {
-    label: '发货批次',
-    field: 'batch',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
+    isForm: false
   },
   {
-    label: '计划数量',
-    field: 'planQty',
-    sort: 'custom',
+    label: '订单数量',
+    field: 'orderQty',
     table: {
       width: 150
     },
-    isTable:false,
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      precision: 6
-    },
+    hiddenInMain: true,
+    isTableForm: false,
     form: {
       component: 'InputNumber',
       componentProps: {
+        disabled: true,
         min: 0,
         precision: 6
       }
-    }
-  },
-  {
-    label: '已发货数量',
-    field: 'shippedQty',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
       disabled: true,
       type: 'InputNumber',
+      min: 0,
       precision: 6
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
     }
   },
-  
-  
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false
-  // },
   {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
+    label: '供应商批次',
+    field: 'supplierBatch',
     sort: 'custom',
-    hiddenInMain:true,
     table: {
-      width: 180
-    },
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
+      width: 150
     },
-    
-    isTableForm: false,
+    // sortTableDefault:8,
+    hiddenInMain: true,
+    isTable: false,
     tableForm: {
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
+      disabled: false
     }
   },
   {
-    label: '过期日期',
-    hiddenInMain:true,
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    isTableForm:false, 
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
+      width: 150
     },
-    // tableForm: {
-    //   type: 'FormDate',
-    //   dateFormat: 'YYYY-MM-DD',
-    //   valueFormat: 'x',
-    // }
-    tableForm:{
-      type: 'slot',
+    tableForm: {
       disabled: true
     }
   },
-  // {
-  //   label: '发货数量',
-  //   field: 'qty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   sortTableDefault:2,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     }
-  //   },
-  //   tableForm: {
-  //     type: 'InputNumber',
-  //     min: 1,
-  //     precision: 6
-  //   }
-  // },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '发货数量',
+    field: 'qty',
+    sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
+    // sortTableDefault:4,
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled: true,
         min: 0,
         precision: 6
       }
     },
     tableForm: {
-      disabled: true,
       type: 'InputNumber',
       min: 0,
       precision: 6
     }
   },
-  
   {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
+    label: '发货计量单位',
+    field: 'uom',
     sort: 'custom',
-    hiddenInMain:true,
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    // sortTableDefault:5,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    }
+  },
+
+
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
+    sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -944,37 +977,37 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         min: 1,
-        precision: 6
+        precision: 5
       }
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
       type: 'InputNumber',
       min: 1,
-      precision: 6
+      precision: 5,
+      disabled: true,
     }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true,
     }
   },
   {
     label: '转换率',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'convertRate',
     sort: 'custom',
     table: {
@@ -983,191 +1016,255 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0
+        min: 0,
+        disabled: true,
       }
     },
-    isTableForm: false,
     isForm: false,
     tableForm: {
       type: 'InputNumber',
-      min: 0
+      min: 0,
+      disabled:true,
     }
   },
   {
-    label: '单据号',
-    hiddenInMain:true,
-    field: 'number',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
-      width: 180
+      width: 150
     },
     isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isForm: false,
   },
-  
   {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
+    label: '包装规格',
+    field: 'packUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    hiddenInMain: true,
     isTable: true,
-    sortTableDefault:5,
+    sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    }
+    isTableForm: false,
+    isForm: false,
   },
+ 
   {
-    label: '采购订单号',
-    field: 'poNumber',
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
     sort: 'custom',
+    hiddenInMain: true,
     table: {
-      width: 150
+      width: 180
     },
-    isSearch:true,
-    sortTableDefault:10,
+    isForm: false,
+    isTable:false,
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'DatePicker',
       componentProps: {
-        disabled:true,
-        // isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'ppNumber',
-            message: '请填写要货计划单号！',
-            isMainValue: true
-          },
-          {
-            key: 'flag',
-            value: 1,
-            isMainValue: false
-          },
-          {
-            key: 'isAll',
-            value: '1',
-            isMainValue: false
-          },  
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
+
+    isTableForm: false,
     tableForm: {
-      disabled:true,
-      isInpuFocusShow: false,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
-      searchCondition: [
-        {
-          key: 'number',
-          value: 'ppNumber',
-          message: '请填写要货计划单号！',
-          isMainValue: true
-        },
-        {
-          key: 'flag',
-          value: 1,
-          isMainValue: false
-        },
-        {
-          key: 'isAll',
-          value: '1',
-          isMainValue: false
-        },  
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
     }
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    // sortTableDefault:7,
+    hiddenInMain: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '过期日期',
+    hiddenInMain: true,
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    isTableForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    // tableForm: {
+    //   type: 'FormDate',
+    //   dateFormat: 'YYYY-MM-DD',
+    //   valueFormat: 'x',
+    // }
+    tableForm: {
+      type: 'slot',
+      disabled: true
+    }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '计划数量',
+    field: 'planQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    isTable:false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
   },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '已发货数量',
+    field: 'shippedQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 6
+    },
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
   },
+  
+  
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
+  
+  
+  // {
+  //   label: '发货数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
+ 
+  // {
+  //   label: '单据号',
+  //   hiddenInMain:true,
+  //   field: 'number',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTableForm: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+  
+
+
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '从货主代码',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable: false,
     isForm: false
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
     isTableForm: false,
+    isTable: false,
     isForm: false
   },
+
   {
     label: '创建时间',
     field: 'createTime',
@@ -1175,7 +1272,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    hiddenInMain:false,
+    hiddenInMain: false,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1201,6 +1299,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     hiddenInMain:false,
     isTableForm: false,
+    isTable: false,
     isForm: false,
   },
   // {
@@ -1266,188 +1365,77 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
 const validateBatch = (rule: any, value: any, callback: any) => {
   const reg = /^[_a-zA-Z0-9]+$/;
   if (value == '' || value == undefined || value == null) {
-      callback();
-  } else {
-      if (!reg.test(value)) {
-          callback(new Error('英文字母、数字或下划线'));
-      } else {
-          callback();
-      }
-  }
-}
-
-const validateQty = (rule: any, value: any, callback: any,a,b) => {
-  console.log('validateQty',rule, value,a,b)
-  if (!value) {
-      callback(new Error('发货数量必须大于0'));
-  } else {
-      callback();
-  }
-}  
-//表单校验
-export const SupplierdeliverRequestDetailRules = reactive({
-  // packingNumber: [
-  //   { required: true, message: '请输入包装号', trigger: 'blur' }
-  // ],
-  // qty:[
-  //   { required: true, message: '请输入发货数量', trigger: 'change' },
-  //   { validator: validateQty, trigger: 'change' },
-  // ],
-  supplierBatch: [
-    { required: true, message: '请输入供应商批次', trigger: 'blur' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator: validateBatch, trigger: 'change' }
-  ],
-  produceDate: [
-    { required: true, message: '请输入生产日期', trigger: 'blur' }
-  ],
-  packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' },
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
-  ],
-  poNumber: [
-    { required: true, message: '请选择订单号', trigger: 'change' }
-  ],
-  poLine: [
-    { required: true, message: '请选择订单行', trigger: 'change' }
-  ],
-  packUnit: [
-    { required: true, message: '请选择包装规格', trigger: 'change' }
-  ],
-  secondPackUnit: [
-    { required: false, message: '请选择包装规格2', trigger: 'change' }
-  ],
-  secondPackQty: [
-    { required: false, message: '请输入包装数量2', trigger: 'blur' },
-    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
-  ],
-  convertRate: [
-    { required: true, message: '请输入转换率', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
-  ],
-  remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
-})
-
-export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-        
-      }
-    },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: false,
-  //   isForm: false,
-  //   tableForm:{
-  //     disabled:true
-  //   }
-  // },
-  {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    isTableForm: false,
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '过期日期',
-    field: 'expireDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD',
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        disabled:true,
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+      callback();
+  } else {
+      if (!reg.test(value)) {
+          callback(new Error('英文字母、数字或下划线'));
+      } else {
+          callback();
       }
-    },
-    tableForm: {
-      disabled:true,
-      type: 'FormDate',
-      dateFormat: 'YYYY-MM-DD',
-      valueFormat: 'x',
-    }
-  },
+  }
+}
+
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  console.log('validateQty',rule, value,a,b)
+  if (!value) {
+      callback(new Error('发货数量必须大于0'));
+  } else {
+      callback();
+  }
+}  
+//表单校验
+export const SupplierdeliverRequestDetailRules = reactive({
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'blur' }
+  // ],
+  // qty:[
+  //   { required: true, message: '请输入发货数量', trigger: 'change' },
+  //   { validator: validateQty, trigger: 'change' },
+  // ],
+  supplierBatch: [
+    { required: true, message: '请输入供应商批次', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateBatch, trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  secondPackUnit: [
+    { required: false, message: '请选择包装规格2', trigger: 'change' }
+  ],
+  secondPackQty: [
+    { required: false, message: '请输入包装数量2', trigger: 'blur' },
+    // { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+})
+
+export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单号',
     field: 'poNumber',
@@ -1458,7 +1446,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled:true,
+        disabled: true,
         isSearchList: false,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
@@ -1483,7 +1471,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     tableForm: {
       isInpuFocusShow: false,
-      disabled:true,
+      disabled: true,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
       searchTitle: '要货计划信息',
@@ -1520,30 +1508,66 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
       componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
+        disabled: true
       }
     },
     tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
+      disabled: true
     }
   },
-  
   {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+
+  {
+    label: '发货数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1552,33 +1576,30 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       component: 'InputNumber',
       componentProps: {
         disabled:true,
-        min: 1,
+        min: 0,
         precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
     tableForm: {
       disabled:true,
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
+    label: '发货计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    isSearch: true,
     isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'Select'
     }
   },
@@ -1595,63 +1616,68 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         min: 0
       }
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false,
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'InputNumber',
       min: 0
     }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '库存数量',
+    field: 'balanceQty',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isTableForm: false,
     form: {
       componentProps: {
-        disabled: true
       }
+    },
+    tableForm: {
+      disabled: true
     }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '库存计量单位',
+    field: 'uom',
     sort: 'custom',
     table: {
       width: 150
     },
+    dictType: DICT_TYPE.UOM,
     form: {
+      component: 'Select',
       componentProps: {
-        disabled: true
       }
     },
     tableForm: {
+      type: 'Select',
       disabled: true
     }
+
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
+    label: '包装规格',
+    field: 'packUnit',
     isTable: true,
-    table: {
-      width: 150
+    sort: 'custom',
+    form: {
     },
     tableForm: {
-      disabled:true,
-      type: 'Select'
+      type: 'Select',
+      labelField: 'packName',
+      valueField: 'packUnit',
+      initOptions: [{
+        label: '',
+        value: ''
+      }]
     }
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '发货标包数量',
+    field: 'purchaseStdQty',
     sort: 'custom',
     table: {
       width: 150
@@ -1659,36 +1685,20 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:true,
+        disabled: true,
         min: 0,
-        precision: 6
+        precision: 5
       }
     },
     tableForm: {
-      disabled:true,
+      disabled: true,
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      precision: 5
     }
   },
   {
-    label: '箱规格',
-    field: 'packUnit',
-    isTable: true,
-    sort: 'custom',
-    form: {
-    },
-    tableForm: {
-      type: 'Select',
-      labelField: 'packName',
-      valueField: 'packUnit',
-      initOptions: [{
-        label: '',
-        value: ''
-      }]
-    }
-  },{
-    label: '箱规格数量',
+    label: '库存标包数量',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -1699,9 +1709,11 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      disabled:true
+      disabled: true
     }
   },
+
+
   // {
   //   label: '托规格',
   //   field: 'secondPackUnit',
@@ -1734,46 +1746,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
   //     disabled:true
   //   }
   // },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
+  
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index adf7e94ef..d418e93e9 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index a71f464b7..517eb4866 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f826010e..0f880d9d8 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1098,7 +1098,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {