From f99f659e40fdab1098c44621b1cb70db3c46e291 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 22 Aug 2024 08:50:32 +0800
Subject: [PATCH] =?UTF-8?q?HL-4935WMS=20WEB=E7=AB=AF=E9=A2=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceipt/productreceiptRecordMain/index.vue         | 4 +++-
 .../productreceiptAssembleRecordMain/index.vue                | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 805c97f38..294fb6096 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -200,7 +200,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  // defaultButtons.mainListRecoveryBtn(null), // 制品回收
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
 ]
 }
 
@@ -261,6 +261,8 @@ const labelRecovery = async (row) => {
 
     let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params);
     message.success(t('ts.撤销报工成功'))
+    buttonBaseClick('refresh',null)
+
   } catch {
   } finally {
     tableObject.loading = false
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 64c4af7c7..195e1dab4 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
   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), // 标签打印
-  // defaultButtons.mainListRecoveryBtn(null), // 制品回收
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]
 }
 
@@ -281,6 +281,7 @@ const handleCreatePutawayRequest = async (number:string) => {
 const labelRecovery = async (row) => {
   try {
     await message.confirm(t('ts.确认撤销报工吗？'))
+    tableObject.loading = true
     const params = ref({
       number: '',
       inventoryStatus: '',
@@ -289,6 +290,7 @@ const labelRecovery = async (row) => {
     params.inventoryStatus= row.inventoryStatus;
     let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(params)
     message.success(t('ts.撤销报工成功'))
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false