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

src/views/ecw/product/index.vue

@@ -130,7 +130,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :modal-append-to-body="false" :title="title" :visible.sync="open" width="850px" >
+    <el-dialog :modal="false" :modal-append-to-body="true" :title="title" :visible.sync="open" width="850px" >
       <el-form v-if="open"  ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item :label="$t('商品类型')" prop="typeId">
           <el-select v-model="form.typeId" :placeholder="$t('选择商品类型')" clearable>
@@ -231,7 +231,7 @@
            <span>
              复制模板线路价格：{{lineNum}}个
            </span>
-           <span @click="toPriceManager(formCopy)" style="color: #0a84ff;cursor: pointer;">
+           <span @click="toPriceManager(formCopy, true)" style="color: #0a84ff;cursor: pointer;">
              查看《#{{$l(formCopy,'title')}}#》路线价格
            </span>
          </p>
@@ -462,6 +462,7 @@ export default {
       }else {
         this.open = true;
         copy()
+        this.lineNum = 0
         this.form.isCopyProductPriceTemplate = false;
       }
       this.$forceUpdate()
@@ -481,15 +482,25 @@ export default {
     },
 
     /**跳转价格管理 */
-    toPriceManager(row) {
+    toPriceManager(row, flag = false) {
       /* localStorage.setItem('product', JSON.stringify(row));
       localStorage.setItem('typeList', JSON.stringify(this.typeList)); */
-      this.$router.push({
-        name: 'ProductPrice',
-        query: {
+      let  p
+      if (flag){
+        p = {
           product_id: row.id,
-          product_type: row.typeId
+          product_type: row.typeId,
+          transportType:3,
         }
+      }else {
+        p = {
+          product_id: row.id,
+          product_type: row.typeId,
+        }
+      }
+      this.$router.push({
+        name: 'ProductPrice',
+        query: p
       })
     },
 
@@ -639,6 +650,7 @@ export default {
                 this.$router.replace({ path: '/product/product-list'})
               }
             this.getList();
+            this.lineNum = 0
           });
           return;
         }
@@ -647,6 +659,7 @@ export default {
           this.$modal.msgSuccess(this.$t("新增成功"));
           this.open = false;
           this.getList();
+          this.lineNum = 0
         });
       });
     },

src/views/ecw/productPrice/index.vue

@@ -542,7 +542,28 @@ export default {
     }
     this.handleQuery()
      */
-    this.getList()
+    if(this.$route.query.product_type){
+      this.$set(this.queryParams, 'typeId', +this.$route.query.product_type);
+    }
+    if(this.$route.query.transportType){
+      this.$set(this.queryParams, 'transportType', +this.$route.query.transportType);
+    }
+    // 指定产品获取产品信息
+    if(this.$route.query.product_id){
+      this.$set(this.queryParams, 'productId', +this.$route.query.product_id);
+      getProduct(this.$route.query.product_id).then(res => {
+        this.product = res.data
+      })
+
+    }else {
+      if (this.transportType) {
+        // 如果指定了单个的运输方式则赋值
+        if (this.transportType.split('_').length == 1) {
+          this.$set(this.queryParams, 'transportType', +this.transportType)
+        }
+      }
+      this.getAttrList();
+    }
   },
   watch:{
     '$route.query.product_id'(){
@@ -560,6 +581,9 @@ export default {
             pageNo: 1,
             pageSize: 10,
             productId: this.$route.query.product_id,
+            typeId: this.$route.query.product_type,
+            transportType:this.$route.query.transportType
+
           }
         }
         getProduct(this.$route.query.product_id).then(res => {
@@ -574,6 +598,9 @@ export default {
     if(this.$route.query.product_type){
       this.$set(this.queryParams, 'typeId', +this.$route.query.product_type);
     }
+    if(this.$route.query.transportType){
+      this.$set(this.queryParams, 'transportType', +this.$route.query.transportType);
+    }
     // 指定产品获取产品信息
     if(this.$route.query.product_id){
       this.$set(this.queryParams, 'productId', +this.$route.query.product_id);
@@ -687,10 +714,12 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      console.log(this.queryParams,'this.queryParams')
       // 处理查询参数
       let params = {...this.queryParams};
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
+      console.log(params,'params')
       getProductPricePage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;