diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js
index cbcbd8f02..7f9f54e50 100644
--- a/fe/PC/src/mixins/printMixin.js
+++ b/fe/PC/src/mixins/printMixin.js
@@ -161,17 +161,17 @@ const printEnumOption = {
     propsData.details.forEach((item,key) => {
         // 序号
         item.xh = Number(key) + 1; 
-        // 转义字典
-        if(enumOption){
-            let _enumOption = (typeof enumOption == 'string') ? printEnumOption[enumOption] : enumOption
-            item[_enumOption.reportStr] = Enum(store.getters.dictionaries[_enumOption.staName], item[_enumOption.value] , _enumOption.label || 'label')
-        }
         // 特殊配置
         if(options && options.details){
             for(var op in options.details){
                 item[op] = item[options.details[op]]
             }
         }
+        // 转义字典
+        if(enumOption){
+            let _enumOption = (typeof enumOption == 'string') ? printEnumOption[enumOption] : enumOption
+            item[_enumOption.reportStr] = Enum(store.getters.dictionaries[_enumOption.staName], item[_enumOption.value] , _enumOption.label || 'label')
+        }
         let _item = Object.assign({},item, _outData);
         _printData.details.push(_item)
     });
@@ -186,26 +186,26 @@ const printEnumOption = {
 // 当前模板数据
 /**todo:储位，预计量，字段确定 */
 // cgshd.rdlx  使用参数
-// 使用位置:采购收货记录 (PurchaseReceiptNote-msQuery.vue)
+// 使用位置:采购收货记录-合格品收货明细tab页 (PurchaseReceiptNote-msQuery.vue)
 // 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName
 // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr;
 
 // thd.rdlx  使用参数
 // 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue PurchaseReturnNote) 
+// 使用位置:采购收货记录-不合格品收货明细tab页 (PurchaseReceiptNote-msQuery.vue)
 // 退货单号:number; 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName
 // 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr;
 
 // 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) 
@@ -232,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)
@@ -246,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)
@@ -255,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; 
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
index 6d4abe1ac..bda8526d5 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
@@ -91,6 +91,7 @@ export default {
         {title:"预览信息"},
         {title:"打印"},
       ],
+      itemPackInfo:{},//已选物品对应的包装信息
       selectItemInfo:{},//已选物品信息
       // 筛选数据
       selectData:{
@@ -147,6 +148,7 @@ export default {
   methods: {
     // 返回
     rest(){
+      this.itemPackInfo = {}
       this.selectItemInfo={};
       this.selectData={
         itemCode:"",
@@ -174,14 +176,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.canMake=this.selectItemInfo.canMake;
-              this.selectData.packQty=this.selectItemInfo.packQty || "";
             })
             .catch(err => {
               this.pageLoading = false
@@ -199,17 +202,52 @@ export default {
       return new Promise((resolve,reject) => {
         this.$refs['form_bcpsj'].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.basicUom || "",
-            _data.itemDesc1= this.selectItemInfo.desc1 || "",
-            _data.itemDesc2= this.selectItemInfo.desc2 || "",
-            _data.labelType= 2,
-            _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,//获取不到
+              poNumber: undefined,//获取不到
+              rpNumber: undefined,//获取不到
+              asnNumber: undefined,//获取不到
+              qLevel: undefined,//获取不到
+              qualityFile: undefined,//获取不到
+              prodLine: undefined,//获取不到
+              team: undefined,//获取不到
+              shift: undefined,//获取不到
+              specifications:  this.selectItemInfo.color || null,
+              supplierCode: undefined,//生产标签不需要
+              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;
             postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@@ -218,9 +256,8 @@ 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.basicUom
+                  item.packQty=this.itemPackInfo.qty
+                  item.packUom=this.itemPackInfo.basicUom
                 })
                 resolve()
               })
@@ -234,7 +271,9 @@ export default {
     },
     // 打印
     printHandle(){
-      let _printData = {details:[]}
+      // let _printData = {details:[]}
+      let _printData = this.flexSelectTableData[0]
+      _printData.details = []
       this.flexSelectTableData.forEach(item=>{
          _printData.details.push(item)
       })
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
index d6916014d..cc821b15c 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
@@ -295,33 +295,73 @@ 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 = 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.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 || "",
+            // console.log(this.selectItemInfo)//basedata/item-basic/list
+            // console.log(this.selectData)
+            // console.log(this.selectSupplierInfo)//basedata/supplier-item/list
+            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: undefined,//获取不到
+              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: 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;
             postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
@@ -354,11 +394,13 @@ export default {
     },
     // 打印
     printHandle(){
-      let _printData = {
-        supplierCode:this.selectData.supplierCode || "",
-        supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "",
-        details:[]
-      }
+      // let _printData = {
+      //   // supplierCode:this.selectData.supplierCode || "",
+      //   // supplierSimpleName:this.selectSupplierInfo.supplierSimpleName || "",
+      //   details:[]
+      // }
+      let _printData = this.flexSelectTableData[0]
+      _printData.details = []
       this.flexSelectTableData.forEach(item=>{
          _printData.details.push(item)
       })
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
index a5590b1e2..1ac62424e 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
+++ b/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)))
       })
diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
index 53012d223..d6805e24f 100644
--- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
+++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
@@ -474,7 +474,6 @@ export default {
             fromLocationCode:"recommendFromLocationCode",
             qty:"recommendQty",
             fromLot:"recommendLot",
-            // toLocationErpCode:"locationErpCode",
             fromLocationErpCode:"recommendFromLocationErpCode",
           }
         }
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue
index 55a915ebd..595532608 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue
@@ -70,6 +70,15 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
+  computed: {
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        if(this.firstTabs == val){data = false}
+        return data
+      }
+    },
+  },
   data () {
     return {
       URL: 'wms/store/purchase-receipt-note',
@@ -90,7 +99,16 @@ export default {
           icon: 'el-icon-printer',
           label: '打印收货单',
           hide: false,
-          name: "print",
+          hide: () => { return this.hideButton('hgpshmx') },
+          name: "print-shd",
+          size: 'mini'
+        },
+        {
+          type: 'info',
+          icon: 'el-icon-printer',
+          label: '打印退货单',
+          name: "print-thd",
+          hide: () => { return this.hideButton('bhgpshmx') },
           size: 'mini'
         },
       ],
@@ -176,8 +194,8 @@ export default {
       })
     },
     drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
+      // 打印收货单（合格品收货明细显示）
+      if(val == 'print-shd'){
         let _printData = JSON.parse(JSON.stringify(this.propsData))
         _printData.details = []
         let _hg=[],_no=[]
@@ -186,16 +204,34 @@ export default {
             item.statusStr = "合格"
             item.reasonStr = ""
             _hg.push(item)
-          }else if(item.purchaseReceiptInspectStatus == 3){
-            item.statusStr = "不合格"
-            item.reasonStr = Enum(this.$store.getters.dictionaries.UnqualifiedReason, item.failedReason , 'label')
-            _no.push(item)
           }
+          // else if(item.purchaseReceiptInspectStatus == 3){
+          //   item.statusStr = "不合格"
+          //   item.reasonStr = Enum(this.$store.getters.dictionaries.UnqualifiedReason, item.failedReason , 'label')
+          //   _no.push(item)
+          // }
         });
         _printData.details = _hg.concat(_no);
         let data = initPrintAllData(_printData,'cgshd.rdlx');
         this.Print(data)
       }
+      // 打印退货单（不合格品收货明细显示）
+      if(val == 'print-thd'){
+        let _printData = JSON.parse(JSON.stringify(this.propsData))
+        _printData.details = []
+        this.propsData.details.forEach(item => {
+          if(item.purchaseReceiptInspectStatus == 3){
+            _printData.details.push(item)
+          }
+        });
+        let _option = {
+          details:{
+            reason:"failedReason"
+          }
+        }
+        let data = initPrintAllData(_printData,'thd.rdlx','UnqualifiedReason',_option);
+        this.Print(data)
+      }
     },
     // 明细table按钮
     currenDrawerButtonClick(row){