Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/package/index.ts

@@ -109,6 +109,9 @@ export const getLabel = async (id: number) => {
 // 打印标签获取包装列表
 
 export const getLabelDetailPage = async (params) => {
+  return await request.get({ url: `/wms/package/getLabelDetailPage`,params})
+}
+export const getLabelDetailPageByRecordId = async (params) => {
   return await request.get({ url: `/wms/package/getLabelDetailPageByRecordId`,params})
 }
 

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -228,7 +228,7 @@ const labelPrint = async (row) => {
   const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number}
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+    getListApi: PackageApi.getLabelDetailPageByRecordId  // 分页接口
   })
   // 获得表格的各种操作
   const { getList:getListPrint } = tableMethods

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -295,7 +295,7 @@ const labelPrint = async (row) => {
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
     // getListApi: PackageApi.getProductreceiptLabelDetailPage  // 分页接口
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+    getListApi: PackageApi.getLabelDetailPageByRecordId  // 分页接口
   })
 
   // 获得表格的各种操作