Merge branch 'feature/order_edit' into pre-release

src/views/ecw/order/detail.vue

@@ -12,18 +12,16 @@
             <el-descriptions-item :label="$t('中文名称')">
               <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consignorVO.customerId}`">{{order.consignorVO.name}}</component>
             </el-descriptions-item>
-             <!-- v1.7新增 -->
-             <el-descriptions-item :label="$t('英文名称')">
-							 <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consignorVO.customerId}`">
-                {{order.consignorVO.nameEn}}
-               </component>
-             </el-descriptions-item>
             <el-descriptions-item :label="$t('电话')">
               +{{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions border :class="showMore?'showInfo':'hiddenInfo'" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
-              <el-descriptions-item :label="$t('邮箱')">{{order.consignorVO.email}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('英文名称')">
+              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consignorVO.customerId}`">
+                {{order.consignorVO.nameEn}}
+              </component>
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('公司中文名称')">
               {{order.consignorVO.company}}
             </el-descriptions-item>
@@ -31,17 +29,14 @@
             <el-descriptions-item :label="$t('公司英文名称')">
               {{order.consignorVO.companyEn}}
             </el-descriptions-item>
+            <el-descriptions-item :label="$t('邮箱')">{{order.consignorVO.email}}</el-descriptions-item>
           </el-descriptions>
         </el-col>
-        <el-col :span="12" v-if="order.consigneeVO" style="position: relative;">
+        <el-col :span="12" style="position: relative;">
           <span style="color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;" @click="consigneeChange">{{consigneeText}}</span>
-          <el-descriptions class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+          <el-descriptions  v-if="order.consigneeVO" class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('中文名称')">
               <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consigneeVO.customerId}`">{{order.consigneeVO.name}}</component>
-            </el-descriptions-item>
-             <!-- v1.7新增 -->
-            <el-descriptions-item :label="$t('英文名称')">
-              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consigneeVO.customerId}`">{{order.consigneeVO.nameEn}}</component>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('电话')">
               +{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
@@ -56,8 +51,10 @@
               {{order.consigneeVO.address}}
             </el-descriptions-item>
           </el-descriptions>
-          <el-descriptions border :class="showMore?'showInfo':'hiddenInfo'" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
-             <el-descriptions-item :label="$t('邮箱')">{{order.consigneeVO.email}}</el-descriptions-item>
+          <el-descriptions  v-if="order.consigneeVO && showMore" border :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+            <el-descriptions-item :label="$t('英文名称')">
+              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consigneeVO.customerId}`">{{order.consigneeVO.nameEn}}</component>
+            </el-descriptions-item>
              <el-descriptions-item :label="$t('公司中文名称')">
                {{order.consigneeVO.company}}
              </el-descriptions-item>
@@ -65,6 +62,7 @@
              <el-descriptions-item :label="$t('公司英文名称')">
                {{order.consigneeVO.companyEn}}
              </el-descriptions-item>
+            <el-descriptions-item :label="$t('邮箱')">{{order.consigneeVO.email}}</el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>

src/views/ecw/order/edit.vue

 <template>
   <div class="app-container">
     <!--初始化过程中不渲染页面，利用此特性在新建订单后重新初始化表单(字典选择组件默认值)-->
-    <el-form v-if="!initing" ref="form" :model="form" :rules="rules" label-position="left" inline :disabled="updateChannel">
+    <el-form v-if="!initing"
+             ref="form"
+             :model="form"
+             :rules="rules"
+             label-position="left"
+             inline
+             :disabled="updateChannel"
+             :validate-on-rule-change="false"
+    >
         <el-card v-if="form.applyStatus == 1" class="mb-10">
             <div slot="header" class="card-title">{{$t('以下信息修改审核中')}}</div>
             <el-table :data="form.applyInfoList">
@@ -99,6 +107,7 @@
           </div>
         </el-card>
         <el-card class="mt-10">
+            <div slot="header" class="card-title">{{$t('运输')}}</div>
             <div class="form-section">
                 <el-form-item :label="$t('运输方式')" prop="transportId">
                     <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"