Merge branch 'feature/order_edit' into release

src/views/jiedao/profile/delivery.vue

@@ -328,7 +328,7 @@
           </el-descriptions-item>
 
           <!--服务-->
-          <el-descriptions-item :label="$t('服务')"
+          <el-descriptions-item :label="$t('增值服务')"
                                 v-if="selectedRouter && (routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1)">
             <el-checkbox-group v-model="form.type">
               <el-checkbox label="1"
@@ -904,7 +904,7 @@
             </div>
           </el-descriptions-item>
           <!--预计送货日期-->
-          <el-descriptions-item :label="$t('delivery.deliveryDate')">
+          <el-descriptions-item :label="$t('delivery.deliveryDate')" v-if="!form.isExternalWarehouse">
             <span
                 slot="label"
             ><span style="color: red">*</span>{{ $t("delivery.deliveryDate") }}</span>
@@ -923,6 +923,7 @@
               />
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item v-else-if="collectionProxy"><!--占位，防止错乱--></el-descriptions-item>
 
           <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
           <el-descriptions-item
@@ -969,7 +970,7 @@
               />
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item v-else :span="2"><!--占位--></el-descriptions-item>
+          <el-descriptions-item v-else-if="!form.isExternalWarehouse" :span="2"><!--占位--></el-descriptions-item>
           <!--收货方式-->
           <el-descriptions-item :label="$t('delivery.harvestMethod')">
             <span
@@ -1623,6 +1624,7 @@ export default {
       form: {
         destCountryId: null,
         countryCode: '86',
+        objectiveId: '',
         status: 0,
         consigneeName: '',
         consigneePhone: '',
@@ -2497,11 +2499,13 @@ export default {
         if (!valid) {
           return this.$showFormValidateErrors(errors)
         }
-        var validatorArea = await validatorPhone({
-          code: this.form.countryCode,
-          mobile: this.form.consigneePhone
-        })
-        if (!validatorArea.data) return
+        if(this.hasConsignee){
+          var validatorArea = await validatorPhone({
+            code: this.form.countryCode,
+            mobile: this.form.consigneePhone
+          })
+          if (!validatorArea.data) return
+        }
         if (this.form.isCargoControl) {
           var checkKyc = await checkKycStatus({
             controlCargoStatus: this.form.isCargoControl,

src/views/jiedao/profile/orderdetail.vue

@@ -51,16 +51,16 @@
             <el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:150px">{{consigneeVO?(consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.deliveryaddress')" label-style="width:150px">{{ addressName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{consigneeVO?consigneeVO.address:''}}</el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions v-if="showMore" border :column="3" :content-style="{width:'130px'}">
-            <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ consigneeVO.nameEn }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px">
-              {{ consigneeVO.company }}
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px">
-              {{ consigneeVO.companyEn }}
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ consigneeVO.email }}</el-descriptions-item>
+            <template v-if="showMore">
+              <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ consigneeVO.nameEn }}</el-descriptions-item>
+              <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px">
+                {{ consigneeVO.company }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px">
+                {{ consigneeVO.companyEn }}
+              </el-descriptions-item>
+              <el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ consigneeVO.email }}</el-descriptions-item>
+            </template>
           </el-descriptions>
         </el-col>
       </el-row>
@@ -81,7 +81,7 @@
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
             </el-descriptions-item>
             <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'" :label="$t('orderdetail.channel')" :span="1">{{ getChannelNameById(order.channelId) }}</el-descriptions-item>
-            <el-descriptions-item  v-if="order.type" :label="$t('orderdetail.typeName')">{{ typeName }}</el-descriptions-item>
+            <el-descriptions-item  v-if="order.type" :label="$t('服务')">{{ typeName }}</el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>
@@ -211,6 +211,7 @@
               show-summary
               :summary-method="getSummary"
           >
+            <el-table-column :label="$t('序号')" type="index"></el-table-column>
             <el-table-column prop="prodTitle" :label="$t('orderdetail.prodTitle')">
               <template slot-scope="{row}">
                 <template >{{ row.prodTitleZh }}/{{row.prodTitleEn}}</template>
@@ -384,11 +385,11 @@ export default {
     },
     typeName(){
       let typeName = []
-      if(order.type){
-        if(order.type.includes(1)){
+      if(this.order.type){
+        if(this.order.type.includes(1)){
           typeName.push(this.$t('orderdetail.service'))
         }
-        if(order.type.includes(2)){
+        if(this.order.type.includes(2)){
           typeName.push(this.$t('orderdetail.oversears'))
         }
       }
@@ -456,7 +457,7 @@ export default {
         cartonsNum = cartonsNum.plus(item.num || 0)
       })
       return [
-         null, null,
+         null, null, this.$t("合计") + ":",
         `${wCartonsNum}${this.$t('prepayDeal.box')} ${wWeight}Kg ${wVolume}m³ ${wQuantity}${this.$t('price.one')}`,
         null, null,
         worth.toNumber(),