Browse Source

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

master_hella_20240701
liuchen864 7 months ago
parent
commit
6c21187275
  1. 5
      src/api/wms/package/index.ts
  2. 41
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

5
src/api/wms/package/index.ts

@ -107,8 +107,9 @@ export const getLabel = async (id: number) => {
} }
// 打印标签获取包装列表 // 打印标签获取包装列表
export const getLabelDetailPage = async (moduleType:string,number: string,) => {
return await request.get({ url: `/wms/package/getLabelDetailPage?moduleName=` + moduleType+ `&recordNumber=`+number}) export const getLabelDetailPage = async (params) => {
return await request.get({ url: `/wms/package/getLabelDetailPage`,params})
} }
// 根据库存余额获取包装信息进行打印标签 // 根据库存余额获取包装信息进行打印标签

41
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -786,46 +786,29 @@ const submitFormLabel = async (formType, data) => {
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage //
// //
const searchTableRef = ref() const searchTableRef = ref()
const labelPrint = async (row) => { const labelPrint = async (row) => {
console.log("------------",row);
tableObject.loading = true tableObject.loading = true
const subTableDFata = await PackageApi.getLabelDetailPage('supplier',row.number) const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
tableObject.loading = false const {tableObject:tableObjectPrint ,tableMethods} = useTable({
const tableObject1 = { defaultParams,
// getListApi: PackageApi.getLabelDetailPage //
currentPage: 1, })
//
exportLoading: false,
//
loading: false,
//
pageSize: subTableDFata.length,
params:null,
//
sort: {
order: '', //
prop: '' //
},
//
total: subTableDFata.length,
//
tableList: subTableDFata,
currentRow:null
}
console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
//
const { getList:getListPrint } = tableMethods
getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => { tableColumns.forEach((item) => {
item.width = item.table?.width || 150 item.width = item.table?.width || 150
}) })
searchTableRef.value.openData("标签信息",tableObject1,{tableColumns},true) searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
// window.open(src.value + '&asn_number=' + row.asnNumber)
} }
// -- // --
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
console.log('批量打印',val) console.log('批量打印',val)

Loading…
Cancel
Save