From f96e608900c172ee7ae055ea15d647d03c2b964d Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 29 May 2024 08:38:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d7fd2b8da..bc9a950bc 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{ } // 列表-操作按钮 const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float:'right', - hasPermi: '' - }, + // { + // label: '标签信息', + // name: 'bqxx', + // hide: false, + // type: 'primary', + // icon: '', + // color: '', + // link: true, + // float:'right', + // hasPermi: '' + // }, defaultButtons.mainListPointBtn(null), // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 From 085786baf3991d2491b62ba933dd21cade7e43da Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 29 May 2024 08:57:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptRecordMain/index.ts | 9 +++++++++ .../productreceiptRecordMain/index.vue | 20 +++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 79b5699c9..102bef055 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -110,4 +110,13 @@ export const exportProductreceiptRecordAssembleMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productreceipt-record-main/get-import-template' }) +} +// 创建上架申请 +export const createPutawayRequest = async (number:string) => { + return await request.post({ url: `/wms/productreceipt-record-main/createPutawayRequest?number=`+number }) +} + +// 创建检验申请 +export const createInspectRequest = async (number:string) => { + return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number }) } \ No newline at end of file diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index c3456bdd5..56f7ea46a 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -177,12 +177,15 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 - ] + defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 +] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { + if(val == 'inspectRequest'){//生成到货检验申请 + handleCreateInspectRequest(row.number) + } } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() @@ -194,6 +197,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain') } +/** 生成到货检验申请按钮操作 */ +const handleCreateInspectRequest = async (number:string) => { + try{ + await message.confirm(t('ts.确认生成到货检验申请吗？')) + tableObject.loading = true + await ProductreceiptRecordMainApi.createInspectRequest(number) + message.success(t('ts.到货检验申请生成成功')) + await getList() + }catch{}finally{ + tableObject.loading = false + } +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { From 9f4e27236a298434f11966b9fc29c8a09c798d11 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 29 May 2024 09:18:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7=E7=82=B9?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=8E=E9=A1=B5=E9=9D=A2=E9=81=AE=E7=BD=A9?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=85=B3=E9=97=ADBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 326564896..6d1591bfa 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -285,9 +285,9 @@ const handleHandle = async (id: number) => { tableObject.loading = true await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id) message.success(t('common.handleSuccess')) - tableObject.loading = false await getList() } catch {} + tableObject.loading = false }