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

src/i18n/languages/en_US.json

@@ -2641,7 +2641,7 @@
     "上级区域": "Superior Area",
     "选择上级区域": "Select superior area",
     "请输入简称": "Please enter the abbreviation",
-    "国家城市代码": "Country City Code",
+    "国家代码-城市代码": "Country City Code",
     "显示顺序": "Display order",
     "请输入显示顺序": "Please enter the display order",
     "部门状态": "Department Status",

src/views/ecw/order/prepayDeal.vue

@@ -41,7 +41,7 @@
           </el-form-item>
         </el-row>
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
-       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
+       <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
         <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
           <el-row>
@@ -174,7 +174,7 @@
       </el-table>
 
       <!-- 单证异常，发货人异常，其他异常的表格 -->
-      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
+      <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
         <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
             <template slot-scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -202,7 +202,7 @@
         <!-- v2.0  入仓特性异常 -->
         <el-table-column :label="$t('入仓特性')" prop="num">
         <template slot-scope="scope">
-              {{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
+              {{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('方数')" prop="volume">
@@ -548,7 +548,7 @@
                 <!-- v2.0  入仓特性异常 -->
                 <el-table-column :label="$t('入仓特性')" align="center" prop="num" min-width="60">
                 <template slot-scope="scope">
-                      {{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
+                       {{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('方数')" align="center" prop="volume" min-width="30">

src/views/ecw/region/index.vue

@@ -102,7 +102,7 @@
             <el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
           </el-form-item>
-          <el-form-item :label="$t('国家城市代码')" prop="labelCode" v-if="form.type == '1' || form.type == '3' ">
+          <el-form-item :label="$t('国家代码-城市代码')" prop="labelCode" v-if="form.type == '1' || form.type == '3' ">
             <el-input v-model="form.labelCode" placeholder="请输入国家代码-城市代码" />
           </el-form-item>
           <el-form-item :label="$t('显示顺序')" prop="sort">