diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index c42b1224..a9ba661e 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -234,12 +234,12 @@
-
+
{{scope.row.waybillDetail.transLineTypeName}}
-
+
{{scope.row.waybillDetail.productTypeName}}
@@ -848,6 +848,12 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
+ if(j === 'waybillDetail.transLineTypeName'){
+ return v['waybillDetail']['transLineTypeName'];
+ }
+ if(j === 'waybillDetail.productTypeName'){
+ return v['waybillDetail']['productTypeName'];
+ }
return v[j]
}))
},