采购上架+采购退货

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -14,7 +14,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
-    sortSearchDefault: 1
+    sortSearchDefault: 1,
   },
   {
     label: '申请单号',
@@ -33,6 +33,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 4,
     sortSearchDefault: 4
   },
   {
@@ -659,6 +660,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 17,
     hiddenInMain:true,
   },
   {
@@ -668,6 +670,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 17,
     hiddenInMain:true,
   },
   {
@@ -678,7 +681,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    sortTableDefault: 1002
+    sortTableDefault: 10,
   },
   {
     label: '包装规格',
@@ -687,7 +690,19 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault: 1002
+    sortTableDefault: 10,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '器具号',
@@ -696,6 +711,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
@@ -706,7 +722,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
-    sortTableDefault: 1001,
+    sortTableDefault: 9,
     sortSearchDefault: 6
   },
   {
@@ -716,38 +732,43 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
   },
   {
-    label: '从库位代码',
+    label: '库存状态',
-    field: 'fromLocationCode',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
   {
-    label: '到库位代码',
+    label: '从库位代码',
-    field: 'toLocationCode',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
   {
-    label: '库存状态',
+    label: '到库位代码',
-    field: 'inventoryStatus',
+    field: 'toLocationCode',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault: 15,
     hiddenInMain:true,
   },
+  
   {
     label: '订单号',
     field: 'poNumber',
@@ -755,6 +776,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 5,
   },
   {
     label: '订单行',
@@ -763,18 +785,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-  },
+    sortTableDefault: 6,
-  {
-    label: '原因',
-    field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -784,6 +795,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    sortTableDefault: 7,
     sortSearchDefault: 5
   },
   {
@@ -793,6 +805,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 7,
   },
   {
     label: '物料描述1',
@@ -802,6 +815,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain:true,
+    sortTableDefault: 8,
   },
   {
     label: '物料描述2',
@@ -811,6 +825,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain:true,
+    sortTableDefault: 8,
   },
   {
     label: '项目代码',
@@ -819,6 +834,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 18,
     hiddenInMain:true,
   },
   {
@@ -831,7 +847,32 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
     },
-    sortTableDefault: 1003
+    sortTableDefault: 12,
+  },
+  {
+    label: '退货数量',
+    field: 'returnedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+        disabled:false
+      }
+    },
+    sortTableDefault: 11,
+    hiddenInMain:true,
+    isForm:false,
+    tableForm:{
+      type:'InputNumber',
+      min:0,
+      precision: 6,
+      disabled:false
+    }
   },
   {
     label: '计量单位',
@@ -843,7 +884,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault: 1003
+    sortTableDefault: 12,
   },
   {
     label: '单据号',
@@ -852,6 +893,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 20,
     hiddenInMain:true,
   },
   {
@@ -861,6 +903,31 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
+    sortTableDefault: 20,
+    hiddenInMain:true,
+  },
+  {
+    label: '原因',
+    field: 'reason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 20,
+    hiddenInMain:true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 20,
     hiddenInMain:true,
   },
   {
@@ -874,6 +941,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 20,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -884,15 +952,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+  
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-  }
 ]))
 
 //表单校验

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@@ -661,6 +661,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     hiddenInMain: true,
+    isTable:false,
   },
   {
     label: '批次',

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -528,6 +528,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
     hiddenInMain:true,
   },
   {