Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customer/index.vue

@@ -692,7 +692,7 @@ export default {
           this.exportLoading = true;
           return exportCustomerExcel(params);
         }).then(response => {
-          this.$download.excel(response, '${table.classComment}.xls');
+          this.$download.excel(response, '客户信息.xls');
           this.exportLoading = false;
         }).catch(() => {});
     },

src/views/ecw/order/pending.vue

@@ -159,14 +159,19 @@ export default {
 
     handEdit(row){
       if(row.orderExceptionType=='order_no_quote_exception'){
-        let url = '../../lineProject/product-price/edit?product_id=' + row.orderItemId
-
-        if(row.orderItem){
-          getProduct(row.orderItemId).then(res=>{
-              url = '../../lineProject/product-price/edit?product_id='+row.orderItemId+'&product_type='+res.data.typeId
-          })
+        if(row.orderItemId){
+          var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
+          if(productData){
+            getProduct(productData.prodId).then(res=>{
+                let url = '../../lineProject/product-price/edit?product_id='+productData.prodId+'&product_type='+res.data.typeId
+                return this.$router.push(url)
+            })
+          }
+        }else{
+          let url = '../../lineProject/product-price/edit'
+           return this.$router.push(url)
         }
-        return this.$router.push(url)
+
       }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
         this.$router.push({
           path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,