Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -216,7 +216,7 @@ const onEnter = async (field,value)=>{
 const getSearchTableData = async (number,isEnter=false)=>{
   const {tableObject ,tableMethods} = useTable({
     defaultParams:{number},
-    getListApi: PurchaseDetailApi.getPurchaseDetailPage // 分页接口
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
   })
   // 获得表格的各种操作
   const { getList:getList1 } = tableMethods

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@@ -71,7 +71,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         isConcatDetailSchemas:true,//是否是主子表合并 默认false
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
         searchCondition: [{
           key:'status',
           value:'2',
@@ -587,7 +587,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       isConcatDetailSchemas:true,//是否是主子表合并 默认false
       searchDetailSchemas:PurchaseDetail.allSchemas,
       searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS,
       searchCondition: [
       {
         key:'number',