From fea724564a5eb4dfb284170d2ec1312e4bcd074b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 24 Jun 2024 08:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1--=E6=89=BF=E6=8E=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countJobMain/index.ts                      |  8 ++++++++
 .../count/countJobMain/countJobMain.data.ts            |  2 +-
 src/views/wms/countManage/count/countJobMain/index.vue | 10 +++++++---
 .../inventorymove/inventorymoveJobMain/index.vue       |  6 +++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
index c5f532bd9..6e2b5845b 100644
--- a/src/api/wms/countJobMain/index.ts
+++ b/src/api/wms/countJobMain/index.ts
@@ -91,6 +91,14 @@ export const importTemplate = () => {
 export const closeCountJobMain = (id: number) => {
   return request.put({ url: '/wms/count-job-main/close?id=' + id })
 }
+// 承接盘点任务主
+export const acceptCountJobMain = (id: number) => {
+  return request.put({ url: '/wms/count-job-main/accept?id=' + id })
+}
+// 取消承接盘点任务主
+export const abandonCountJobMain = (id: number) => {
+  return request.put({ url: '/wms/count-job-main/abandon?id=' + id })
+}
 
 // 关闭盘点任务主
 export const handleExportCountJob = async (id: number) => {
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index d8a07ccd3..1c28a6796 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -501,7 +501,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 180,
+      width: 220,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 1dc05b21e..e133dff65 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -194,7 +194,7 @@ const isShowMainButton = (row,val) => {
 const butttondata = (row,$index) => {
 
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭
     {
       label: '导出',
@@ -213,8 +213,8 @@ const butttondata = (row,$index) => {
       color: '',
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
-    }
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    },
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -225,9 +225,13 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    await CountJobMainApi.abandonCountJobMain(row.id)
+    await getList()
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
+    await CountJobMainApi.acceptCountJobMain(row.id)
+    await getList()
     console.log('列表-操作按钮事件-承接')
   } else if (val == 'exportCountJob'){// 当前任务导出
     handleExportCountJob(row.id,row.number)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index e524d3cdd..d0d9b58cb 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -238,9 +238,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }