From 4fc5cb539de0df84eb2472fa485a225e4020fc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 20 Nov 2023 09:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customer/customer.data.ts | 2 +- .../customerManage/customerdock/customerdock.data.ts | 3 +-- .../customerManage/saleprice/saleprice.data.ts | 1 - .../documentSetting/businesstype/businesstype.data.ts | 1 + .../basicDataManage/documentSetting/switch/switch.data.ts | 3 --- .../factoryModeling/areabasic/areabasic.data.ts | 2 +- .../factoryModeling/location/location.data.ts | 2 +- .../factoryModeling/locationgroup/locationgroup.data.ts | 2 +- .../factoryModeling/productionline/productionline.data.ts | 2 +- .../factoryModeling/workstation/workstation.data.ts | 4 ++-- .../productionlineitem/productionlineitem.data.ts | 2 +- .../basicDataManage/labelManage/barcode/barcode.data.ts | 1 - .../basicDataManage/orderManage/carrier/carrier.data.ts | 4 +--- .../wms/basicDataManage/orderManage/owner/owner.data.ts | 3 +-- .../configurationsetting/configurationsetting.data.ts | 4 ++-- .../strategySetting/paramsetting/paramsetting.data.ts | 5 ++--- .../supplierManage/purchaseprice/purchaseprice.data.ts | 2 +- .../supplierManage/supplier/supplier.data.ts | 3 ++- .../supplierManage/supplieritem/supplieritem.data.ts | 7 ++++--- 19 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts index 0be4f9115..8a0a3d631 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts @@ -21,6 +21,7 @@ export const Customer = useCrudSchemas(reactive([ { label: '名称', field: 'name', + isSearch: true, sort: 'custom', table: { width: 150 @@ -104,7 +105,6 @@ export const Customer = useCrudSchemas(reactive([ dictType: DICT_TYPE.CURRENCY, dictClass: 'string', isTable: true, - isSearch: true, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 063381cd1..abcb903e9 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -21,6 +21,7 @@ export const Customerdock = useCrudSchemas(reactive([ { label: '名称', field: 'name', + isSearch: true, sort: 'custom', table: { width: 150 @@ -81,7 +82,6 @@ export const Customerdock = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true }, { label: '默认库位', @@ -90,7 +90,6 @@ export const Customerdock = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true }, { label: '是否可用', diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index 5454868e4..c4c2244a0 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -30,7 +30,6 @@ export const Saleprice = useCrudSchemas(reactive([ field: 'currency', dictType: DICT_TYPE.CURRENCY, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index 6302db632..3826ae098 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -24,6 +24,7 @@ export const Businesstype = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts index b93d2d423..7e39cc083 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts @@ -22,7 +22,6 @@ export const Switch = useCrudSchemas(reactive([ label: '描述', field: 'description', sort: 'custom', - isSearch: true, form: { componentProps: { disabled: true @@ -33,7 +32,6 @@ export const Switch = useCrudSchemas(reactive([ label: '有效设置值', field: 'effectiveSetValue', sort: 'custom', - isSearch: true, dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -50,7 +48,6 @@ export const Switch = useCrudSchemas(reactive([ label: '是否可用', field: 'available', sort: 'custom', - isSearch: true, dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: false, diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index 807d356bf..4ff960b26 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -24,6 +24,7 @@ export const Area = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -64,7 +65,6 @@ export const Area = useCrudSchemas(reactive([ field: 'isFunctional', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 1e69d178f..36f20d2af 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -29,6 +29,7 @@ export const Location = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -95,7 +96,6 @@ export const Location = useCrudSchemas(reactive([ field: 'erpLocationCode', dictType: DICT_TYPE.ERP_LOCATION, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index f55dba16a..ce447bf1e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -39,7 +39,6 @@ export const Locationgroup = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -56,6 +55,7 @@ export const Locationgroup = useCrudSchemas(reactive([ label: '库区代码', field: 'areaCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts index 1c1a40d89..923737fec 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts @@ -37,7 +37,6 @@ export const Productionline = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.PRODUCTION_LINE_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -48,6 +47,7 @@ export const Productionline = useCrudSchemas(reactive([ label: '车间代码', field: 'workshopCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index e5db17583..292d68ba5 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -40,7 +40,6 @@ export const Workstation = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.WORK_STATION_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -51,6 +50,7 @@ export const Workstation = useCrudSchemas(reactive([ label: '车间代码', field: 'workshopCode', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -70,6 +70,7 @@ export const Workstation = useCrudSchemas(reactive([ label: '生产线代码', field: 'productionLineCode', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -128,7 +129,6 @@ export const Workstation = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index d5edf8b7a..b56b2a48b 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -116,7 +116,7 @@ export const Productionlineitem = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', sort: 'custom', - isSearch: true, + isSearch: false, isTable: true, table: { width: 120 diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index 38cf326f4..6f1a6da9a 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -34,7 +34,6 @@ export const Barcode = useCrudSchemas(reactive([ label: '描述', field: 'description', sort: 'custom', - isSearch: true, }, { label: '顺序', diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts index 88fa83ec0..86eab8bfd 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts +++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts @@ -22,6 +22,7 @@ export const Carrier = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -33,7 +34,6 @@ export const Carrier = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, }, { label: '地址', @@ -104,7 +104,6 @@ export const Carrier = useCrudSchemas(reactive([ field: 'currency', dictType: DICT_TYPE.CURRENCY, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -130,7 +129,6 @@ export const Carrier = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.CARRIER_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts index 2dc139fde..66fa8f01d 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts +++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts @@ -22,6 +22,7 @@ export const Owner = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -103,7 +104,6 @@ export const Owner = useCrudSchemas(reactive([ field: 'currency', dictType: DICT_TYPE.CURRENCY, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -129,7 +129,6 @@ export const Owner = useCrudSchemas(reactive([ field: 'type', dictType: DICT_TYPE.OWNER_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts index 2396c415b..8dc28f0c6 100644 --- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts +++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts @@ -23,6 +23,7 @@ export const Configurationsetting = useCrudSchemas(reactive([ label: '配置代码', field: 'configurationCode', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -31,6 +32,7 @@ export const Configurationsetting = useCrudSchemas(reactive([ label: '配置名称', field: 'configurationName', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -40,7 +42,6 @@ export const Configurationsetting = useCrudSchemas(reactive([ field: 'dataType', dictType: DICT_TYPE.DATA_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -76,7 +77,6 @@ export const Configurationsetting = useCrudSchemas(reactive([ field: 'isRequired', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts b/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts index e9cff4709..424ca6315 100644 --- a/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts +++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/paramsetting.data.ts @@ -23,6 +23,7 @@ export const Paramsetting = useCrudSchemas(reactive([ label: '参数代码', field: 'paramCode', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -31,6 +32,7 @@ export const Paramsetting = useCrudSchemas(reactive([ label: '参数名称', field: 'paramName', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -40,7 +42,6 @@ export const Paramsetting = useCrudSchemas(reactive([ field: 'usableOpeartors', dictType: DICT_TYPE.STRATEGY_PARAM_OPEARTOR, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -52,7 +53,6 @@ export const Paramsetting = useCrudSchemas(reactive([ field: 'dataType', dictType: DICT_TYPE.DATA_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -88,7 +88,6 @@ export const Paramsetting = useCrudSchemas(reactive([ field: 'isRequired', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index 9f92a919b..f5e8dde6e 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -59,7 +59,7 @@ export const Purchaseprice = useCrudSchemas(reactive([ field: 'currency', dictType: DICT_TYPE.CURRENCY, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, sort: 'custom', table: { diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts index 62e5c662e..8e3afd7e9 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts @@ -22,6 +22,7 @@ export const Supplier = useCrudSchemas(reactive([ label: '名称', field: 'name', sort: 'custom', + isSearch: true, table: { width: 150 } @@ -104,7 +105,7 @@ export const Supplier = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.CURRENCY, dictClass: 'string', - isSearch: true, + isSearch: false, isTable: true, table: { width: 150 diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index bad39330e..74b425e43 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -23,6 +23,7 @@ export const Supplieritem = useCrudSchemas(reactive([ label: '供应商代码', field: 'supplierCode', sort: 'custom', + isSearch: true, table: { width: 150, fixed: 'left' @@ -63,7 +64,7 @@ export const Supplieritem = useCrudSchemas(reactive([ label: '供应商物料代码', field: 'supplierItemCode', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 150 } @@ -127,7 +128,7 @@ export const Supplieritem = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 180 } }, { @@ -135,7 +136,7 @@ export const Supplieritem = useCrudSchemas(reactive([ field: 'altPackQty', sort: 'custom', table: { - width: 150 + width: 170 }, form: { component: 'InputNumber',