From f05b085d7735537b04edadf2168dba4cde3228b4 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 3 Aug 2024 17:12:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=A5=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=AD=90=E8=A1=A8=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../purchasereceipt/purchasereceiptJobMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRequestMain/index.vue | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 42ca67aba..938bcb939 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -726,6 +726,7 @@ export default { 从货主代码:'Code from the shipper', 到货主代码:'Shipper code', 查看其他包装规格:'See other packaging formats', + 查看子包装:'See sub packaging formats', 包装规格:'Packing specifications', 单据打印:'Document printing', 明细列表:'Itemized list', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 5a5be6409..103a1a95f 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -726,6 +726,7 @@ export default { 从货主代码:'从货主代码', 到货主代码:'到货主代码', 查看其他包装规格:'查看其他包装规格', + 查看子包装:'查看子包装', 包装规格:'包装规格', 单据打印:'单据打印', 明细列表:'明细列表', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 82c5ebc84..163060777 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -331,7 +331,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: '查看子包装', name: 'viewParentPickingNumber', hide: false, type: 'primary', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 2906ac00e..5cc9df20b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -261,7 +261,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: t('ts.查看其他包装规格'), + label: t('ts.查看子包装'), name: 'viewParentPickingNumber', hide: false, type: 'primary', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d1b7813d6..d34af2d33 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -610,7 +610,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: '查看子包装', name: 'viewParentPickingNumber', hide: false, type: 'primary', From e128e97a9136139dce8904cdd8e07b260174f15d Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 3 Aug 2024 17:45:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=B7=BB=E5=8A=A0tenant=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/reportList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/reportList/index.vue b/src/views/wms/reportList/index.vue index 4974c88fe..d5e28684e 100644 --- a/src/views/wms/reportList/index.vue +++ b/src/views/wms/reportList/index.vue @@ -6,12 +6,12 @@ From 4d1ccfc306fb3815c03e8b15e2aa38d23c7bc99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 3 Aug 2024 18:38:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=20=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverJobMain.data.ts | 18 ++++++++++---- .../packageoverRecordMain.data.ts | 13 +++++++++- .../packageoverRequestMain.data.ts | 24 +++++++++++++++---- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index 6a0c13ec8..ef8e159f1 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -40,6 +40,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -60,6 +61,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -80,6 +82,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -97,6 +100,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '从仓库代码', field: 'fromWarehouseCode', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -105,6 +109,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '到仓库代码', field: 'toWarehouseCode', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -113,6 +118,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '从库区代码范围', field: 'fromAreaCodes', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -121,6 +127,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '到库区代码范围', field: 'toAreaCodes', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -131,7 +138,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -142,7 +149,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -154,7 +161,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, table: { width: 150 }, @@ -174,7 +181,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, table: { width: 150 }, @@ -451,6 +458,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', + isTable: false, table: { width: 120 }, @@ -459,6 +467,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -608,6 +617,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', + isTable: false, table: { width: 150 }, diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index 247744996..97aa03bf5 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -15,6 +15,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '任务单据号', field: 'jobNumber', sort: 'custom', + isTable: false, isSearch: true, table: { width: 180 @@ -24,6 +25,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '仓库代码', field: 'warehouseCode', sort: 'custom', + isTable: false, table: { width: 120 }, @@ -32,6 +34,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '出库事务类型', field: 'outTransactionType', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -40,6 +43,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '入库事务类型', field: 'inTransactionType', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -48,6 +52,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '执行时间', field: 'executeTime', sort: 'custom', + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -70,6 +75,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', sort: 'custom', + isTable: false, formatter: dateFormatter2, detail: { dateFormat: 'YYYY-MM-DD' @@ -92,6 +98,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '申请时间', field: 'requestTime', sort: 'custom', + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -114,6 +121,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '截止时间', field: 'dueTime', sort: 'custom', + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -156,7 +164,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -180,6 +188,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -191,6 +200,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -257,6 +267,7 @@ export const PackageoverDetail = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', + isTable: false, table: { width: 180 }, diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index 4dbe716a4..1c2b1683b 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -79,6 +79,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, isForm: false, }, { @@ -101,6 +102,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '从仓库代码', @@ -109,6 +111,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -143,6 +146,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { componentProps: { disabled: true @@ -155,7 +159,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -167,7 +171,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -181,6 +185,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -190,6 +195,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -211,6 +217,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ field: 'departmentCode', sort: 'custom', isForm: false, + isTable: false, table: { width: 150 }, @@ -243,6 +250,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ label: '业务类型', field: 'businessType', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -259,7 +267,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -280,7 +288,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -302,7 +310,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm: false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -345,6 +353,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -366,6 +375,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -379,6 +389,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -396,6 +407,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -424,6 +436,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isTableForm: false, form: { componentProps: { @@ -868,6 +881,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间',