From 5b289da015d5a927c94f668a7eeb3a3d827bfafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 12 Apr 2023 18:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9B=B8=E5=85=B3=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/mixins/printMixin.js | 39 ++++++++++--------- .../RecycledMaterialsLabel.vue | 13 +++++-- fe/PC/src/views/labelManage/RepairLabels.vue | 2 +- .../beforeGroundingReturnNote.vue | 26 ++++++------- .../manualMaterialRequest/IssueJob.vue | 7 ++-- .../purchaseOnShelves/PutawayNote.vue | 32 +++++++-------- .../purchaseReturn/returnNote.vue | 32 +++++++-------- 7 files changed, 79 insertions(+), 72 deletions(-) diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js index 2adfc2d34..cbcbd8f02 100644 --- a/fe/PC/src/mixins/printMixin.js +++ b/fe/PC/src/mixins/printMixin.js @@ -20,14 +20,15 @@ export function initPrintPackingCodeData(propsData,options,name,url){ propsData.details.forEach((item,key) => { _printData["boxlabel"].push({ "title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title - "contacts": propsData[_options.contacts] || propsData.contacts,//客户名称 - "customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址 + "supplierSimpleName": propsData[_options.supplierSimpleName] || propsData.supplierSimpleName,//供应商名称 "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,//备注 "planArriveDate":propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间 - "poNumber": propsData[_options.poNumber] || propsData.poNumber,//订单号？ - "asnNumber": propsData[_options.asnNumber] || propsData.asnNumber,//发货单号？ + // "contacts": propsData[_options.contacts] || propsData.contacts,//客户名称 暂未使用 + // "customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址 暂未使用 + // "supplierName": propsData[_options.supplierName] || propsData.supplierName,//供应商名称 暂未使用 "details": [ { "supplierItemName": item[_options.supplierItemName] || item.supplierItemName,//零件名(供应商零件名) @@ -36,12 +37,12 @@ export function initPrintPackingCodeData(propsData,options,name,url){ "produceDate": item[_options.produceDate] || item.produceDate,//生产时间 "lot": item[_options.lot] || item.lot,//生产批次 "locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位 - "itemName": item[_options.itemName] || item.itemName,//物品名称 "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,//条形码 "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['remark'+Number(key2 + 1)]= propsData[_options.remark] || propsData.remark,//备注 _label['planArriveDate'+Number(key2 + 1)]=propsData[_options.planArriveDate] || propsData.planArriveDate,//要求到货时间 - _label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号？ - _label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号？ + _label['poNumber'+Number(key2 + 1)]= propsData[_options.poNumber] || propsData.poNumber,//订单号 + _label['asnNumber'+Number(key2 + 1)]= propsData[_options.asnNumber] || propsData.asnNumber,//发货单号 _label['supplierItemName'+Number(key2 + 1)] = item[_options.supplierItemName] || item2.supplierItemName;//零件名(供应商零件名) _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['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位 _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号） - _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 - _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + // _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用 + _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量 _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码 _label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号 @@ -190,19 +191,19 @@ const printEnumOption = { // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr; // thd.rdlx 使用参数 -// 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue) +// 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue PurchaseReturnNote) // 退货单号:number; 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr; // lineSideWarehouse.rdlx 使用参数 // 使用位置:线边仓调拨记录 (lineSideWarehouseAllocationNote.vue) // 调拨单号:number; 参考单据:requestNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName -// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode; +// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationErpCode; 实际调拨量:qty; 调出储位:fromLocationErpCode; // fscll.rdlx | fsctl.rdlx 使用参数 // 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx) // 使用位置:非生产退料申请 (materialReturnRequest.vue - fsctl.rdlx) -// 单号:number; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName +// 单号:number; 参考单据：？; 制表日:creationTime; 部门代码:deptCode; 部门名称:deptName // 物品代码:itemCode; 物品名称:itemName; 预计量:preQty; 实际量:qty; 单位:uom; 储位:locationCode; // 项目分类代码:projCapacityCode; 项目分类名称:projCapacityName; 专案代码:caseCode; 专案名称:caseName; 说明:remark @@ -231,7 +232,7 @@ const printEnumOption = { // 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue) // 单号:number; 制表日:creationTime; 部门名称:deptName; // 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; -// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; +// 实际数量:qty; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode; 箱数:stdPackQty // xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段 // 使用位置:生产退库记录 (productionReturn => returnNote.vue productionReturnNote) @@ -245,14 +246,14 @@ const printEnumOption = { // hslrkd.rdlx 使用参数 // 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt) // 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName; -// 物品代码:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode; +// 物品代码:itemCode; 物品名称:itemName; 数量:qty; 储位:locationErpCode; // chdmxb.rdlx 使用参数 // 使用位置:原料直发客户记录 (materialDirectSendNote.vue) // 出货单号:number; 出货日期:deliverTime; 制表日:creationTime; 客户名称:customerCode; 客户地址:customerAddressCode; -// 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty; 正厂编号:itemDesc2; +// 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty; // ysd.rdlx 使用参数 // 使用位置:采购上架记录 (PutawayNote.vue) -// 供应商代码:supplierCode; 供应商名称:supplierSimpleName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName; +// 供应商代码:supplierCode; 供应商名称:supplierName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName; // 物品代码:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode; diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue index 7671d2e86..d6916014d 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue @@ -295,7 +295,14 @@ export default { if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){ 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.itemName= this.selectData.itemName, _data.stdPackQty= Number(this.selectData.packQty) || 0, @@ -324,9 +331,9 @@ export default { this.flexSelectTableData = res this.flexSelectTableData.forEach(item=>{ item.packingCode=item.code - item.itemName=this.selectData.itemName + // item.itemName=this.selectData.itemName // item.packQty=this.selectData.packQty - item.packUom=this.selectItemInfo.basicUom + // item.packUom=this.selectItemInfo.basicUom }) resolve() }) diff --git a/fe/PC/src/views/labelManage/RepairLabels.vue b/fe/PC/src/views/labelManage/RepairLabels.vue index ce86eab32..29a661e92 100644 --- a/fe/PC/src/views/labelManage/RepairLabels.vue +++ b/fe/PC/src/views/labelManage/RepairLabels.vue @@ -194,7 +194,7 @@ export default { // 打印 printHandle(){ let _printData = { - supplierSimpleName:this.flexTableData[0].supplierSimpleName || "", + supplierSimpleName:this.flexTableData[0].supplierSimpleName || this.flexTableData[0].supplierName || "", supplierCode:this.flexTableData[0].supplierCode || "", title:"补打标签", contacts:this.flexTableData[0].contacts || "", diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index c19eba560..2e03f2676 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue @@ -107,21 +107,21 @@ export default { drawerbutton (val) { // 打印 if(val == 'print'){ - if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ - allSupplierByCodes([this.propsData.supplierCode]).then(res => { - if(res.length > 0){ - this.propsData.supplierName = res[0].name - this.propsData.supplierShortName = res[0].shortName - } - let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); - this.Print(data) - }).catch(err => { - console.log(err) - }) - }else{ + // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ + // allSupplierByCodes([this.propsData.supplierCode]).then(res => { + // if(res.length > 0){ + // this.propsData.supplierName = res[0].name + // this.propsData.supplierShortName = res[0].shortName + // } + // let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); + // this.Print(data) + // }).catch(err => { + // console.log(err) + // }) + // }else{ let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); this.Print(data) - } + // } } }, } diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue index 28b6d35fd..53012d223 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue @@ -471,12 +471,11 @@ export default { }) let _option = { details:{ - fromLocationCode:"recommendLocationCode", + fromLocationCode:"recommendFromLocationCode", qty:"recommendQty", - uom:"recommendUom", fromLot:"recommendLot", - toLocationErpCode:"locationErpCode", - fromLocationErpCode:"recommendLocationErpCode", + // toLocationErpCode:"locationErpCode", + fromLocationErpCode:"recommendFromLocationErpCode", } } let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); diff --git a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue index c3cabd706..c64e3e1f5 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue @@ -103,24 +103,24 @@ export default { drawerbutton (val) { // 打印 if(val == 'print'){ - if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ - this.Loading.tableLoading = true - allSupplierByCodes([this.propsData.supplierCode]).then(res => { - this.Loading.tableLoading = false - if(res.length > 0){ - this.propsData.supplierName = res[0].name - this.propsData.supplierShortName = res[0].shortName - } - let data = initPrintAllData(this.propsData,'ysd.rdlx'); - this.Print(data) - }).catch(err => { - this.Loading.tableLoading = false - console.log(err) - }) - }else{ + // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ + // this.Loading.tableLoading = true + // allSupplierByCodes([this.propsData.supplierCode]).then(res => { + // this.Loading.tableLoading = false + // if(res.length > 0){ + // this.propsData.supplierName = res[0].name + // this.propsData.supplierShortName = res[0].shortName + // } + // let data = initPrintAllData(this.propsData,'ysd.rdlx'); + // this.Print(data) + // }).catch(err => { + // this.Loading.tableLoading = false + // console.log(err) + // }) + // }else{ let data = initPrintAllData(this.propsData,'ysd.rdlx'); this.Print(data) - } + // } } }, }, diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index 9a9d81d20..f07cd82be 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue @@ -107,24 +107,24 @@ export default { drawerbutton (val) { // 打印 if(val == 'print'){ - if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ - this.Loading.appMainLoading = true - allSupplierByCodes([this.propsData.supplierCode]).then(res => { - this.Loading.appMainLoading = false - if(res.length > 0){ - this.propsData.supplierName = res[0].name - this.propsData.supplierShortName = res[0].shortName - } - let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); - this.Print(data) - }).catch(err => { - this.Loading.appMainLoading = false - console.log(err) - }) - }else{ + // if((this.propsData.supplierCode) && (!this.propsData.supplierName || !this.propsData.supplierShortName)){ + // this.Loading.appMainLoading = true + // allSupplierByCodes([this.propsData.supplierCode]).then(res => { + // this.Loading.appMainLoading = false + // if(res.length > 0){ + // this.propsData.supplierName = res[0].name + // this.propsData.supplierShortName = res[0].shortName + // } + // let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); + // this.Print(data) + // }).catch(err => { + // this.Loading.appMainLoading = false + // console.log(err) + // }) + // }else{ let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); this.Print(data) - } + // } } }, }