新建订单-空运

src/views/ecw/order/edit.vue

@@ -115,9 +115,31 @@
                     <el-input :value="selectedRouter ? $l(selectedRouter, 'startTitle') + ' > ' + $l(selectedRouter, 'destTitle') : ''" disabled :placeholder="$t('请在右侧选择线路')"></el-input>
                 </el-form-item>
                 <select size="5" v-model="form.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px" :disabled2="inWarehouse">
-                    <option v-for="item in routerList" :value="item.id" :key="item.id">{{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}</option>
+                    <option v-for="item in routerList" :value="item.id" :key="item.id">
+                      {{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}
+                      (<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportType"></dict-tag>)
+                    </option>
                 </select>
             </div>
+            <!--目的港清关：选择专线空运才显示，默认选中我司
+            我司选中后，按钮下方显示“多票”和“单票”的操作，默认选中多票。
+            客户选中后，按钮下方显示“单票”的操作，默认选中，无需点击-->
+            <div class="form-section" v-if="form.transportId == 3">
+              <el-form-item :label="$t('目的港清关')">
+                <el-radio-group v-model="form.portDestCustomsClear">
+                  <el-radio :label="1">{{$t('我司')}}</el-radio>
+                  <el-radio :label="2">{{$t('客户')}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div class="form-section" v-if="form.transportId == 3">
+              <el-form-item :label="$t('发货方式')">
+                <el-radio-group v-model="form.deliveryWay">
+                  <el-radio :label="1" v-if="form.portDestCustomsClear == 1">{{$t('多票')}}</el-radio>
+                  <el-radio :label="2">{{$t('单票')}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </div>
         </el-card>
         <el-card  class="mt-10">
             <div slot="header" class="card-title">
@@ -443,7 +465,7 @@
                     <dict-selector v-model="form.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable :disabled="false" />
                 </el-form-item>
                 <el-form-item :label="$t('清关证书备注')" >
-                    <el-input v-model="form.remarks"  :disabled="false"></el-input>
+                    <el-input v-model="form.customsClearCertRemarks"  :disabled="false"></el-input>
                 </el-form-item>
             </div>
             <div v-if="[3,4].indexOf(+form.transportId) > -1">
@@ -819,6 +841,11 @@ export default {
             this.$set(this.form, 'channelId', null)
         }
 
+        // 如果是专线空运默认目的港清关选择我司
+        if(transportId == 3){
+          this.$set(this.form, 'portDestCustomsClear', 1)
+        }
+
         this.getOpenedRouterList()
     },
     'form.channelId'(){
@@ -831,6 +858,7 @@ export default {
         }
         this.$set(this.form, 'departureId', router.startCityId)
         this.$set(this.form, 'objectiveId', router.destCityId)
+        this.$set(this.form, 'transportId', router.transportType)
 
         this.calculationPrice()
     },
@@ -862,6 +890,17 @@ export default {
             this.$set(this.form, 'drawee', isCargoControl ? 2 : 2)
         }
     },
+    // 目的港清关,1我司，2客户
+    'form.portDestCustomsClear'(portDestCustomsClear){
+      // 我司默认多票
+      if(portDestCustomsClear == 1){
+        this.$set(this.form, 'deliveryWay', 1)
+      }
+      // 客户默认单票
+      if(portDestCustomsClear == 2){
+        this.$set(this.form, 'deliveryWay', 2)
+      }
+    },
     /* 'form.orderItemVOList'(){
         console.log('form.orderItemVOList', this.form.orderItemVOList.length, this.form.orderItemVOList)
     }, */

src/views/ecw/order/success.vue

@@ -8,6 +8,7 @@
                 <div class="title">{{$t('新增订单生成成功')}}</div>
                 <div class="line">{{$t('订单号')}}：{{order.orderNo}}</div>
                 <div class="line">{{$t('运输方式')}}：<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div>
+                <div class="line" v-if="order.channelName">{{$t('出货渠道')}}：{{order.channelName}}</div>
                 <div class="line">{{$t('路线')}}：{{$l(order.logisticsInfoDto, 'startTitle')}} >> {{$l(order.logisticsInfoDto, 'destTitle')}}</div>
                 <div class="line">{{$t('商品列表')}}：
                     <span v-for="(item, index) in order.orderItemVOList" :key="index">