From 47dbeaa82fd8645ef535ea09894e4e185d8ce6f1 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, 20 Jul 2024 15:52:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= 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 + src/utils/disposition/defaultButtons.ts | 13 +++++++++++++ .../productreceiptAssembleRecordMain/index.vue | 16 ++++++++++++++++ .../productreceiptAssembleRecordMain.data.ts | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index b11c59122..0480f6b5b 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -990,6 +990,7 @@ export default { 生成采购收货申请:'Generate purchase receipt request', 发送到货检验申请:'Send the arrival inspection request', 生成采购上架申请:'Generate a purchase listing request', + 生成制品上架申请:'Generate a purchase listing request', 生成盘点调整申请:'Generate inventory adjustment request', 重盘:'New Inventory', 解冻:'Unfreeze', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 35e3cd8fa..91d2a8a96 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -990,6 +990,7 @@ export default { 生成采购收货申请:'生成采购收货申请', 发送到货检验申请:'发送到货检验申请', 生成采购上架申请:'生成采购上架申请', + 生成制品上架申请:'生成制品上架申请', 生成盘点调整申请:'生成盘点调整申请', 重盘:'重盘', 解冻:'解冻', diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 76258c2fd..523425c8b 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1115,6 +1115,19 @@ export function mainPutawayRequestBtn(option: any) { hasPermi: '' }) } + +// 主列表-生成制品上架申请 +export function mainPutawayRequestCpBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.生成制品上架申请`).replace('ts.', ''), + name: 'putawayRequest', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-生成盘点调整申请 export function mainCountAdjustRequesttBtn(option: any) { return __defaultBtnOption(option, { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 988982f4e..9b6f61e12 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -233,6 +233,7 @@ const butttondata = (row,$index) => { } return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 + defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 ] } @@ -243,6 +244,8 @@ const buttonTableClick = async (val, row) => { labelPrint(row) }else if(val == 'inspectRequest'){//生成到货检验申请 handleCreateInspectRequest(row.number) + }else if (val == 'putawayRequest') { // 生成采购上架申请 + handleCreatePutawayRequest(row.number) } } /** 生成到货检验申请按钮操作 */ @@ -258,6 +261,19 @@ const handleCreateInspectRequest = async (number:string) => { } } +/** 生成采购上架申请按钮操作 */ +const handleCreatePutawayRequest = async (number:string) => { + try{ + await message.confirm(t('ts.确认生成上架申请吗?')) + tableObject.loading = true + await ProductreceiptRecordMainApi.createPutawayRequest(number) + message.success(t('ts.上架申请生成成功')) + await getList() + }catch{}finally{ + tableObject.loading = false + } +} + const searchTableRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 const labelPrint = async (row) => { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 3d838cd3d..e03956bb7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -728,7 +728,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 220, + width: 350, fixed: 'right' }, hiddenInMain: false,