md

src/views/oms/TransProduct/index.vue

@@ -2,10 +2,10 @@
   <XdPageContainer class="app-container">
     <SearchForm  slot="pageHeader"   :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item :label="$t('国家')" prop="country">
-            <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
+            <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" ></CountryPicker>
           </el-form-item>
           <el-form-item :label="$t('线路')" prop="transLineCode">
-            <TransLinePicker :placeholder="$t('线路')" v-model="queryParams.transLineCode" :countryCode="queryParams.country" @onChange="handleQuery"></TransLinePicker>
+            <TransLinePicker :placeholder="$t('线路')" v-model="queryParams.transLineCode" :countryCode="queryParams.country" ></TransLinePicker>
           </el-form-item>
           <el-form-item label="时效" prop="agingDesc">
             <el-input
@@ -15,6 +15,12 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="启用状态" prop="status">
+            <el-select v-model="queryParams.status"  filterable clearable placeholder="启用状态" >
+              <el-option key="0" label="停用" :value="0" />
+              <el-option key="1" label="启用" :value="1" />
+            </el-select>
+          </el-form-item>
         </SearchForm>
 
         <XdTable
@@ -68,6 +74,12 @@
       </el-table-column>
       <!-- <el-table-column label="英文名称" align="center" prop="prodNameEn" min-width="100" /> -->
       <el-table-column label="时效描述" align="center" prop="agingDesc" width="100" />
+      <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
+              <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
+          </template>
+      </el-table-column>
       <el-table-column label="" align="left" prop="op" min-width="150" >
 
       </el-table-column>
@@ -117,6 +129,8 @@ export default {
       countryIdsOptions:[],
       translineIdsOptions:[],
       translineInnerIdsOptions:[],
+
+      selectList: [],
       countryName:null,
       // 弹出层标题
       title: "",
@@ -136,10 +150,7 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 备注时间范围
+
-      daterangeCreateTime: [],
-      // 备注时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -197,15 +208,33 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.selectList=selection;
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
     handleOrderRecord(row) {
-      //  this.id=row.id;
+      if(this.selectList&&this.selectList.length>0){
-      //  this.titleView="查看";
+          let item0=this.selectList[0];
-      //  this.openView=true;
+          if(item0.status==1){
-      this.router.push({ path: '/oms/emisTransProduct/viewDetail', query: { id: row.id }})
+            let postForm={
+              transLine:  item0.transLineCode,
+              productType: item0.prodCode,
+              reciever: {
+                country: item0.country,
+              }
+            }
+
+            this.$router.push({ path: '/orderMgnt/OrderRecord',
+            query: {
+              action:"preOrderByProd",
+              routeParams: JSON.stringify(postForm)
+            }
+            })
+          }else{
+            this.$modal.msgError("此产品已暂停，请选择其他产品类型");
+          }
+      }
     },
 
     handleFormChanged(){

src/views/oms/emisWaybill/OrderRecord.vue

@@ -902,13 +902,37 @@ data() {
 },
 computed: {
 },
- watch: {
+watch: {
+  "$route": {
+        handler (newValue, oldValue) {
+          // 选择产品后报价
+          if(this.$route.query.action=="preOrderByProd"){
+            this.reset();
+            let routeParams=this.$route.query.routeParams;
+            let postForm=JSON.parse(routeParams);
+
+            this.form.transLine=postForm.transLine;
+            this.form.billWeight=postForm.billWeight;
+            this.form.totalVolume=postForm.totalVolume;
+            this.form.productType=postForm.productType;
+            this.form.reciever.country=postForm.reciever.country;
+            this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
+
+          }
+        },
+        deep: true
+  },
 },
 
 created() {
+
+  if(this.$route.query.action=="copyOrder"){
     this.action=this.$route.query.action;
     this.billCode=this.$route.query.billCode;
     this.initData();
+  }else{
+    this.initData();
+  }
 },
 mounted() {
 
@@ -938,19 +962,6 @@ methods: {
             this.billCode=null;
             this.form.billCode=null;
           }
-
-          // if(this.form.lockFlag=="T"){
-          //   this.$confirm(this.form.lockReason, '提示', {
-          //         confirmButtonText: '确认',
-          //         cancelButtonText: '返回',
-          //         type: 'warning'
-          //       }).then(() => {
-
-          //       }).catch(() => {
-
-          //   })
-          // }
-
         });
       }else{
          this.form.customsEclaration='1';

src/views/oms/emisWaybill/waybillPreCalcFee.vue

@@ -34,7 +34,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="线路" prop="transLine">
-              <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country"></TransLinePicker>
+              <TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country" ></TransLinePicker>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -239,7 +239,7 @@ export default {
     goToOrderRecord(){
       this.$router.push({ path: '/orderMgnt/OrderRecord',
        query: {
-        action:"preOrder",
+        action:"preOrderByProd",
         routeParams: JSON.stringify(this.form)
        }
       })