From 2ee3b99cd8a3b0b3dc88844d3b6b8413c09ad549 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 26 Nov 2024 13:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E7=AD=BE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=88=97=E8=A1=A8=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/barcode/barcode.data.ts | 38 ++++++++++++++++++- .../labelManage/labeltype/labeltype.data.ts | 36 ++++++++++++++++++ .../locationLabel/locationLabel.data.ts | 31 ++++++++++++--- .../manufacturePackage.data.ts | 34 ++++++++++++++--- .../purchasePackage/purchasePackage.data.ts | 36 ++++++++++++++---- .../labelManage/utensilPackage/index.vue | 3 +- .../utensilPackage/utensilPackage.data.ts | 34 ++++++++++++++--- 7 files changed, 184 insertions(+), 28 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index 1ff36f879..361f790fd 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -51,7 +51,8 @@ export const Barcode = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - fixed: 'left' + fixed: 'left', + width: 200 } }, { @@ -61,23 +62,35 @@ export const Barcode = useCrudSchemas(reactive([ dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string', isSearch: true, - isTable: true + isTable: true, + table: { + width: 180 + } }, { label: '名称', field: 'name', sort: 'custom', isSearch: true, + table: { + width: 180 + } }, { label: '描述', field: 'description', sort: 'custom', + table: { + width: 180 + } }, { label: '顺序', field: 'order', sort: 'custom', + table: { + width: 180 + }, form: { component: 'InputNumber', componentProps: { @@ -90,6 +103,9 @@ export const Barcode = useCrudSchemas(reactive([ label: '长度', field: 'length', sort: 'custom', + table: { + width: 180 + }, form: { component: 'InputNumber', componentProps: { @@ -109,26 +125,41 @@ export const Barcode = useCrudSchemas(reactive([ }, value: 0 }, + table: { + width: 180 + } }, { label: '前缀字符', field: 'prefixChar', sort: 'custom', + table: { + width: 180 + } }, { label: '实体属性', field: 'entityProperties', sort: 'custom', + table: { + width: 180 + } }, { label: '加密方法', field: 'encyptMethod', sort: 'custom', + table: { + width: 180 + } }, { label: '截断尾部空格', field: 'trimEnd', sort: 'custom', + table: { + width: 180 + } }, { label: '是否加密', @@ -144,6 +175,9 @@ export const Barcode = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 180 + } }, { label: '创建时间', diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts index 398cda999..7e6ddc4ca 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts +++ b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts @@ -89,6 +89,9 @@ export const Labeltype = useCrudSchemas(reactive([ label: '数据协议', field: 'dataProtocol', sort: 'custom', + table: { + width: 180 + } }, { label: '拆分方法', @@ -102,26 +105,41 @@ export const Labeltype = useCrudSchemas(reactive([ label: '数据头', field: 'header', sort: 'custom', + table: { + width: 180 + } }, { label: '版本号', field: 'version', sort: 'custom', + table: { + width: 180 + } }, { label: '分隔符', field: 'separators', sort: 'custom', + table: { + width: 180 + } }, { label: '校验方法', field: 'validateMethod', sort: 'custom', + table: { + width: 180 + } }, { label: '校验数', field: 'validateNumber', sort: 'custom', + table: { + width: 180 + }, form: { component: 'InputNumber', componentProps: { @@ -133,21 +151,33 @@ export const Labeltype = useCrudSchemas(reactive([ label: '加密方法', field: 'encyptEthod', sort: 'custom', + table: { + width: 180 + } }, { label: '压缩方法', field: 'compressMethod', sort: 'custom', + table: { + width: 180 + } }, { label: '模板名称', field: 'templateName', sort: 'custom', + table: { + width: 180 + } }, { label: '模板文件', field: 'templateFile', sort: 'custom', + table: { + width: 180 + } }, { label: '是否加密', @@ -163,6 +193,9 @@ export const Labeltype = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 180 + } }, { label: '是否压缩', @@ -178,6 +211,9 @@ export const Labeltype = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + table: { + width: 180 + } }, { label: '是否可用', diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index e242109ae..54145b1d0 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -14,16 +14,20 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - fixed: 'left' + fixed: 'left', + width: 210 } }, { label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, // { // label: '标签模板', @@ -36,19 +40,25 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, dictType: DICT_TYPE.LABEL_STATUS, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '关联号', field: 'relateNumber', sort: 'custom', + table: { + width: 210 + } }, { label: '标签条码字符串', field: 'barcodeString', sort: 'custom', table: { - width: 170, + width: 380, } }, { @@ -62,6 +72,9 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, + table: { + width: 180 + } }, { label: '最后打印时间', @@ -77,11 +90,17 @@ export const Package = useCrudSchemas(reactive([ valueFormat: 'x', } }, + table: { + width: 180 + } }, { label: '最后打印人ID', field: 'lastPrintUserId', - sort: 'custom' + sort: 'custom', + table: { + width: 180 + } }, { label: '最后打印人用户名', diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 147b93726..561152ee9 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -24,7 +24,8 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - fixed: 'left' + fixed: 'left', + width:210 } }, { @@ -33,12 +34,18 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '标签模板', field: 'template', sort: 'custom', + table: { + width: 180 + } }, { label: '标签状态', @@ -46,20 +53,26 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, dictType: DICT_TYPE.LABEL_STATUS, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '关联号', field: 'relateNumber', sort: 'custom', - isSearch:true + isSearch:true, + table: { + width: 210 + } }, { label: '标签条码字符串', field: 'barcodeString', sort: 'custom', table: { - width: 180, + width: 380, } }, { @@ -73,6 +86,9 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, + table: { + width: 180 + } }, { label: '最后打印时间', @@ -88,11 +104,17 @@ export const Package = useCrudSchemas(reactive([ valueFormat: 'x', } }, + table: { + width: 180 + } }, { label: '最后打印人ID', field: 'lastPrintUserId', - sort: 'custom' + sort: 'custom', + table: { + width: 180 + } }, { label: '最后打印人用户名', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 0acf47726..2b0bb74b7 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -36,8 +36,9 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - fixed: 'left' - } + fixed: 'left', + width: 210 + }, }, { label: '标签类型', @@ -45,12 +46,18 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '标签模板', field: 'template', sort: 'custom', + table: { + width: 180 + } }, { label: '标签状态', @@ -58,20 +65,26 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, dictType: DICT_TYPE.LABEL_STATUS, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '关联号', field: 'relateNumber', sort: 'custom', - isSearch:true + isSearch:true, + table: { + width: 210 + } }, { label: '标签条码字符串', field: 'barcodeString', sort: 'custom', table: { - width: 180, + width: 380, } }, { @@ -85,6 +98,9 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, + table: { + width: 180 + } }, { label: '最后打印时间', @@ -100,11 +116,17 @@ export const Package = useCrudSchemas(reactive([ valueFormat: 'x', } }, + table: { + width: 180 + } }, { label: '最后打印人ID', field: 'lastPrintUserId', - sort: 'custom' + sort: 'custom', + table: { + width: 180 + } }, { label: '最后打印人用户名', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 9dd4ba9d0..919eb3347 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -314,7 +314,8 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: true, + type: 'ContainerLabel' } getList() }) diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index 9326a2996..94b32ddc0 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -26,21 +26,28 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - fixed: 'left' + fixed: 'left', + width: 180 } }, { label: '标签类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, dictType: DICT_TYPE.LABEL_TYPE, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '标签模板', field: 'template', sort: 'custom', + table: { + width: 180 + } }, { label: '标签状态', @@ -48,19 +55,25 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, dictType: DICT_TYPE.LABEL_STATUS, - dictClass: 'string' + dictClass: 'string', + table: { + width: 180 + } }, { label: '关联号', field: 'relateNumber', sort: 'custom', + table: { + width: 210 + } }, { label: '标签条码字符串', field: 'barcodeString', sort: 'custom', table: { - width: 180, + width: 380, } }, { @@ -74,6 +87,9 @@ export const Package = useCrudSchemas(reactive([ }, value: 0 }, + table: { + width: 180 + } }, { label: '最后打印时间', @@ -89,11 +105,17 @@ export const Package = useCrudSchemas(reactive([ valueFormat: 'x', } }, + table: { + width: 180 + } }, { label: '最后打印人ID', field: 'lastPrintUserId', - sort: 'custom' + sort: 'custom', + table: { + width: 180 + } }, { label: '最后打印人用户名',