From c1b2ce0403465761025cdd4d05537ee69b926643 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Thu, 23 May 2024 16:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=8B=92=E6=94=B6=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobMain/index.ts   |  7 +++++-
 src/locales/en-US.ts                          |  2 ++
 src/locales/zh-CN.ts                          |  2 ++
 .../purchasereceiptJobMain/index.vue          | 24 ++++++++++++-------
 .../purchasereceiptJobMain.data.ts            |  7 +++---
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 9e3463fb0..6db386db5 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -123,4 +123,9 @@ export const abandonPurchasereceiptJobMainSpare = (id: number) => {
 // 承接采购收货任务主
 export const acceptPurchasereceiptJobMain = (id: number) => {
   return request.put({ url: '/wms/purchasereceipt-job-main/accept?id=' + id })
-}
\ No newline at end of file
+}
+
+// 拒收采购收货任务主
+export const refusalPurchasereceiptJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id })
+}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index d828c8d92..628ea1968 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -56,6 +56,7 @@ export default {
     copySuccess: 'Copy Success',
     copyError: 'Copy Error',
     closeSuccess: 'Close Success',
+    refusalSuccess: 'Refusal Success',
     reAddSuccess: 'ReAdd Success',
     submitSuccess: 'Submit Success',
     agreeSuccess: 'Agree Success',
@@ -66,6 +67,7 @@ export default {
     giveupSuccess: 'Giveup Success',
     dealwithSuccess: 'Dealwith Success',
     confirmColse: 'Confirm Close?',
+    confirmRefusal: 'Confirm Refusal?',
     confirmReAdd: 'Confirm ReAdd?',
     confirmAgree: 'Confirm Agree?',
     confirmRefused: 'Confirm Refused?',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 0a7311fa7..6bb427ae3 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -56,6 +56,7 @@ export default {
     copySuccess: '复制成功',
     copyError: '复制失败',
     closeSuccess: '关闭成功',
+    refusalSuccess: '拒收成功',
     reAddSuccess: '重新添加成功',
     submitSuccess: '提交成功',
     agreeSuccess: '审批通过成功',
@@ -66,6 +67,7 @@ export default {
     acceptSuccess: '承接成功',
     giveupSuccess: '放弃成功',
     confirmColse: '确认关闭吗？',
+    confirmRefusal: '确认拒收吗？',
     confirmReAdd: '确认重新添加吗？',
     confirmAgree: '确认审批通过吗？',
     confirmRefused: '确认审批驳回吗？',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index b795dc5dd..0e8bada93 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -90,12 +90,8 @@
     >
     <iframe height="600px" width="100%"  :src="qualityReport" frameborder="0"></iframe>
   </el-dialog>
-
-
 </template>
 
-  
-
 <script setup lang="ts">
 import download from '@/utils/download'
 import { PurchasereceiptJobMain,
@@ -217,17 +213,17 @@ const butttondata = (row,$index) => {
   }
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
     {
       label: '拒收',
-      name: 'mainJobClo',
+      name: 'mainJobRefusal',
       hide: isShowMainButton(row, ['1']),
       type: 'primary',
       icon: '',
       color: '',
-      hasPermi: 'wms:purchasereceipt-job-main:close',
+      hasPermi: 'wms:purchasereceipt-job-main:refusal',
       link: true // 文本展现按钮
     },
     defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
@@ -244,9 +240,11 @@ const buttonTableClick = async (val, row) => {
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
-  }else if(val == 'mainPlanCheckQualityReport'){
+  } else if(val == 'mainPlanCheckQualityReport'){
     // 查看质检报告
     checkQualityReport(row)
+  } else if(val == 'mainJobRefusal'){
+    handleRefusal(row.masterId)
   }
 }
 // 查看质检报告
@@ -267,6 +265,16 @@ const handleClose = async (id: number) => {
   } catch {}
 }
 
+/** 拒收按钮操作 */
+const handleRefusal = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefusal'))
+    await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain(id)
+    message.success(t('common.refusalSuccess'))
+    await getList()
+  } catch {}
+}
+
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 817ab2e94..76c37a9c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -1,6 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import { fa } from 'element-plus/es/locale'
+import { DICT_TYPE } from '@/utils/dict'
 
 /**
  * @returns {Array} 采购收货任务主表
@@ -609,7 +610,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 180,
+      width: 200,
       fixed: 'right'
     },
   },
@@ -1108,7 +1109,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     },
     isTableForm:true,
@@ -1605,4 +1606,4 @@ export const PurchasereceiptJobDetailPackingNumber = useCrudSchemas(reactive<Cru
       valueFormat: 'x',
     }
   },
-]))
\ No newline at end of file
+]))