Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/InvoiceRegByFp.vue

@@ -451,7 +451,7 @@ export default {
 
       imgList: [],
       imgViewerVisible: false,
-
+      cowEn:null,
       //单据相关参数
       orderLoading: false,
       orderList: [],
@@ -688,6 +688,7 @@ export default {
       // this.resultDetailList = [];
     },
     handleInvoiceChange(val) {
+      this.cowEn=val;
       this.getOrderList(val)
       this.getProductDetailList(val)
     },
@@ -696,11 +697,11 @@ export default {
     getProductDetailList(row) {
       this.productDetailLoading = true
       this.productDetailList = []
-      if (row == null || isBlank(row.invoiceEncode)) {
+      if (this.cowEn == null || isBlank(this.cowEn.invoiceEncode)) {
         this.$message.error('请选择对应发票！')
         return
       }
-      this.productQuery.invoiceEncode = row.invoiceEncode
+      this.productQuery.invoiceEncode = this.cowEn.invoiceEncode
       productDetail(this.productQuery).then((res) => {
         this.productDetailLoading = false
         if (res.code === 20000) {