From d121bf78bec6c75f26f5d13cf42fc638d3b4ff5a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 26 Dec 2024 14:58:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?YT-1840=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 48847f519..4cba356e0 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1856,7 +1856,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas( key: 'itemCode', value: 'itemCode', message: '请先选择品番！', - isMainValue: true + isMainValue: true, + paramsFrom:'tableForm' } ], verificationParams: [ From d92a64828c9ebd1136c0bafe0b9863908420e086 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 26 Dec 2024 15:06:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?YT-1828=E7=89=A9=E6=96=99=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/Table.vue | 1 + src/hooks/web/useCrudSchemas.ts | 2 + .../purchaseMain/purchaseMain.data.ts | 48 +++++++++---------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 0f44e08bb..43881054e 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -385,6 +385,7 @@ export default defineComponent({ headerAlign={headerAlign} {...props} prop={v.field} + minWidth={v.minWidth} > {{ default: (data: TableSlotDefault) => diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index 914091ff4..a43c5bc84 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -43,6 +43,8 @@ type CrudTableParams = { show?: boolean // 列宽配置 width?: number | string + // 最小列宽配置 + minWidth?: number | string // 列是否固定在左侧或者右侧 fixed?: 'left' | 'right' } & Omit diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 3988ef713..a6f67b895 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -19,7 +19,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isForm: false, sortTableDefault: 1, table: { - width: 180, + minWidth: 150, fixed: 'left' }, }, @@ -35,7 +35,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sortTableDefault: 2, sort: 'custom', table: { - width: 150 + minWidth: 150 }, form: { value: '1', @@ -50,7 +50,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 150 + minWidth: 150 }, form: { labelMessage: '影响明细中品番，需在供应商物料中维护', @@ -89,7 +89,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', sortTableDefault:4, table: { - width: 150 + minWidth: 150 }, }, { @@ -102,7 +102,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', sortTableDefault: 5, table: { - width: 150 + minWidth: 150 }, }, // { @@ -112,7 +112,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ // isSearch: true, // sort: 'custom', // table: { - // width: 150 + // minWidth: 150 // }, // }, @@ -126,7 +126,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ }, sort: 'custom', table: { - width: 180 + minWidth: 150 }, sortTableDefault: 6, form: { @@ -151,7 +151,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ }, sort: 'custom', table: { - width: 180 + minWidth: 150 }, sortTableDefault: 7, form: { @@ -170,7 +170,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isTable: false, table: { - width: 150 + minWidth: 150 }, }, { @@ -178,7 +178,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ field: 'taxRate', sort: 'custom', table: { - width: 150 + minWidth: 150 }, isTable: false, form: { @@ -198,7 +198,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTable: false, isForm: false, table: { - width: 150 + minWidth: 150 }, }, { @@ -207,7 +207,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isTable: false, table: { - width: 150 + minWidth: 150 }, }, { @@ -216,7 +216,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isTable: false, table: { - width: 150 + minWidth: 150 }, }, { @@ -225,7 +225,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isTable: false, table: { - width: 150 + minWidth: 150 }, }, { @@ -236,7 +236,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTable: false, sort: 'custom', table: { - width: 150 + minWidth: 150 }, isForm: false, form: { @@ -255,7 +255,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTable: false, isForm:false, table: { - width: 150 + minWidth: 150 }, }, @@ -266,7 +266,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTable:true, isForm:false, table: { - width: 150 + minWidth: 150 }, }, @@ -275,7 +275,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ field: 'businessType', sort: 'custom', table: { - width: 150 + minWidth: 150 }, isForm: false, isTable: false, @@ -292,7 +292,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ field: 'dataSource', sort: 'custom', table: { - width: 150 + minWidth: 150 }, isForm: false, isTable: false, @@ -304,12 +304,12 @@ export const PurchaseMain = useCrudSchemas(reactive([ // field: 'currentStage', // sort: 'custom', // table: { - // width: 150 + // minWidth: 150 // }, // form: { // component: 'InputNumber', // componentProps: { - // style: {width:'100%'}, + // style: {minWidth:'100%'}, // min: 0 // } // }, @@ -324,7 +324,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ isForm: false, isTable: true, table: { - width: 150 + minWidth: 150 }, sortTableDefault: 1000, }, @@ -339,7 +339,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ sort: 'custom', isForm: false, table: { - width: 180 + minWidth: 150 }, form: { component: 'DatePicker', @@ -910,7 +910,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ // dateFormat: 'YYYY-MM-DD HH:mm:ss' // }, // table: { - // width: 180 + // width: 150 // }, // hiddenInMain:false, // isForm: false, From 69b8a0c34cbd7bfcbd7b35d3bcb64c023145748b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 26 Dec 2024 15:08:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?YT-1836=E8=A1=A5=E7=BB=99=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=8F=B7=E5=8F=A3=E5=93=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=B2=A1=E6=9C=89=E8=83=8C=E7=95=AA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 3 ++- .../productreceiptAssembleRequestMain.data.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 97d8f40a5..fdc9ccf42 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1042,7 +1042,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive sortTableDefault: 1003, sortSearchDefault: 5, tableForm: { - disabled: true + disabled: true, + isPlaceholder:false }, form: { componentProps: { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 4cba356e0..ba2957ea5 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1098,7 +1098,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas( isSearch: true, sortTableDefault: 1003, tableForm: { - disabled: true + disabled: true, + isPlaceholder:false }, form: { componentProps: {