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

打印相关内容调整

dev_web_online
安虹睿 2 years ago
parent
0fa9ea3b7c
commit
5b289da015
7 changed files with 79 additions and 72 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. 39
      fe/PC/src/mixins/printMixin.js
  2. 13
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
  3. 2
      fe/PC/src/views/labelManage/RepairLabels.vue
  4. 26
      fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue
  5. 7
      fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
  6. 32
      fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue
  7. 32
      fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue

39
fe/PC/src/mixins/printMixin.js
View File

@ -20,14 +20,15 @@ export function initPrintPackingCodeData(propsData,options,name,url){
propsData.details.forEach((item,key) => { propsData.details.forEach((item,key) => {
_printData["boxlabel"].push({ _printData["boxlabel"].push({
"title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title "title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title
"contacts": propsData[_options.contacts] || propsData.contacts,//客户名称 "supplierSimpleName": propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称
"customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
"supplierCode": propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码 "supplierCode": propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码
"supplierName": propsData[_options.supplierName] || propsData.supplierName,//供应商名称 "poNumber": propsData[_options.poNumber] || propsData.poNumber,//订单号
"asnNumber": propsData[_options.asnNumber] || propsData.asnNumber,//发货单号
"remark": propsData[_options.remark] || propsData.remark,//备注 "remark": propsData[_options.remark] || propsData.remark,//备注
"planArriveDate":propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间 "planArriveDate":propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间
"poNumber": propsData[_options.poNumber] || propsData.poNumber,//订单号？ // "contacts": propsData[_options.contacts] || propsData.contacts,//客户名称 暂未使用
"asnNumber": propsData[_options.asnNumber] || propsData.asnNumber,//发货单号？ // "customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址 暂未使用
// "supplierName": propsData[_options.supplierName] || propsData.supplierName,//供应商名称 暂未使用
"details": [ "details": [
{ {
"supplierItemName": item[_options.supplierItemName] || item.supplierItemName,//零件名(供应商零件名) "supplierItemName": item[_options.supplierItemName] || item.supplierItemName,//零件名(供应商零件名)
@ -36,12 +37,12 @@ export function initPrintPackingCodeData(propsData,options,name,url){
"produceDate": item[_options.produceDate] || item.produceDate,//生产时间 "produceDate": item[_options.produceDate] || item.produceDate,//生产时间
"lot": item[_options.lot] || item.lot,//生产批次 "lot": item[_options.lot] || item.lot,//生产批次
"locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位 "locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
"itemName": item[_options.itemName] || item.itemName,//物品名称
"itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号） "itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号）
"stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 "qty": item[_options.qty] || item.qty,//要货数量 + 整包数量
"qty": item[_options.qty] || item.qty,//要货数量
"packingCode": item[_options.packingCode] || item.packingCode,//条形码 "packingCode": item[_options.packingCode] || item.packingCode,//条形码
"printIndex":item[_options.printIndex] || Number(key)+1,//打印序列 "printIndex":item[_options.printIndex] || Number(key)+1,//打印序列
// "itemName": item[_options.itemName] || item.itemName,//物品名称 暂未使用
// "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 暂未使用
} }
], ],
}) })
@ -98,8 +99,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
_label['supplierSimpleName'+Number(key2 + 1)]= propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称（简称） _label['supplierSimpleName'+Number(key2 + 1)]= propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称（简称）
_label['remark'+Number(key2 + 1)]= propsData[_options.remark] || propsData.remark,//备注 _label['remark'+Number(key2 + 1)]= propsData[_options.remark] || propsData.remark,//备注
_label['planArriveDate'+Number(key2 + 1)]=propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间 _label['planArriveDate'+Number(key2 + 1)]=propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间
_label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号？ _label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号
_label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号？ _label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号
_label['supplierItemName'+Number(key2 + 1)] = item[_options.supplierItemName] || item2.supplierItemName;//零件名(供应商零件名) _label['supplierItemName'+Number(key2 + 1)] = item[_options.supplierItemName] || item2.supplierItemName;//零件名(供应商零件名)
_label['supplierItemCode'+Number(key2 + 1)] = item[_options.supplierItemCode] || item2.supplierItemCode;//零件号(供应商零件号) _label['supplierItemCode'+Number(key2 + 1)] = item[_options.supplierItemCode] || item2.supplierItemCode;//零件号(供应商零件号)
@ -108,8 +109,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
_label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次 _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
_label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位 _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号） _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
_label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 // _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用
_label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量
_label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码 _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
_label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号 _label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号
@ -190,19 +191,19 @@ const printEnumOption = {
// 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr; // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr;
// thd.rdlx 使用参数 // thd.rdlx 使用参数
// 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue) // 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue PurchaseReturnNote)
// 退货单号:number; 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName // 退货单号:number; 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName
// 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr; // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr;
// lineSideWarehouse.rdlx 使用参数 // lineSideWarehouse.rdlx 使用参数
// 使用位置:线边仓调拨记录 (lineSideWarehouseAllocationNote.vue) // 使用位置:线边仓调拨记录 (lineSideWarehouseAllocationNote.vue)
// 调拨单号:number; 参考单据:requestNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName // 调拨单号:number; 参考单据:requestNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName
// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode; // 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationErpCode; 实际调拨量:qty; 调出储位:fromLocationErpCode;
// fscll.rdlx | fsctl.rdlx 使用参数 // fscll.rdlx | fsctl.rdlx 使用参数
// 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx) // 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx)
// 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx) // 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx)
// 单号:number; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName // 单号:number; 参考单据：？; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName
// 物品代码:itemCode; 物品名称:itemName; 预计量:preQty; 实际量:qty; 单位:uom; 储位:locationCode; // 物品代码:itemCode; 物品名称:itemName; 预计量:preQty; 实际量:qty; 单位:uom; 储位:locationCode;
// 项目分类代码:projCapacityCode; 项目分类名称:projCapacityName; 专案代码:caseCode; 专案名称:caseName; 说明:remark // 项目分类代码:projCapacityCode; 项目分类名称:projCapacityName; 专案代码:caseCode; 专案名称:caseName; 说明:remark
@ -231,7 +232,7 @@ const printEnumOption = {
// 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue) // 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue)
// 单号:number; 制表日:creationTime; 部门名称:deptName; // 单号:number; 制表日:creationTime; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; // 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; // 实际数量:qty; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; 箱数:stdPackQty
// xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段 // xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段
// 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote) // 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote)
@ -245,14 +246,14 @@ const printEnumOption = {
// hslrkd.rdlx 使用参数 // hslrkd.rdlx 使用参数
// 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt) // 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt)
// 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName; // 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode; // 物品代码:itemCode; 物品名称:itemName; 数量:qty; 储位:locationErpCode;
// chdmxb.rdlx 使用参数 // chdmxb.rdlx 使用参数
// 使用位置:原料直发客户记录 (materialDirectSendNote.vue) // 使用位置:原料直发客户记录 (materialDirectSendNote.vue)
// 出货单号:number; 出货日期:deliverTime; 制表日:creationTime; 客户名称:customerCode; 客户地址:customerAddressCode; // 出货单号:number; 出货日期:deliverTime; 制表日:creationTime; 客户名称:customerCode; 客户地址:customerAddressCode;
// 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty; 正厂编号:itemDesc2; // 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty;
// ysd.rdlx 使用参数 // ysd.rdlx 使用参数
// 使用位置:采购上架记录 (PutawayNote.vue) // 使用位置:采购上架记录 (PutawayNote.vue)
// 供应商代码:supplierCode; 供应商名称:supplierSimpleName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName; // 供应商代码:supplierCode; 供应商名称:supplierName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName;
// 物品代码:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode; // 物品代码:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode;

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

@ -295,7 +295,14 @@ 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 = this.selectItemInfo 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.itemCode=this.selectData.itemCode,
_data.itemName= this.selectData.itemName, _data.itemName= this.selectData.itemName,
_data.stdPackQty= Number(this.selectData.packQty) || 0, _data.stdPackQty= Number(this.selectData.packQty) || 0,
@ -324,9 +331,9 @@ 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.itemName=this.selectData.itemName
// item.packQty=this.selectData.packQty // item.packQty=this.selectData.packQty
item.packUom=this.selectItemInfo.basicUom // item.packUom=this.selectItemInfo.basicUom
}) })
resolve() resolve()
}) })

2
fe/PC/src/views/labelManage/RepairLabels.vue
View File

@ -194,7 +194,7 @@ export default {
// 打印 // 打印
printHandle(){ printHandle(){
let _printData = { let _printData = {
supplierSimpleName:this.flexTableData[0].supplierSimpleName || "", supplierSimpleName:this.flexTableData[0].supplierSimpleName || this.flexTableData[0].supplierName || "",
supplierCode:this.flexTableData[0].supplierCode || "", supplierCode:this.flexTableData[0].supplierCode || "",
title:"补打标签", title:"补打标签",
contacts:this.flexTableData[0].contacts || "", contacts:this.flexTableData[0].contacts || "",

26
fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue
View File

@ -107,21 +107,21 @@ export default {
drawerbutton (val) { drawerbutton (val) {
// 打印 // 打印
if(val == 'print'){ if(val == 'print'){
if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){
allSupplierByCodes([this.propsData.supplierCode]).then(res => { // allSupplierByCodes([this.propsData.supplierCode]).then(res => {
if(res.length > 0){ // if(res.length > 0){
this.propsData.supplierName = res[0].name // this.propsData.supplierName = res[0].name
this.propsData.supplierShortName = res[0].shortName // this.propsData.supplierShortName = res[0].shortName
} // }
let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); // let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason');
this.Print(data) // this.Print(data)
}).catch(err => { // }).catch(err => {
console.log(err) // console.log(err)
}) // })
}else{ // }else{
let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason');
this.Print(data) this.Print(data)
} // }
} }
}, },
} }

7
fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
View File

@ -471,12 +471,11 @@ export default {
}) })
let _option = { let _option = {
details:{ details:{
fromLocationCode:"recommendLocationCode", fromLocationCode:"recommendFromLocationCode",
qty:"recommendQty", qty:"recommendQty",
uom:"recommendUom",
fromLot:"recommendLot", fromLot:"recommendLot",
toLocationErpCode:"locationErpCode", // toLocationErpCode:"locationErpCode",
fromLocationErpCode:"recommendLocationErpCode", fromLocationErpCode:"recommendFromLocationErpCode",
} }
} }
let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);

32
fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue
View File

@ -103,24 +103,24 @@ export default {
drawerbutton (val) { drawerbutton (val) {
// 打印 // 打印
if(val == 'print'){ if(val == 'print'){
if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){
this.Loading.tableLoading = true // this.Loading.tableLoading = true
allSupplierByCodes([this.propsData.supplierCode]).then(res => { // allSupplierByCodes([this.propsData.supplierCode]).then(res => {
this.Loading.tableLoading = false // this.Loading.tableLoading = false
if(res.length > 0){ // if(res.length > 0){
this.propsData.supplierName = res[0].name // this.propsData.supplierName = res[0].name
this.propsData.supplierShortName = res[0].shortName // this.propsData.supplierShortName = res[0].shortName
} // }
let data = initPrintAllData(this.propsData,'ysd.rdlx'); // let data = initPrintAllData(this.propsData,'ysd.rdlx');
this.Print(data) // this.Print(data)
}).catch(err => { // }).catch(err => {
this.Loading.tableLoading = false // this.Loading.tableLoading = false
console.log(err) // console.log(err)
}) // })
}else{ // }else{
let data = initPrintAllData(this.propsData,'ysd.rdlx'); let data = initPrintAllData(this.propsData,'ysd.rdlx');
this.Print(data) this.Print(data)
} // }
} }
}, },
}, },

32
fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue
View File

@ -107,24 +107,24 @@ export default {
drawerbutton (val) { drawerbutton (val) {
// 打印 // 打印
if(val == 'print'){ if(val == 'print'){
if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){
this.Loading.appMainLoading = true // this.Loading.appMainLoading = true
allSupplierByCodes([this.propsData.supplierCode]).then(res => { // allSupplierByCodes([this.propsData.supplierCode]).then(res => {
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
if(res.length > 0){ // if(res.length > 0){
this.propsData.supplierName = res[0].name // this.propsData.supplierName = res[0].name
this.propsData.supplierShortName = res[0].shortName // this.propsData.supplierShortName = res[0].shortName
} // }
let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); // let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason');
this.Print(data) // this.Print(data)
}).catch(err => { // }).catch(err => {
this.Loading.appMainLoading = false // this.Loading.appMainLoading = false
console.log(err) // console.log(err)
}) // })
}else{ // }else{
let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason');
this.Print(data) this.Print(data)
} // }
} }
}, },
} }

Write Preview
Loading…
Cancel
Save