Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -206,6 +206,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.PLAN_STATUS,
     dictClass: 'string',
     isSearch: true,
+    isForm:false,
   },
   {
     label: '是否可用',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -610,8 +610,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
+    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
-    field: 'toPackingNumber',
+    field: 'toBatch',
     sort: 'custom',
     isForm:false,
     isTableForm:false,
@@ -621,8 +621,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:1001,
   },
   {
-    label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面
+    label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面
-    field: 'toBatch',
+    field: 'toPackingNumber',
     sort: 'custom',
     isForm:false,
     isTableForm:false,
@@ -631,6 +631,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:1001,
   },
+  
 ]))
 
 //表单校验
@@ -809,7 +810,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     hiddenInMain:true,
   },
   {
-    label: '从库位代码',
+    label: '来源库位',
     field: 'fromLocationCode',
     sort: 'custom',
     table: {
@@ -818,7 +819,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:1005
   },
   {
-    label: '到库位代码',
+    label: '目标库位',
     field: 'toLocationCode',
     sort: 'custom',
     table: {
@@ -846,7 +847,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '包装数量',
-    field: 'packQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1309,7 +1310,7 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(reactive<Cru
     }
   },
   {
-    label: '包装数量',
+    label: '包装数量1',
     field: 'packQty',
     sort: 'custom',
     table: {