修复几个bug

src/views/ecw/order/cargoControl.vue

@@ -35,12 +35,12 @@
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('发货人')" prop="consignorId">
-        <el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('发货人')" prop="consignorKey">
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('收货人')" prop="consigneeId">
-        <el-input v-model="queryParams.consigneeId" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('收货人')" prop="consigneeKey">
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsType">

src/views/ecw/order/cargoControlDetail.vue

@@ -42,7 +42,11 @@
                 <template slot-scope="scope">{{scope.$index + 1}}</template>
             </el-table-column>
             <el-table-column :label="$t('收货人')" prop="consigneeName" />
-            <el-table-column :label="$t('收货人电话')" prop="consigneePhone" />
+            <el-table-column :label="$t('收货人电话')" prop="consigneePhone">
+                <template slot-scope="{row}">
+                    +{{row.consigneeCountryCode}} {{row.consigneePhone}}
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('控货箱数')" prop="controlNum"></el-table-column>
             <el-table-column :label="$t('放货箱数')" prop="pickNum"></el-table-column>
             <el-table-column :label="$t('体积') + '(m³)'" prop="pickVolume"></el-table-column>

src/views/ecw/productPrice/edit.vue

@@ -700,7 +700,8 @@ export default {
       this.$set(this.form, 'clearancePriceUnit', priceUnit)
       this.$set(this.form, 'allPriceUnit', priceUnit)
     },
-    submitForm() {
+    // force 为是否强制提交，在价格过期的时候需要确认后强制提交
+    submitForm(force = false) {
       this.$refs["form"].validate(valid => {
         if (!valid) {
           return;
@@ -747,6 +748,20 @@ export default {
           }
         }
 
+        // 设置了有效期，且已过期则给提示
+        if(this.form.validateEndDate && force !== true){
+          let validateEndDate = new Date(this.form.validateEndDate)
+          if(validateEndDate.getTime() < Date.now()){
+            return this.$confirm('您设置的线路价格已过期，确定提交吗?', '提示', {
+              confirmButtonText: '确认提交',
+              cancelButtonText: '取消提交',
+              type: 'warning'
+            }).then(res => {
+              this.submitForm(true)
+            })
+          }
+        }
+
         // 修改单条路线
         if (this.$route.query.action == 'update') {
           this.loading = true