订单详情重构暂存

src/views/ecw/order/detail.vue

@@ -21,10 +21,6 @@
             <el-descriptions-item :label="$t('电话')">
               +{{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('付款人')">
-              <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">{{ $t('自定义') }}</el-link>
-              <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
-            </el-descriptions-item>
           </el-descriptions>
           <el-descriptions border :class="showMore?'showInfo':'hiddenInfo'" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
               <el-descriptions-item :label="$t('邮箱')">{{order.consignorVO.email}}</el-descriptions-item>
@@ -74,7 +70,7 @@
       </el-row>
     </el-card>
     <el-card class="card">
-      <el-descriptions border :title="$t('物流信息')" :column="4" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+      <el-descriptions border :title="$t('运输')" :column="5" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('始发仓')">{{$l(order.initialLogisticsInfoDto, 'startTitle')}}</el-descriptions-item>
         <el-descriptions-item :label="$t('目的仓')">{{$l(order.initialLogisticsInfoDto, 'destTitle')}}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
@@ -82,16 +78,20 @@
           <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('出货渠道')" >{{order.channelName}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('服务')" >
+          <el-tag v-if="order.type.indexOf('1') > -1">
+            {{ $t('集运') }}
+          </el-tag>
+          <el-tag v-if="order.type.indexOf('2') > -1">
+            {{ $t('海外仓') }}
+          </el-tag>
+        </el-descriptions-item>
       </el-descriptions>
     </el-card>
 
     <el-card class="card">
-      <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
+      <el-descriptions class="mr-10" border :title="$t('基础')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{order.deliveryDate}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('是否控货')">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
-        </el-descriptions-item>
         <el-descriptions-item :label="$t('填单信息')">
           {{order.costVO.totalNum}}{{$t('箱')}}
           {{order.costVO.totalWeight}}Kg
@@ -110,70 +110,46 @@
           {{order.wvolume}}m³
           {{order.sumQuantity}}{{$t('个')}}
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('入仓类型')">
-          <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
+        <el-descriptions-item :label="$t('付款人')" v-if="showMore">
+          <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">{{ $t('自定义') }}</el-link>
+          <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
         </el-descriptions-item>
         <el-descriptions-item :label="$t('单证报关')">
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('目的港清关')" v-if="isAir">
+          {{['',  $t('我司承接'), $t('客户自清')][order.portDestCustomsClear] || ''}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('发货方式')" v-if="isAir">
+          {{['',  $t('多票'), $t('单票')][order.deliveryWay] || ''}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('是否控货')">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
+        </el-descriptions-item>
         <el-descriptions-item :label="$t('关联报价单')">
           <router-link v-if="offerData" :to="{path: '/offer/detail',query: {offerId: offerData.offerId}}" class="link-type">
             <span>{{ offerData.number }}</span>
           </router-link>
           <span v-else>/</span>
         </el-descriptions-item>
-      </el-descriptions>
-      <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
-        <el-descriptions-item :label="$t('出单方式')">
-            <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('代收货款')">
-            <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
-            <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
-          </el-descriptions-item>
-          <el-descriptions-item :label="$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}}
-                {{$t('装柜地址')}}：{{item.loadingAddress}}
-              </div>
-            </template>
-
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('订单类型')">
-            <el-tag v-if="order.type.indexOf('1') > -1">
-              {{ $t('集运服务') }}
-            </el-tag>
-            <el-tag v-if="order.type.indexOf('2') > -1">
-              {{ $t('海外仓') }}
-            </el-tag>
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('快递单号')">
-            {{order.number}}
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('创建人')">
-            {{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('创建时间')">
-            {{order.createTime|parseTime}}
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('客户经理')">
-            {{order.salesmanName}}
-          </el-descriptions-item>
-          <el-descriptions-item :label="$t('提单是否显示价格')">
-            {{order.displayBillLadingPrice ? $t('是') : $t('否')}}
-          </el-descriptions-item>
-        </el-descriptions>
-
-    </el-card>
-    <el-card class="card" v-if="[3,4].indexOf(+order.transportId) > -1">
-      <el-descriptions class="mr-10" border :title="$t('空运专线')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
-        <el-descriptions-item :label="$t('是否双清')">
-          <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
+        <el-descriptions-item :label="$t('特殊要求')">
+          <template v-if="order.packageType">
+            <dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" class="mr-10" :key="packageType" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
+          </template>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('航空公司')">
-          {{ order.companyName||'' }}
+        <el-descriptions-item :label="$t('特殊要求备注')">
+          {{order.packageRemarks}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('到仓数据')">
+          // TODO
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('提货数据')">
+          // TODO
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{order.deliveryDate}}</el-descriptions-item>
+
+        <el-descriptions-item :label="$t('入仓类型')">
+          <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
         </el-descriptions-item>
         <el-descriptions-item :label="$t('清关证书')">
           {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
@@ -187,22 +163,49 @@
         <el-descriptions-item :label="$t('单票立刻转运')">
           {{order.isSingleTicketTransport? this.$t('是'):this.$t('否')}}
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('特殊要求')">
-          <template v-if="order.packageType">
-            <dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" class="mr-10" :key="packageType" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
+        <el-descriptions-item :label="$t('代收货款')">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
+          <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('提单是否显示价格')">
+          {{order.displayBillLadingPrice ? $t('是') : $t('否')}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$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}}
+              {{$t('装柜地址')}}：{{item.loadingAddress}}
+            </div>
           </template>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('特殊要求备注')">
-          {{order.packageRemarks}}
+        <el-descriptions-item :label="$t('快递单号')">
+          {{order.number}}
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('目的港清关')">
-          {{['',  $t('我司承接'), $t('客户自清')][order.portDestCustomsClear] || ''}}
+        <el-descriptions-item :label="$t('创建人')">
+          {{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('发货方式')">
-          {{['',  $t('多票'), $t('单票')][order.deliveryWay] || ''}}
+        <el-descriptions-item :label="$t('创建时间')">
+          {{order.createTime|parseTime}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('客户经理')">
+          {{order.salesmanName}}
+        </el-descriptions-item>
+        <!--
+        新的原型中没有的字段，放在这里备用
+        <el-descriptions-item :label="$t('出单方式')">
+          <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('是否双清')">
+          <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('航空公司')">
+          {{ order.companyName||'' }}
         </el-descriptions-item>
+        -->
       </el-descriptions>
     </el-card>
+
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">
@@ -238,9 +241,9 @@
 
             <el-table-column prop="worth" :label="$t('货值')"  width="120px"/>
 
-            <el-table-column prop="warehouseType" :label="$t('入仓类型')"  width="120px"/>  
+            <el-table-column prop="warehouseType" :label="$t('入仓类型')"  width="120px"/>
 
-            <el-table-column prop="specificationType" :label="$t('入仓包装单位')"  width="120px"/>  
+            <el-table-column prop="specificationType" :label="$t('入仓包装单位')"  width="120px"/>
 
 
             <el-table-column prop="" :label="$t('材质')">
@@ -280,7 +283,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="warehouseRecordRemark" :label="$t('入仓记录备注')"  width="120px"/> 
+            <el-table-column prop="warehouseRecordRemark" :label="$t('入仓记录备注')"  width="120px"/>
 
             <el-table-column prop="" :label="$t('用途')">
               <template slot-scope="{row}">
@@ -294,12 +297,12 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="charging" :label="$t('收费模式')"  width="120px"> 
+            <el-table-column prop="charging" :label="$t('收费模式')"  width="120px">
               <template slot-scope="{row}">
                 <template v-if="row.charging ==0">{{ $t('运费/清关费') }}</template>
                 <template v-if="row.charging ==1">{{ $t('全包价') }}</template>
               </template>
-              
+
             </el-table-column>
 
 
@@ -798,6 +801,9 @@ export default {
         })
         return ids.map(id => attrMap[id]).join(',')
       }
+    },
+    isAir(){
+      return [3,4].indexOf(+this.order?.transportId) > -1
     }
   },
   watch:{