From e92e1387f1b1ce43642e471bb079c0e9b836d515 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 26 Apr 2024 16:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=B8=8E=E6=98=BE=E9=9A=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptscrapRequestMain.data.ts    | 141 ++++++++++++------
 1 file changed, 98 insertions(+), 43 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
index a7e639626..bf1a2fda8 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts
@@ -67,6 +67,25 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '生产计划单号',
     field: 'productionPlanNumber',
@@ -76,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     isForm: false,
+    isTable:false,
   },
   {
     label: '车间代码',
@@ -109,6 +129,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -133,6 +154,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1001,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -150,6 +172,24 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '收货类型',
+    field: 'type',
+    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'scrap',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+    isTable: false,
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -157,6 +197,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -164,11 +205,11 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     isForm: false,
   },
   {
@@ -178,6 +219,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -193,6 +235,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -224,6 +267,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -233,6 +277,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -255,6 +300,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -277,6 +323,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '部门',
@@ -300,27 +347,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'id'
         }
       }
-    }
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTable: false,
   },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -341,7 +371,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -350,14 +381,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '自动提交',
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -378,7 +410,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -399,7 +431,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -436,22 +468,6 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '收货类型',
-    field: 'type',
-    dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: 'scrap',
-      componentProps: {
-        disabled: true
-      }
-    },
-  },
   {
     label: '操作',
     field: 'action',
@@ -637,6 +653,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -647,6 +665,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -655,8 +675,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -670,6 +691,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -680,6 +703,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     isForm: false
   },
@@ -690,6 +715,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -705,8 +732,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'packUnit',
     // dictType: DICT_TYPE.PACK_UNIT,
     // dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -717,6 +745,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable: false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -730,6 +760,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -744,6 +776,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1003,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码',
@@ -791,6 +824,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:1004,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -835,6 +869,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -856,6 +891,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -866,6 +903,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -876,6 +915,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain:true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -883,6 +924,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    sortTableDefault:1006,
     table: {
       width: 150
     },
@@ -904,6 +946,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    sortTableDefault:1007,
     isTable: true,
     sort: 'custom',
     table: {
@@ -921,6 +964,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
+    sortTableDefault:1008,
     sort: 'custom',
     table: {
       width: 180
@@ -942,6 +986,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
+    hiddenInMain:true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -967,6 +1013,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '备注',
     field: 'remark',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -975,6 +1023,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建时间',
     field: 'createTime',
+    sortTableDefault:1009,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -998,6 +1047,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '创建者',
     field: 'creator',
+    sortTableDefault:1010,
     sort: 'custom',
     table: {
       width: 150
@@ -1008,6 +1058,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTable: false,
+    hiddenInMain:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1031,6 +1083,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '最后更新者',
     field: 'updater',
+    isTable: false,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -1041,6 +1095,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '操作',
     field: 'action',
+    hiddenInMain:true,
     isDetail: false,
     isForm: false ,
     table: {