Browse Source

打印

hella_online_20240829
zhang_li 4 months ago
parent
commit
d696ee447b
  1. 17
      src/common/utils/storage.js
  2. 41
      src/mycomponents/print/print.vue
  3. 105
      src/pages/package/job/overPackageJobDetail.vue
  4. 86
      src/pages/package/record/overPackageRecord.vue

17
src/common/utils/storage.js

@ -10,7 +10,22 @@ const setStorage = (key,value)=>{
// 清除全部本地存储 // 清除全部本地存储
const clearStorage = ()=>{ const clearStorage = ()=>{
uni.clearStorageSync(); const overPackageRecordPointParams = ''
if( uni.getStorageSync('overPackageRecordPointParams')){
overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
}
const overPackageJobDetailPointParams = ''
if( uni.getStorageSync('overPackageJobDetailPointParams')){
overPackageJobDetailPointParams = uni.getStorageSync('overPackageJobDetailPointParams')
}
uni.clearStorageSync();
if(overPackageRecordPointParams){
uni.setStorageSync('overPackageRecordPointParams',overPackageRecordPointParams)
}
if(overPackageJobDetailPointParams){
uni.setStorageSync('overPackageJobDetailPointParams',overPackageJobDetailPointParams)
}
} }
// 清除指定key本地存储 // 清除指定key本地存储

41
src/mycomponents/print/print.vue

@ -86,10 +86,10 @@
}, },
methods: { methods: {
setDefaultData(printDeafult,templateDeafult){ setDefaultData(printDeafult,templateDeafult){
this.templateName =printDeafult.name this.printName =printDeafult?.label || '请选择打印机'
this.printCode =printDeafult.code this.printCode =printDeafult?.value || ''
this.templateName =templateDeafult.name this.templateName =templateDeafult?.label || '请选择打印模板'
this.templateCode =templateDeafult.code this.templateCode =templateDeafult?.value || ''
}, },
showErrorMessage(message, type) { showErrorMessage(message, type) {
@ -97,39 +97,44 @@
this.$refs.comMessage.showErrorMessage(message, res => {}) this.$refs.comMessage.showErrorMessage(message, res => {})
}) })
}, },
showSelectPrint(){ async showSelectPrint(){
this.showPrintSelect =true
uni.showLoading({ uni.showLoading({
title:"加载中", title:"加载中",
mask:true mask:true
}) })
getPrintList().then(res=>{ await getPrintList().then(res=>{
this.printList =[] this.printList =res.data
uni.hideLoading()
}).catch(error=>{ }).catch(error=>{
}) })
this.showPrintSelect =true
}, },
confirmSelectPrint(){ confirmSelectPrint(e){
this.printCode ="" console.log(e)
this.$emit("printCode",this.printCode) this.printCode =e[0].value
this.printName =e[0].label
this.$emit("printCode",e[0])
}, },
showSelectTemplate(){ async showSelectTemplate(){
this.showTemplateSelect =true
uni.showLoading({ uni.showLoading({
title:"加载中", title:"加载中",
mask:true mask:true
}) })
getPrintTemplateList().then(res=>{ await getPrintTemplateList().then(res=>{
this.templateList =[] this.templateList =res.data
uni.hideLoading()
}).catch(error=>{ }).catch(error=>{
}) })
this.showTemplateSelect =true
}, },
confirmSelectTemplate(){ confirmSelectTemplate(e){
this.templateCode ="" this.templateCode =e[0].value
this.$emit("templateCode",this.templateCode) this.templateName =e[0].label
this.$emit("templateCode",e[0])
} }
} }
} }

105
src/pages/package/job/overPackageJobDetail.vue

@ -1,5 +1,8 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<div style="background: white;">
<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
</div>
<view class="page-header"> <view class="page-header">
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
@ -96,6 +99,7 @@
import comScanPackagePack from '@/pages/package/coms/comScanPackagePack.vue' import comScanPackagePack from '@/pages/package/coms/comScanPackagePack.vue'
import jobTop from '@/mycomponents/job/jobTop.vue' import jobTop from '@/mycomponents/job/jobTop.vue'
import workStation from '@/mycomponents/workStation/workStation.vue' import workStation from '@/mycomponents/workStation/workStation.vue'
import print from '@/mycomponents/print/print.vue'
export default { export default {
name: 'issueDetail', name: 'issueDetail',
@ -106,6 +110,7 @@
comScanPackagePack, comScanPackagePack,
jobTop, jobTop,
workStation, workStation,
print
}, },
data() { data() {
return { return {
@ -115,7 +120,10 @@
detailSource: [], // detailSource: [], //
detailOptions: [], detailOptions: [],
scanOptions: [], scanOptions: [],
jobStatus: "" jobStatus: "",
printDeafult: {}, //
templateDeafult: {} //
}; };
}, },
@ -138,6 +146,7 @@
this.getDetail(); this.getDetail();
} }
} }
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -213,7 +222,18 @@
that.jobStatus = res.data.status that.jobStatus = res.data.status
that.subList = res.data.subList; that.subList = res.data.subList;
that.detailSource = getDataSource(that.detailSource, that.subList) that.detailSource = getDataSource(that.detailSource, that.subList)
this.$nextTick(() => {
if (uni.getStorageSync('overPackageJobDetailPointParams')) {
const overPackageJobDetailPointParams = uni.getStorageSync(
'overPackageJobDetailPointParams')
this.jobContent.printerUuid = overPackageJobDetailPointParams
.printDeafult.value;
this.jobContent.modelCode = overPackageJobDetailPointParams
.templateDeafult.value;
this.$refs.printService.setDefaultData(overPackageJobDetailPointParams
.printDeafult, overPackageJobDetailPointParams.templateDeafult)
}
})
setTimeout(r => { setTimeout(r => {
that.resizeCollapse(); that.resizeCollapse();
}, 100) }, 100)
@ -327,34 +347,55 @@
mask: true mask: true
}); });
var params = this.setParams() var params = this.setParams()
console.log("提交参数", JSON.stringify(params)); console.log(params);
overPageSubmit(params).then(res => { overPageSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data == '打印任务已发送,等待打印机处理!') {
let list = []; this.showCommitSuccessMessage(res.data)
res.data.forEach(item => { const overPackageJobDetailPointParams = {
list.push({ printDeafult: this.printDeafult,
itemCode: item.itemCode, // templateDeafult: this.templateDeafult,
itemName: item.itemName, // }
packName: item.packName, // uni.setStorageSync('overPackageJobDetailPointParams', overPackageJobDetailPointParams)
packageCode: item.number, //
batch: item.batch, //
parentNumber: item.parentNumber, //
itemType: item.itemType, //
asnNumber: item.asnNumber, //ASN
supplierCode: item.supplierCode, //
qty: item.qty, //
printTimes: getCurrDateTime(), //
productionLineCode: item.productionLineCode, //线
barcodeString: item.barcodeString, //
barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage(res.data)
} }
// if(res.data){
// this.showCommitSuccessMessage(res.data)
// const overPackageJobDetailPointParams = {
// printDeafult:this.printDeafult,
// templateDeafult:this.templateDeafult,
// }
// uni.setStorageSync('overPackageJobDetailPointParams',overPackageJobDetailPointParams)
// }else{
// this.showErrorMessage("[" + res.msg + "]")
// }
// if (res.data) {
// let list = [];
// res.data.forEach(item => {
// list.push({
// itemCode: item.itemCode, //
// itemName: item.itemName, //
// packName: item.packName, //
// packageCode: item.number, //
// batch: item.batch, //
// parentNumber: item.parentNumber, //
// itemType: item.itemType, //
// asnNumber: item.asnNumber, //ASN
// supplierCode: item.supplierCode, //
// qty: item.qty, //
// printTimes: getCurrDateTime(), //
// productionLineCode: item.productionLineCode, //线
// barcodeString: item.barcodeString, //
// barcodeBase64: '',
// })
// })
// this.showCommitSuccessMessage("<br><br>", list)
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
@ -379,7 +420,8 @@
record.fromPackingNumber = r record.fromPackingNumber = r
.packingNumber; .packingNumber;
record.fromParentPackingNumber =r.parentPackingNumber; record.fromParentPackingNumber = r
.parentPackingNumber;
record.fromBatch = r.batch; record.fromBatch = r.batch;
record.fromContainerNumber = r record.fromContainerNumber = r
.ContainerNumber; .ContainerNumber;
@ -442,7 +484,14 @@
this.jobContent.creator = creator; this.jobContent.creator = creator;
return this.jobContent; return this.jobContent;
}, },
printCode(e) {
this.jobContent.printerUuid = e.value;
this.printDeafult = e
},
templateCode(e) {
this.jobContent.modelCode = e.value;
this.templateDeafult = e
},
cancel() { cancel() {
let that = this; let that = this;
this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => { this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {

86
src/pages/package/record/overPackageRecord.vue

@ -158,11 +158,20 @@
toPackUnitShow: "请选择", toPackUnitShow: "请选择",
toPackQty: "", toPackQty: "",
itemCode: "", itemCode: "",
resultData: {} resultData: {},
printDeafult:{},//
templateDeafult:{}//
}; };
}, },
onLoad() { onLoad() {
this.getBusinessType(); this.getBusinessType();
this.$nextTick(()=>{
const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
console.log(233,uni.getStorageSync('overPackageRecordPointParams'))
this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)
})
}, },
// //
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
@ -238,12 +247,6 @@
}, },
getScanResult(result) { getScanResult(result) {
this.setData(result); this.setData(result);
setTimeout(res=>{
this.$res.printService.setDefaultData()
})
}, },
setData(result) { setData(result) {
@ -393,33 +396,45 @@
}); });
var params = this.setParams(); var params = this.setParams();
console.log("提交" + JSON.stringify(params)) console.log(params)
overPackageRecordSubmit(params).then(res => { overPackageRecordSubmit(params).then(res => {
uni.hideLoading() uni.hideLoading()
if (res.data) {
let list = [] if (res.data == '打印任务已发送,等待打印机处理!') {
res.data.forEach(item => { this.showCommitSuccessMessage(res.data)
list.push({ const overPackageRecordPointParams = {
itemCode: item.itemCode, // printDeafult:this.printDeafult,
itemName: item.itemName, // templateDeafult:this.templateDeafult,
packName: item.packName, // }
packageCode: item.toPackingNumber, // uni.setStorageSync('overPackageRecordPointParams',overPackageRecordPointParams)
batch: item.toBatch, // this.detailSource = []
parentNumber: item.parentNumber, // else {
itemType: item.itemType, // this.showErrorMessage(res.data)
asnNumber: item.asnNumber, //ASN
supplierCode: item.supplierCode, //
qty: item.qty, //
printTimes: getCurrDateTime(), //
productionLineCode: item.productionLineCode, //线
barcodeString: item.barcodeString, //
barcodeBase64: '',
})
})
this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
} }
// if (res.data) {
// // let list = []
// // res.data.forEach(item => {
// // list.push({
// // itemCode: item.itemCode, //
// // itemName: item.itemName, //
// // packName: item.packName, //
// // packageCode: item.toPackingNumber, //
// // batch: item.toBatch, //
// // parentNumber: item.parentNumber, //
// // itemType: item.itemType, //
// // asnNumber: item.asnNumber, //ASN
// // supplierCode: item.supplierCode, //
// // qty: item.qty, //
// // printTimes: getCurrDateTime(), //
// // productionLineCode: item.productionLineCode, //线
// // barcodeString: item.barcodeString, //
// // barcodeBase64: '',
// // })
// // })
// this.showCommitSuccessMessage(res.msg)
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
}).catch(error => { }).catch(error => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
@ -460,7 +475,14 @@
this.dataContent.creator = creator; this.dataContent.creator = creator;
return this.dataContent; return this.dataContent;
}, },
printCode(e){
this.dataContent.printerUuid = e.value;
this.printDeafult = e
},
templateCode(e){
this.dataContent.modelCode = e.value;
this.templateDeafult = e
},
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) {} if (res) {}

Loading…
Cancel
Save