From 2d037aaadddc712f00dca1503e0f6cca2afcaf39 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 23 Sep 2024 09:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834=20M=E5=9E=8B?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E8=B4=A7=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereturnRecordDetail/index.ts       | 11 +++++++++++
 .../purchasereturnRecordMOrderTypeMain/index.vue      |  4 ++--
 .../purchasereturnRecordMOrderTypeMain.data.ts        |  3 ++-
 .../purchasereturnRequestMOrderTypeMain/index.vue     |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/purchasereturnRecordDetail/index.ts b/src/api/wms/purchasereturnRecordDetail/index.ts
index 420405cba..c7347653c 100644
--- a/src/api/wms/purchasereturnRecordDetail/index.ts
+++ b/src/api/wms/purchasereturnRecordDetail/index.ts
@@ -60,6 +60,17 @@ export const getPurchasereturnRecordDetailPageSpare = async (params) => {
   }
 }
 
+
+export const getPurchasereturnRecordDetailPageMorderType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-record-detail/seniorMorderType', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-record-detail/pageMorderType`, params })
+  }
+}
+
 export const getPurchasereturnRecordDetailPageSCP = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue
index ef04df445..c18613af2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue
@@ -57,7 +57,7 @@
     :allSchemas="PurchasereturnRecordMOrderTypeMain.allSchemas"
     :detailAllSchemas="PurchasereturnRecordMOrderTypeDetail.allSchemas"
     :detailAllSchemasRules="PurchasereturnRecordMOrderTypeDetailRules"
-    :apiPage="routeName.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPage"
+    :apiPage="routeName.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageMorderType"
   />
 </template>
 
@@ -90,7 +90,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: routeName.value.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageMorderType // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
index 241fbb540..ba27aa4c3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
@@ -441,7 +441,8 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas(
       table: {
         width: 150,
         fixed: 'right'
-      }
+      },
+      isTable:false,
     }
   ])
 )
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
index 7d056e6d5..3999fe40f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue
@@ -588,7 +588,7 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
     }),// 编辑
-    defaultButtons.mainListDocumentPrintBtn(null)// 打印标签
+    //defaultButtons.mainListDocumentPrintBtn(null)// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',