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

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

@@ -17,7 +17,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
     isSearch: true,
-    sortSearchDefault:1
+    sortSearchDefault:1,
+    sortTableDefault:1
+
   },
   {
     label: '申请单号',
@@ -26,6 +28,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault:2
   },
   {
     label: '任务单号',
@@ -34,6 +37,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault:3
   },
   {
     label: '发货单号',
@@ -42,6 +46,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault:4,
     isSearch: true
   },
   {
@@ -61,6 +66,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 200
     },
+    sortTableDefault:5,
   },
   {
     label: '要货计划单号',
@@ -80,7 +86,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     sortSearchDefault:2,
-    isTable:true
+    isTable:false
   },
   {
     label: '到月台代码',
@@ -410,7 +416,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1000
+    sortTableDefault:12,
   },
   {
     label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
@@ -419,7 +425,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    sortTableDefault:1001
+    sortTableDefault:16,
+  },
+  {
+    label: '检验申请单号',
+    field: 'inspectNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:12,
   },
 ]))
 
@@ -482,8 +506,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     table: {
       width: 180,
-      fixed: 'left'
     },
+    sortTableDefault:1998,
     hiddenInMain:true
   },
   {
@@ -493,6 +517,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    sortTableDefault:6,
   },
   {
     label: '采购订单号',
@@ -501,6 +527,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortSearchDefault:5,
+    sortTableDefault:7,
     isSearch: true
   },
   {
@@ -510,6 +538,22 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortSearchDefault:5,
+    sortTableDefault:8,
+  },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:9,
+    hiddenInMain:true,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
   },
   {
     label: '物料代码',
@@ -518,6 +562,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:10,
     isSearch: true
   },
   {
@@ -527,6 +572,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:10,
   },
   {
     label: '物料描述1',
@@ -535,6 +581,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:11,
     hiddenInMain:true
   },
   {
@@ -544,6 +591,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:11,
     hiddenInMain:true
   },
   {
@@ -553,6 +601,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:14,
     hiddenInMain:true
   },
   {
@@ -562,6 +611,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:14,
     hiddenInMain:true
   },
   {
@@ -571,6 +621,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -580,6 +631,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:15,
     hiddenInMain:true
   },
   {
@@ -589,6 +641,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:15,
     hiddenInMain:true
   },
   {
@@ -598,6 +651,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -607,8 +661,30 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+    hiddenInMain:true,
+    sortTableDefault:1004
+  },
+  {
+    label: '收货数量',
+    field: 'receivedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault:12,
+  },
   {
     label: '数量',
     field: 'qty',
@@ -616,10 +692,11 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     },
-    sortTableDefault:1000
+    sortTableDefault:12,
   },
   {
     label: '计量单位',
@@ -631,7 +708,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:1000
+    sortTableDefault:13,
   },
   {
     label: '包装规格',
@@ -642,7 +719,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:1001
+    sortTableDefault:16,
   },
   {
     label: '包装数量',
@@ -654,10 +731,12 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
     },
-    sortTableDefault:1001
+    tableForm: {
+      disabled: true,
+    },
+    isForm:false,
+    sortTableDefault:16,
   },
-  
-
   {
     label: '供应商计量数量',
     field: 'supplierQty',
@@ -668,6 +747,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
     },
+    sortTableDefault:24,
     hiddenInMain:true
   },
   {
@@ -680,6 +760,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:24,
     hiddenInMain:true
   },
   
@@ -693,6 +774,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:18,
     hiddenInMain:true
   },
   {
@@ -702,7 +784,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:1100
+    sortTableDefault:18,
 
   },
   {
@@ -712,60 +794,66 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:1101
+    sortTableDefault:18,
   },
   {
-    label: '从库位组代码',
+    label: '从库位组',
     field: 'fromLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
     hiddenInMain:true
   },
   {
-    label: '到库位组代码',
+    label: '到库位组',
     field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
     hiddenInMain:true
   },
   {
-    label: '从库区代码',
+    label: '从库区',
     field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:22,
     hiddenInMain:true,
   },
   {
-    label: '到库区代码',
+    label: '到库区',
     field: 'toAreaCodes',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:22,
     hiddenInMain:true
   },
   {
-    label: '从货主代码',
+    label: '从货主',
     field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:23,
     hiddenInMain:true
   },
   {
-    label: '到货主代码',
+    label: '到货主',
     field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:23,
     hiddenInMain:true
   },
   {
@@ -788,6 +876,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    sortTableDefault:17,
     hiddenInMain:true
   },
   {
@@ -810,6 +899,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    sortTableDefault:17,
     hiddenInMain:true
   },
   {
@@ -832,6 +922,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    sortTableDefault:17,
     hiddenInMain:true
   },
   {
@@ -844,6 +935,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
     },
+    sortTableDefault:1997,
     hiddenInMain:true
   },
   {
@@ -853,6 +945,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -862,6 +955,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -869,7 +963,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'failedReason',
     dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -886,6 +980,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -898,6 +993,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'InputNumber',
     },
+    isTable:false,
     hiddenInMain:true
   },
   // {
@@ -916,6 +1012,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1998,
     hiddenInMain:true
   },
   // {
@@ -936,6 +1033,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true
   },
   {
@@ -945,7 +1043,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddenInMain:true
+    hiddenInMain:true,
+    sortTableDefault:2000,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    sortTableDefault:2000,
   },
   {
     label: '创建时间',
@@ -967,16 +1076,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         valueFormat: 'x',
       }
     },
+    sortTableDefault:2000,
   },
-  {
+  
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true
-  },
   {
     label: '操作',
     hiddenInMain:true,
@@ -1454,6 +1556,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
         disabled:true
       }
     },
+    sortTableDefault:21,
     tableForm: {
       disabled: true,
     }
@@ -1470,6 +1573,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
         disabled:true
       }
     },
+    sortTableDefault:21,
     tableForm: {
       disabled: true,
     }