Merge branch 'refs/heads/intex_online20250725' into intex

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -204,16 +204,16 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isTable: false,
   // },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: true,
+  //   isTable: true,
-    sortTableDefault:1000,
+  //   sortTableDefault:1000,
-  },
+  // },
   // {
   //   label: '自动完成',
   //   field: 'autoComplete',

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts

@@ -289,15 +289,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    sortTableDefault:32,
+  //   sortTableDefault:32,
-  },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue

@@ -749,7 +749,7 @@ const submitForm = async (formType, submitData) => {
   parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
 );
 if(cmdExists){
-  message.warning("库存数量为正式，则数量不能大于库存数量")
+  message.warning("库存数量为正时，数量不能大于库存数量")
   return
 }
 // 1. 筛选出 inventoryQty <= 0 的记录，并提取它们的 itemCode

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -76,6 +76,7 @@
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
     :isShowPackNumber="true"
+    :tabsExtend="true"
   />
 
   <!-- 记录子包装弹窗 -->