From 93a01767cf125c992ad416238fbc75027cdd99be Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 17 May 2024 14:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A6=81=E8=B4=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobDetail/index.ts      | 12 ++++++++++++
 .../purchasereceiptJobMain/index.vue               |  2 +-
 .../supplierdeliverRequestMain.data.ts             | 14 ++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts
index 4163887b2..c012a623f 100644
--- a/src/api/wms/purchasereceiptJobDetail/index.ts
+++ b/src/api/wms/purchasereceiptJobDetail/index.ts
@@ -55,6 +55,18 @@ export const getPurchasereceiptJobDetailPageSapre = async (params) => {
   }
 }
 
+// 查询采购收货任务子列表
+export const getPurchasereceiptJobDetailPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-detail/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-detail/pageSCP`, params })
+  }
+}
+
+
 // 查询采购收货任务子详情
 export const getPurchasereceiptJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-job-detail/get?id=` + id })
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index a9d2e713c..46dc78808 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -153,7 +153,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const Echo =  []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPageSCP:PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 3e42b6e1a..25ead0c5e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -3,8 +3,6 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-// import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
-import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
@@ -23,8 +21,8 @@ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
 
  // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
 import { tr } from 'element-plus/es/locale'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
@@ -64,7 +62,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
       }
     }
   },
@@ -94,8 +92,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '要货计划信息', // 查询弹窗标题
-        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchAllSchemas: PurchasePlanDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage, // 查询弹窗所需分页方法
         searchCondition: [
           {
             key: 'supplierCode',
@@ -1692,4 +1690,4 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
   },
 
-]))
\ No newline at end of file
+]))