Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingAir/nodePage/checkout.vue

 <template>
   <div>
-    <el-form ref="airCheckoutForm" :model="airCheckoutObj" :rules="rules" label-width="80px">
+    <el-form ref="airCheckoutForm" :model="airCheckoutObj" :rules="rules" label-width="100px">
+
+      <el-form-item :label="$t('')" prop="deliverType">
+        <el-radio-group v-model="airShipmentObj.deliverType" :disabled="true">
+          <el-radio v-for="item in deliverTypes" :key="item.value" :label="item.value">{{item.label}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <div v-show="airShipmentObj.deliverType === '1'">
+
+          <el-form-item :label="$t('送货时间')" >
+                <el-date-picker type="datetime" :disabled="true" :placeholder="$t('请选择日期')" v-model="airShipmentObj.deliverTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item :label="$t('送货地址')">
+              <el-input v-model="airShipmentObj.deliverAddress" :disabled="true" :placeholder="$t('请输入送货地址')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('车牌')">
+              <el-input v-model="airShipmentObj.licensePlate" :disabled="true" :placeholder="$t('请输入车牌')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('司机')">
+              <el-input v-model="airShipmentObj.driver" :disabled="true" :placeholder="$t('请输入司机')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('司机联系方式')">
+              <el-input v-model="airShipmentObj.driverPhone" :disabled="true" :placeholder="$t('请输入司机联系方式')"></el-input>
+          </el-form-item>
+
+      </div>
+
+      <div v-show="airShipmentObj.deliverType === '2'">
+
+          <el-form-item :label="$t('自提时间')">
+                <el-date-picker type="datetime" :disabled="true" :placeholder="$t('请选择日期')" v-model="airShipmentObj.deliverTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item :label="$t('自提地址')">
+              <el-input v-model="airShipmentObj.deliverAddress" :disabled="true" :placeholder="$t('请输入自提地址')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('车牌')">
+              <el-input v-model="airShipmentObj.licensePlate" :disabled="true" :placeholder="$t('请输入车牌')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('司机')">
+              <el-input v-model="airShipmentObj.driver" :disabled="true" :placeholder="$t('请输入司机')"></el-input>
+          </el-form-item>
+
+          <el-form-item :label="$t('司机联系方式')">
+              <el-input v-model="airShipmentObj.driverPhone" :disabled="true" :placeholder="$t('请输入司机联系方式')"></el-input>
+          </el-form-item>
+
+      </div>
+
       <el-form-item :label="$t('出仓日期')">
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airCheckoutObj.checkoutTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
@@ -39,8 +94,13 @@ export default {
   components: { userSelect, ImageUpload },
   data() {
     return {
-      // 空运出货对象
+      // 空运出仓对象
       airCheckoutObj: {},
+
+      // 空运出货对象
+      airShipmentObj: {},
+      // 送货方式
+      deliverTypes: constantDict.deliverType,
       // 校验
       rules: {
         //deliverType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
@@ -52,6 +112,11 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["checkoutTime"]);
     this.airCheckoutObj = oldData;
+
+    let shipmentdData = { ...this.$attrs.shipmentObj["boxAirShipmentBackVO"] };
+    shipmentdData = formatDateStr(shipmentdData, ["deliverTime"]);
+    shipmentdData = formatNumberString(shipmentdData, ["deliverType"]);
+    this.airShipmentObj = shipmentdData;
   },
   methods: {
     /** 提交 */

src/views/ecw/box/shippingAir/nodePage/shipment.vue

 <template>
   <div>
-    <el-form ref="airShipmentForm" :model="airShipmentObj" :rules="rules" label-width="80px">
+    <el-form ref="airShipmentForm" :model="airShipmentObj" :rules="rules" label-width="100px">
       <el-form-item :label="$t('')" prop="deliverType">
         <el-radio-group v-model="airShipmentObj.deliverType">
           <el-radio v-for="item in deliverTypes" :key="item.value" :label="item.value">{{item.label}}</el-radio>

src/views/ecw/order/detail.vue

@@ -414,26 +414,26 @@
         </el-col>
       </el-row>
 
-      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">优惠详情</div>
+      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">{{$t('优惠详情')}}</div>
       <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
-        <el-table-column label="优惠ID" prop="couponId"></el-table-column>
-        <el-table-column label="优惠名称">
+        <el-table-column :label="$t('优惠ID')" prop="couponId"></el-table-column>
+        <el-table-column :label="$t('优惠名称')">
           <template slot-scope="{row}">
             {{ $l(row, 'title') }}
           </template>
         </el-table-column>
-        <el-table-column label="类型">
+        <el-table-column :label="$t('类型')">
           <template slot-scope="{row}">
             <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" ></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column label="运费优惠">
+        <el-table-column :label="$t('运费优惠')">
           <template slot-scope="{row}">
             {{ row.freightReduceAmount}}
             {{currencyMap[row.freightReduceCurrencyId]}}
           </template>
         </el-table-column>
-        <el-table-column label="清关费优惠">
+        <el-table-column :label="$t('清关费优惠')">
           <template slot-scope="{row}">
             {{ row.clearanceReduceAmount}}
             {{ currencyMap[row.clearanceReduceCurrencyId] }}