Merge remote-tracking branch 'remotes/origin/intex_onlin20250418' into intex

# Conflicts:
#	src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -138,7 +138,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增
+  // defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增
   defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入
   defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackage:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -916,8 +916,9 @@ export const PurchasePlanDetail = useCrudSchemas(
         isPlaceholder:false
       }
     },
+    
     {
-      label: '箱数',
+      label: '计划采购数量',
       field: 'planQty',
       sort: 'custom',
       sortSearchDefault: 9,
@@ -937,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-    // {
+    {
-    //   label: '订单数量',
+      label: '箱数',
-    //   field: 'orderQty',
+      field: 'orderQty',
-    //   sort: 'custom',
+      sort: 'custom',
-    //   sortSearchDefault: 8,
+      sortSearchDefault: 8,
-    //   sortTableDefault:23,
+      sortTableDefault:23,
-    //   table: {
+      table: {
-    //     width: 150
+        width: 150
-    //   },
+      },
-    //   form: {
+      form: {
-    //     componentProps: {
+        componentProps: {
-    //       disabled: true
+          disabled: true
-    //     }
+        }
-    //   },
+      },
-    //   tableForm: {
+      tableForm: {
-    //     disabled: true
+        disabled: true
-    //   }
+      }
-    // },
+    },
     {
       label: '采购标包数量',
       field: 'purchaseStdQty',
@@ -1038,6 +1039,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false,
       isTable: true,
+      hiddenInMain: true,
     },
     {
       label: '已收采购数量',