订单详情优化

src/views/ecw/order/detail.vue

@@ -7,8 +7,7 @@
         <template v-else-if="order.containerNumber"> - {{order.containerNumber}}</template>
       </div>
       <el-row :gutter="24">
-        <el-col :span="12" v-if="order.consignorVO" style="position: relative;">
-           <span style="color:#409EFF;position: absolute;left:160px;top:0;font-size:16px" @click="consigneeChange">{{consigneeText}}</span>
+        <el-col :span="12" v-if="order.consignorVO">
           <el-descriptions class="margin-top" border :title="$t('发货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('中文名称')">{{order.consignorVO.name}}</el-descriptions-item>
              <!-- v1.7新增 -->
@@ -32,7 +31,8 @@
               </el-descriptions-item>
             </el-descriptions>
         </el-col>
-        <el-col :span="12" v-if="order.consigneeVO">
+        <el-col :span="12" v-if="order.consigneeVO" style="position: relative;">
+          <span style="color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;" @click="consigneeChange">{{consigneeText}}</span>
           <el-descriptions class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('中文名称')">{{order.consigneeVO.name}}</el-descriptions-item>
              <!-- v1.7新增 -->
@@ -64,7 +64,7 @@
       </el-row>
     </el-card>
     <el-card class="card">
-      <el-descriptions border :title="$t('物流信息')" :column="4">
+      <el-descriptions border :title="$t('物流信息')" :column="4" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
         <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
@@ -76,7 +76,7 @@
     </el-card>
 
     <el-card class="card">
-      <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2">
+      <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('是否控货')">
@@ -107,46 +107,42 @@
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
         </el-descriptions-item>
       </el-descriptions>
-      <el-collapse v-model="activeNames" @change="handleChange" >
-        <el-collapse-item  :title="showText" name="1">
-          <el-descriptions class="mr-10" border :column="2">
-            <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 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>
-          </el-collapse-item>
-        </el-collapse>
+          </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>
 
     </el-card>
     <el-card class="card">
@@ -467,7 +463,7 @@ export default {
       activeNames: [],//显示隐藏订单基本信息
       showText:this.$t('显示更多'),
       showMore:false,
-      consigneeText:this.$t('展示'),
+      consigneeText:this.$t('更多'),
     }
   },
   computed:{
@@ -552,7 +548,7 @@ export default {
     //订单信息显示更多
     consigneeChange(){
       this.showMore = !this.showMore;
-      this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('展示')
+      this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多')
     },
     // 显示费用详情
     showFeeDetail(row, type){