From 6621e12ae988d370e89b0915d87cdfb26e8c95b0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 24 Nov 2023 10:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E5=92=8C?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A7=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=9F=E6=88=90=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/utils/disposition/defaultButtons.ts       | 24 +++++++++++++++++++
 .../inspect/inspectRecordMain/index.vue       |  4 +++-
 .../inspectRecordMain.data.ts                 |  2 +-
 .../purchasereceiptRecordMain/index.vue       |  7 +++++-
 .../purchasereceiptRecordMain.data.ts         |  1 +
 .../purchasereceiptRequestMain/index.vue      |  2 +-
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index e98f3ac3c..9f62970ac 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -663,6 +663,30 @@ export function mainListDocumentPrintBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-生成到货检验申请
+export function mainInspectRequestBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成到货检验申请',
+    name: 'inspectRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 主列表-生成采购上架申请
+export function mainPutawayRequestBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成采购上架申请',
+    name: 'putawayRequest',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index ab42193c9..b01941ee7 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -120,7 +120,9 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-  return []
+  return [
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest'}), // 生成采购上架申请
+  ]
 }
 
 // 列表-操作按钮事件
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
index c2d35c130..ad032c8a5 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -412,7 +412,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
-  },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 0b8d50af7..6b9f776c5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -112,11 +112,16 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-  return []
+  return [
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceiptRecordMain:inspectRequest'}), // 生成到货检验申请
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+    handleExport()
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index d86cdad73..068cec2ab 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -313,6 +313,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
+    
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index b34ba3416..45532afac 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -284,7 +284,7 @@ const handleSubmit = async (id: number) => {
   try {
     await message.confirm(t('common.confirmSubmit'))
     await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
-    message.success(t('common.closeSuccess'))
+    message.success(t('common.submitSuccess'))
     await getList()
   } catch {}
 }