Merge branch 'feature/order_edit' into release

src/views/jiedao/profile/delivery.vue

@@ -876,7 +876,7 @@
             </el-form-item>
           </el-descriptions-item>
 
-          <el-descriptions-item :label="$t('外部仓')" :span="2">
+          <el-descriptions-item :label="$t('外部仓库')" :span="2">
             <el-form-item prop="isExternalWarehouse">
               <el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
             </el-form-item>
@@ -1651,7 +1651,8 @@ export default {
         type: [],
         orderItemVOList: [],
         externalWarehouseDtoList:[],
-        displayBillLadingPrice: true
+        displayBillLadingPrice: true,
+        lineId: ''
       },
       // 总条数
       total: 0,

src/views/jiedao/profile/orderdetail.vue

@@ -160,7 +160,7 @@
           {{order.displayBillLadingPrice ? $t('是') : $t('否')}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('仓库')">
-          {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
+          {{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
           <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
             <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
               {{$t('装柜时间')}}： {{item.estLoadingTime}}