zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

创建标签+半成品标签打印参数调整

dev_web_online
安虹睿 2 years ago
parent
9a01b395e9
commit
e6c7a3e74c
2 changed files with 130 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
  2. 106
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

73
fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
View File

@ -91,6 +91,7 @@ export default {
{title:"预览信息"}, {title:"预览信息"},
{title:"打印"}, {title:"打印"},
], ],
itemPackInfo:{},//已选物品对应的包装信息
selectItemInfo:{},//已选物品信息 selectItemInfo:{},//已选物品信息
// 筛选数据 // 筛选数据
selectData:{ selectData:{
@ -147,6 +148,7 @@ export default {
methods: { methods: {
// 返回 // 返回
rest(){ rest(){
this.itemPackInfo = {}
this.selectItemInfo={}; this.selectItemInfo={};
this.selectData={ this.selectData={
itemCode:"", itemCode:"",
@ -174,14 +176,15 @@ export default {
getPageList(params, "basedata/item-pack") getPageList(params, "basedata/item-pack")
.then(res => { .then(res => {
if (res.items.length > 0) { if (res.items.length > 0) {
this.selectItemInfo = res.items[0]; this.itemPackInfo = res.items[0]
this.selectData.packQty=res.qty
// this.selectItemInfo = res.items[0];
} }
getDetailed(val[0].id, "basedata/item-basic").then(res => { getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res); this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name; this.selectData.itemName=this.selectItemInfo.name;
this.selectData.canMake=this.selectItemInfo.canMake; this.selectData.canMake=this.selectItemInfo.canMake;
this.selectData.packQty=this.selectItemInfo.packQty || "";
}) })
.catch(err => { .catch(err => {
this.pageLoading = false this.pageLoading = false
@ -199,17 +202,52 @@ export default {
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
this.$refs['form_bcpsj'].getDom().validate(valid=>{ this.$refs['form_bcpsj'].getDom().validate(valid=>{
if(valid){ if(valid){
let _data = this.selectItemInfo let _data = {
_data.itemCode=this.selectData.itemCode, fullBarcodeString: undefined,//获取不到
_data.itemName= this.selectData.itemName, itemCode: this.selectData.itemCode || null,
_data.stdPackQty= Number(this.selectData.packQty) || 0, itemName: this.selectItemInfo.name || null,
_data.lot=this.selectData.lot, itemDesc1: this.selectItemInfo.desc1 || null,
_data.qty=Number(this.selectData.qty), itemDesc2: this.selectItemInfo.desc2 || null,
_data.uom= this.selectItemInfo.basicUom || "", lot: this.selectData.lot || "",
_data.itemDesc1= this.selectItemInfo.desc1 || "", supplierBatch: undefined,//获取不到
_data.itemDesc2= this.selectItemInfo.desc2 || "", arriveDate: undefined,//获取不到
_data.labelType= 2, produceDate: undefined,//获取不到
_data.company= localStorage.getItem("company"), expireDate: undefined,//获取不到
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "",
qty: Number(this.selectData.qty),
labelStatus: undefined,//获取不到
recommendLocationCode: undefined,//获取不到
locationErpCode: undefined,//获取不到
containerCode: undefined,//获取不到
supplierCode: this.selectData.supplierCode || null,
poNumber: undefined,//获取不到
rpNumber: undefined,//获取不到
asnNumber: undefined,//获取不到
qLevel: undefined,//获取不到
qualityFile: undefined,//获取不到
prodLine: undefined,//获取不到
team: undefined,//获取不到
shift: undefined,//获取不到
specifications: this.selectItemInfo.color || null,
supplierName: undefined,//生产标签不需要
supplierSimpleName: undefined,//生产标签不需要
supplierItemCode: undefined,//生产标签不需要
supplierItemName: undefined,//生产标签不需要
labelType: 2,
planArriveDate: undefined,//获取不到
}
// let _data = this.selectItemInfo
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot,
// _data.qty=Number(this.selectData.qty),
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= 2,
// _data.company= localStorage.getItem("company"),
// 生成标签（接口） // 生成标签（接口）
this.pageLoading = true; this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data) postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@ -218,9 +256,8 @@ export default {
this.flexSelectTableData = res this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{ this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code item.packingCode=item.code
item.itemName=this.selectData.itemName item.packQty=this.itemPackInfo.qty
item.packQty=this.selectData.packQty item.packUom=this.itemPackInfo.basicUom
item.packUom=this.selectItemInfo.basicUom
}) })
resolve() resolve()
}) })
@ -234,7 +271,9 @@ export default {
}, },
// 打印 // 打印
printHandle(){ printHandle(){
let _printData = {details:[]} // let _printData = {details:[]}
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{ this.flexSelectTableData.forEach(item=>{
_printData.details.push(item) _printData.details.push(item)
}) })

106
fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
View File

@ -295,33 +295,73 @@ export default {
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){ if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.canForm.canType = this.selectItemInfo.canBuy ? "1" : "2"; this.canForm.canType = this.selectItemInfo.canBuy ? "1" : "2";
} }
let _data = JSON.parse(JSON.stringify(this.selectItemInfo)) // console.log(this.selectItemInfo)//basedata/item-basic/list
delete _data.concurrencyStamp; // console.log(this.selectData)
delete _data.company; // console.log(this.selectSupplierInfo)//basedata/supplier-item/list
delete _data.id; let _data = {
delete _data.lastModificationTime; fullBarcodeString: undefined,//获取不到
delete _data.lastModifierId; itemCode: this.selectData.itemCode || null,
delete _data.creationTime; itemName: this.selectItemInfo.name || null,
delete _data.creatorId; itemDesc1: this.selectItemInfo.desc1 || null,
_data.itemCode=this.selectData.itemCode, itemDesc2: this.selectItemInfo.desc2 || null,
_data.itemName= this.selectData.itemName, lot: this.selectData.lot || "",
_data.stdPackQty= Number(this.selectData.packQty) || 0, supplierBatch: undefined,//获取不到
_data.lot=this.selectData.lot || "", arriveDate: undefined,//获取不到
_data.qty=Number(this.selectData.qty), produceDate: undefined,//获取不到
_data.remark=this.selectData.remark, expireDate: undefined,//获取不到
// _data.uom= this.selectItemInfo.packUom || "", stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
_data.uom= this.selectItemInfo.basicUom || "", uom: this.selectItemInfo.basicUom || "",
_data.itemDesc1= this.selectItemInfo.desc1 || "", qty: Number(this.selectData.qty),
_data.itemDesc2= this.selectItemInfo.desc2 || "", labelStatus: undefined,//获取不到
_data.labelType= Number(this.canForm.canType), recommendLocationCode: undefined,//获取不到
_data.company= localStorage.getItem("company"), locationErpCode: undefined,//获取不到
// 选择供应商传递相对信息 containerCode: undefined,//获取不到
_data.supplierCode = this.selectData.supplierCode || "", supplierCode: this.selectData.supplierCode || null,
_data.supplierSimpleName = this.selectSupplierInfo.supplierSimpleName || "", poNumber: undefined,//获取不到
_data.supplierItemCode = this.selectSupplierInfo.supplierItemCode || "", rpNumber: undefined,//获取不到
_data.supplierItemName = this.selectSupplierInfo.supplierItemName || this.selectSupplierInfo.itemName || "", asnNumber: undefined,//获取不到
_data.supplierPackQty = this.selectSupplierInfo.supplierPackQty || "", qLevel: undefined,//获取不到
_data.supplierPackUom = this.selectSupplierInfo.supplierPackUom || "", qualityFile: undefined,//获取不到
prodLine: undefined,//获取不到
team: undefined,//获取不到
shift: undefined,//获取不到
specifications: this.selectItemInfo.color || null,
supplierName: this.selectSupplierInfo.supplierName || undefined,//获取不到
supplierSimpleName: this.selectSupplierInfo.supplierSimpleName || null,
supplierItemCode: this.selectSupplierInfo.supplierItemCode || null,
supplierItemName: this.selectSupplierInfo.itemName || null,
labelType: Number(this.canForm.canType),
planArriveDate: undefined,//获取不到
remark:this.selectData.remark,//接口缺少
}
// let _data = JSON.parse(JSON.stringify(this.selectItemInfo))
// delete _data.concurrencyStamp;
// delete _data.company;
// delete _data.id;
// delete _data.lastModificationTime;
// delete _data.lastModifierId;
// delete _data.creationTime;
// delete _data.creatorId;
// _data.itemCode=this.selectData.itemCode,
// _data.itemName= this.selectData.itemName,
// _data.stdPackQty= Number(this.selectData.packQty) || 0,
// _data.lot=this.selectData.lot || "",
// _data.qty=Number(this.selectData.qty),
// _data.remark=this.selectData.remark,
// // _data.uom= this.selectItemInfo.packUom || "",
// _data.uom= this.selectItemInfo.basicUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.labelType= Number(this.canForm.canType),
// _data.company= localStorage.getItem("company"),
// // 选择供应商传递相对信息
// _data.supplierCode = this.selectData.supplierCode || "",
// _data.supplierName = this.selectSupplierInfo.supplierName || "",
// _data.supplierSimpleName = this.selectSupplierInfo.supplierSimpleName || "",
// _data.supplierItemCode = this.selectSupplierInfo.supplierItemCode || "",
// _data.supplierItemName = this.selectSupplierInfo.supplierItemName || this.selectSupplierInfo.itemName || "",
// _data.supplierPackQty = this.selectSupplierInfo.supplierPackQty || "",
// _data.supplierPackUom = this.selectSupplierInfo.supplierPackUom || "",
// 生成标签（接口） // 生成标签（接口）
this.pageLoading = true; this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data) postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@ -354,11 +394,13 @@ export default {
}, },
// 打印 // 打印
printHandle(){ printHandle(){
let _printData = { // let _printData = {
supplierCode:this.selectData.supplierCode || "", // // supplierCode:this.selectData.supplierCode || "",
supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "", // // supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "",
details:[] // details:[]
} // }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{ this.flexSelectTableData.forEach(item=>{
_printData.details.push(item) _printData.details.push(item)
}) })

Write Preview
Loading…
Cancel
Save