diff --git a/fe/PC/src/mixins/printMixin.js b/fe/PC/src/mixins/printMixin.js
index cbcbd8f02..ce5ba7611 100644
--- a/fe/PC/src/mixins/printMixin.js
+++ b/fe/PC/src/mixins/printMixin.js
@@ -161,17 +161,18 @@ 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
+            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);
         _printData.details.push(_item)
     });
@@ -186,12 +187,13 @@ 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;
 
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){