From 6fae7af59fa7cc70ece4498000087e0cf5f2166d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 25 Dec 2023 16:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AD=90=E8=A1=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4bug,=E7=9B=98=E7=82=B9=E8=A7=A3=E5=86=BB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countRequestMain/index.ts           |  4 ++++
 src/components/BasicForm/src/BasicForm.vue      |  1 +
 .../src/TableFormCountPlan.vue                  |  4 ++++
 src/utils/disposition/defaultButtons.ts         | 12 ++++++++++++
 .../count/countRequestMain/index.vue            | 17 ++++++++++++++++-
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts
index 1205ae708..cf6c52242 100644
--- a/src/api/wms/countRequestMain/index.ts
+++ b/src/api/wms/countRequestMain/index.ts
@@ -105,4 +105,8 @@ export const superviseCount = async (data) => {
 //生成盘点调整申请
 export const generateCountadjustRequest = async (id) => {
   return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id })
+}
+//解冻
+export const thaw = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/thaw?id=` + id })
 }
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 9497abdd2..a34f2ebe8 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -90,6 +90,7 @@
         ref="tableFormRef"
         @tableFormChange="tableFormChange"
         @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
       />
     </div>
     <template #footer>
diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
index b3f9827be..d46d46215 100644
--- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
+++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue
@@ -168,6 +168,10 @@ const tableFormChange = (field, val, row) => {
 const handleAddTable = () => {
   emit('handleAddTable')
 }
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index)
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 86aea3df7..006205dc6 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -723,6 +723,18 @@ export function mainSuperviseCountBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-解冻
+export function mainThawRequesttBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '解冻',
+    name: 'mainThaw',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index ef886c256..0cd37b1ba 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/src/views/wms/countManage/count/countRequestMain/index.vue
@@ -312,7 +312,11 @@ const butttondata = (row) => {
     defaultButtons.mainCountAdjustRequesttBtn({
       hide: isShowGenerateMainButton(row, ['2']),
       hasPermi: 'wms:count-request-main:generate'
-    }) // 生成盘点调整
+    }), // 生成盘点调整
+    defaultButtons.mainThawRequesttBtn({
+      hide: isShowGenerateMainButton(row, ['3']),
+      hasPermi: 'wms:count-request-main:thaw'
+    }) // 解冻
   ]
 }
 
@@ -419,6 +423,17 @@ const buttonTableClick = async (val, row) => {
       .catch((err) => {
         console.log(err)
       })
+  }  else if (val == 'mainThaw') {
+    // 解冻
+    await message.confirm('确认要解冻吗？')
+    CountRequestMainApi.thaw(row.id)
+      .then(() => {
+        message.success(t('解冻成功'))
+        getList()
+      })
+      .catch((err) => {
+        console.log(err)
+      })
   } else if (val == 'edit') {
     // 编辑
     openForm('update', row)