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

src/api/ecw/product.js

@@ -26,7 +26,14 @@ export function updateProduct(data) {
     data: data
   })
 }
-
+// 获得空运产品的路线价格数量
+export function countByProductIdAndTransportType(params){
+  return request({
+    url:'/ecw/product-price/countByProductIdAndTransportType',
+    method:'get',
+    params
+  })
+}
 // 删除产品
 export function deleteProduct(id) {
   return request({

src/views/ecw/product/product-dialog.vue

@@ -74,6 +74,7 @@
 
 <script>
 import {
+  countByProductIdAndTransportType,
   createProduct,
   deleteProduct,
   exportProductExcel,
@@ -236,9 +237,14 @@ export default {
   },
   methods: {
     copyLine(row, bol){
+      if(bol){
+        countByProductIdAndTransportType({productId:row.id}).then(r =>{
+          this.$emit( 'copyLine', {...row,priceLineCount:r.data}, bol)
+        })
+      }else {
         this.$emit( 'copyLine', row, bol)
-
-
+      }
+      console.log(bol,'bol')
     },
     /** 获取产品属性列表 */
     getAttrList() {