Browse Source

标签相关信息调整

dev_web_online
安虹睿 2 years ago
parent
commit
ff7a4ac714
  1. 16
      fe/PC/src/mixins/printMixin.js
  2. 4
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
  3. 112
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
  4. 1
      fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

16
fe/PC/src/mixins/printMixin.js

@ -170,7 +170,6 @@ const printEnumOption = {
// 转义字典
if(enumOption){
let _enumOption = (typeof enumOption == 'string') ? printEnumOption[enumOption] : enumOption
console.log(Enum(store.getters.dictionaries[_enumOption.staName], item[_enumOption.value] , _enumOption.label || 'label'))
item[_enumOption.reportStr] = Enum(store.getters.dictionaries[_enumOption.staName], item[_enumOption.value] , _enumOption.label || 'label')
}
let _item = Object.assign({},item, _outData);
@ -199,15 +198,14 @@ const printEnumOption = {
// lineSideWarehouse.rdlx 使用参数
// 使用位置:线边仓调拨记录 (lineSideWarehouseAllocationNote.vue)
// 调拨单号:number; 参考单据:requestNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName
// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationErpCode; 实际调拨量:qty; 调出储位:fromLocationErpCode;
// 调拨单号:number; 参考单据:poNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName
// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode;
// fscll.rdlx | fsctl.rdlx 使用参数
// 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx)
// 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx)
// 单号:number; 参考单据:?; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName
// 物品代码:itemCode; 物品名称:itemName; 预计量:preQty; 实际量:qty; 单位:uom; 储位:locationCode;
// 项目分类代码:projCapacityCode; 项目分类名称:projCapacityName; 专案代码:caseCode; 专案名称:caseName; 说明:remark
// 单号:number; 参考单据:?; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName; 项目分类名称:projCapacityName; 专案代码:caseCode; 说明:remark
// 料品编号:itemCode; 品名:itemName; 单位:uom; 预计量:preQty; 实际量:qty; 储位:locationCode;
// cwdbd.rdlx 使用参数
// 使用位置:储位调拨记录 (interStorageAllocationNote.vue)
@ -234,7 +232,7 @@ const printEnumOption = {
// 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue)
// 单号:number; 制表日:creationTime; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 实际数量:qty; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; 箱数:stdPackQty
// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
// xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同,除了领/退字段
// 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote)
@ -248,7 +246,7 @@ const printEnumOption = {
// hslrkd.rdlx 使用参数
// 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt)
// 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 数量:qty; 储位:locationErpCode;
// 物品代码:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode;
// chdmxb.rdlx 使用参数
// 使用位置:原料直发客户记录 (materialDirectSendNote.vue)
@ -257,5 +255,5 @@ const printEnumOption = {
// ysd.rdlx 使用参数
// 使用位置:采购上架记录 (PutawayNote.vue)
// 供应商代码:supplierCode; 供应商名称:supplierName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName;
// 供应商代码:supplierCode; 供应商名称:supplierSimpleName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName;
// 物品代码:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode;

4
fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@ -177,7 +177,7 @@ export default {
.then(res => {
if (res.items.length > 0) {
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.qty
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
@ -220,7 +220,6 @@ export default {
recommendLocationCode: undefined,//
locationErpCode: undefined,//
containerCode: undefined,//
supplierCode: this.selectData.supplierCode || null,
poNumber: undefined,//
rpNumber: undefined,//
asnNumber: undefined,//
@ -230,6 +229,7 @@ export default {
team: undefined,//
shift: undefined,//
specifications: this.selectItemInfo.color || null,
supplierCode: undefined,//
supplierName: undefined,//
supplierSimpleName: undefined,//
supplierItemCode: undefined,//

112
fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@ -92,7 +92,10 @@ export default {
{title:"预览信息"},
{title:"打印"},
],
itemPackInfo:{},//
poNumberInfo:{},//
selectItemInfo:{},//
selectSupplierInfo:{},//
//
selectData:{
itemCode:"",
@ -154,7 +157,7 @@ export default {
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "订单号", prop: "poNumber", },
{ width:"auto",label: "供应商代码", prop: "supplierCode", },
{ width:"auto",label: "供应商名称", prop: "supplierName", },
{ width:"auto",label: "供应商名称", prop: "supplierSimpleName", },
{ width:"auto",label: "标包数量", prop: "packQty", },
{ width:"auto",label: "标包单位", prop: "packUom", },
{ width:"auto",label: "实际数量", prop: "qty", },
@ -168,7 +171,10 @@ export default {
methods: {
//
rest(){
this.selectSupplierInfo = {}
this.selectItemInfo={};
this.itemPackInfo = {}
this.poNumberInfo = {}
this.selectData={
itemCode:"",
itemName:"",
@ -194,13 +200,15 @@ export default {
getPageList(params, "basedata/item-pack")
.then(res => {
if (res.items.length > 0) {
this.selectItemInfo = res.items[0];
this.itemPackInfo = res.items[0]
this.selectData.packQty=res.items[0].qty
// this.selectItemInfo = res.items[0];
}
getDetailed(val[0].id, "basedata/item-basic").then(res => {
this.pageLoading = false
this.selectItemInfo = Object.assign(this.selectItemInfo,res);
this.selectData.itemName=this.selectItemInfo.name;
this.selectData.packQty=this.selectItemInfo.packQty || "";
// this.selectData.packQty=this.selectItemInfo.packQty || "";
})
.catch(err => {
this.pageLoading = false
@ -211,11 +219,14 @@ export default {
})
}
else if (val[1].prop == "supplierCode"){
this.selectData.supplierName = val[0].supplierSimpleName
this.selectSupplierInfo = val[0]
// this.selectData.supplierName = val[0].supplierName
// this.selectData.supplierSimpleName = val[0].supplierSimpleName
}
//
else if(val[1].prop == "poNumber"){
this.selectData.poNumberInfo = val[0]
this.poNumberInfo = val[0]
// this.selectData.poNumber = val[0].poNumber
}
},
//
@ -231,18 +242,53 @@ export default {
return new Promise((resolve,reject) => {
this.$refs['form_sctk'].getDom().validate(valid=>{
if(valid){
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.packUom || "",
_data.itemDesc1= this.selectItemInfo.desc1 || "",
_data.itemDesc2= this.selectItemInfo.desc2 || "",
_data.poNumber= this.selectData.poNumber,
_data.labelType= 1,
_data.company= localStorage.getItem("company"),
let _data = {
fullBarcodeString: undefined,//
itemCode: this.selectData.itemCode || null,
itemName: this.selectItemInfo.name || null,
itemDesc1: this.selectItemInfo.desc1 || null,
itemDesc2: this.selectItemInfo.desc2 || null,
lot: this.selectData.lot || "",
supplierBatch: undefined,//
arriveDate: undefined,//
produceDate: undefined,//
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: this.selectData.poNumber,
rpNumber: undefined,//
asnNumber: undefined,//
qLevel: undefined,//
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: 1,
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.packUom || "",
// _data.itemDesc1= this.selectItemInfo.desc1 || "",
// _data.itemDesc2= this.selectItemInfo.desc2 || "",
// _data.poNumber= this.selectData.poNumber,
// _data.labelType= 1,
// _data.company= localStorage.getItem("company"),
//
this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@ -251,12 +297,14 @@ export default {
this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code
item.itemName=this.selectData.itemName
item.packQty=this.selectData.packQty
item.packUom=this.selectItemInfo.packUom
item.supplierName=this.selectData.supplierName
item.supplierCode=this.selectData.supplierCode
item.poNumber=this.selectData.poNumber
// item.itemName=this.selectData.itemName
item.packQty=this.itemPackInfo.qty
item.packUom=this.itemPackInfo.basicUom
// item.packQty=this.selectData.packQty
// item.packUom=this.selectItemInfo.packUom
// item.supplierName=this.selectData.supplierName
// item.supplierCode=this.selectData.supplierCode
// item.poNumber=this.selectData.poNumber
})
resolve()
})
@ -270,14 +318,16 @@ export default {
},
//
printHandle(){
let _printData = {
poNumber:this.selectData.poNumber,
asnNumber:this.flexSelectTableData[0].asnNumber,
supplierCode:this.flexSelectTableData[0].supplierCode,
supplierName:this.flexSelectTableData[0].supplierName,
supplierSimpleName:this.flexSelectTableData[0].supplierName,
details:[]
}
// let _printData = {
// poNumber:this.selectData.poNumber,
// asnNumber:this.flexSelectTableData[0].asnNumber,
// supplierCode:this.flexSelectTableData[0].supplierCode,
// supplierName:this.flexSelectTableData[0].supplierName,
// supplierSimpleName:this.flexSelectTableData[0].supplierName,
// details:[]
// }
let _printData = this.flexSelectTableData[0]
_printData.details = []
this.flexSelectTableData.forEach(item=>{
_printData.details.push(JSON.parse(JSON.stringify(item)))
})

1
fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@ -474,7 +474,6 @@ export default {
fromLocationCode:"recommendFromLocationCode",
qty:"recommendQty",
fromLot:"recommendLot",
// toLocationErpCode:"locationErpCode",
fromLocationErpCode:"recommendFromLocationErpCode",
}
}

Loading…
Cancel
Save