From 329e364d3190f6f6a57696f30f5767a92f365a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 19 Oct 2023 10:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SearchTable/src/SearchTable.vue           |  4 +-
 src/utils/disposition/tableColumns.ts         | 42 +++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index b88c49fb7..915e3c70c 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -94,10 +94,10 @@ const submitForm = async () => {
   width: 80% !important;
 }
 .searchHeardClass{
-  height: 200px;
+  height: 50px;
 }
 .searchTableClass{
-  height: 300px;
+  height: 450px;
   overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index 36e0f8e43..d6163b055 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -700,6 +700,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     label: '父物料代码',
     field: 'productItemCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -708,6 +709,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     label: '子物料代码',
     field: 'componentItemCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -717,28 +719,42 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'componentUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    sort: 'custom',
     isSearch: true,
-    isTable: true
+    isTable: true,
+    table: {
+      width: 150
+    }
   },
   {
     label: '子物料数量',
     field: 'componentQty',
     isSearch: true,
+    sort: 'custom',
     form: {
       component: 'InputNumber',
+    },
+    table: {
+      width: 120
     }
   },
   {
     label: '工序代码',
-    field: 'processCode'
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 120
+    }
   },
   {
     label: '版本',
-    field: 'version'
+    field: 'version',
+    sort: 'custom'
   },
   {
     label: '层级',
     field: 'layer',
+    sort: 'custom',
     // form: {
     //   component: 'Input',
     //   componentProps: {
@@ -751,6 +767,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效时间',
     field: 'activeTime',
     isTable: true,
+    sort: 'custom',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -769,6 +786,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效时间',
     field: 'expireTime',
     isTable: true,
+    sort: 'custom',
     formatter : dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -805,10 +823,14 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建时间',
     field: 'createTime',
     isTable: true,
+    sort: 'custom',
     formatter: dateFormatter,
     isForm: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
     }
   },
   {
@@ -859,6 +881,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -867,6 +890,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -876,12 +900,14 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'currency',
     dictType: DICT_TYPE.CURRENCY,
     dictClass: 'string',
+    sort: 'custom',
     isSearch : true,
     isTable : true
   },
   {
     label: '价格',
     field: 'price',
+    sort: 'custom',
     isSearch: true
   },
   {
@@ -890,6 +916,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    sort: 'custom',
     table: {
       width: 120
     },
@@ -906,6 +933,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效时间',
     field: 'activeTime',
     isTable: true,
+    sort: 'custom',
     formatter : dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -924,6 +952,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效时间',
     field: 'expireTime',
     isTable: true,
+    sort: 'custom',
     formatter : dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -942,6 +971,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建时间',
     field: 'createTime',
     isForm: false,
+    sort: 'custom',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -996,6 +1026,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完工收货库位',
     field: 'fgLocationCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -1004,6 +1035,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '产线代码' ,
     field: 'productionLineCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -1012,6 +1044,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物品代码',
     field: 'itemCode',
     isSearch: true,
+    sort: 'custom',
     table: {
       width: 150
     }
@@ -1021,6 +1054,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    sort: 'custom',
     isSearch: true,
     isTable: true,
     table: {
@@ -1038,6 +1072,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效时间',
     field: 'activeTime',
+    sort: 'custom',
     formatter : dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1055,6 +1090,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '失效时间',
     field: 'expireTime',
+    sort: 'custom',
     formatter : dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'