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

src/views/ecw/order/detail.vue

@@ -9,9 +9,15 @@
       <el-row :gutter="24">
         <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>
+            <el-descriptions-item :label="$t('中文名称')">
+              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consignorVO.customerId}`">{{order.consignorVO.name}}</component>
+            </el-descriptions-item>
              <!-- v1.7新增 -->
-             <el-descriptions-item :label="$t('英文名称')">{{order.consignorVO.nameEn}}</el-descriptions-item>
+             <el-descriptions-item :label="$t('英文名称')">
+							 <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consignorVO.customerId}`">
+                {{order.consignorVO.nameEn}}
+               </component>
+             </el-descriptions-item>
             <el-descriptions-item :label="$t('电话')">
               +{{order.consignorVO.countryCode}} {{order.consignorVO.phone}}
             </el-descriptions-item>
@@ -34,9 +40,13 @@
         <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>
+            <el-descriptions-item :label="$t('中文名称')">
+              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consigneeVO.customerId}`">{{order.consigneeVO.name}}</component>
+            </el-descriptions-item>
              <!-- v1.7新增 -->
-            <el-descriptions-item :label="$t('英文名称')">{{order.consigneeVO.nameEn}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('英文名称')">
+              <component :is="hasCustomerDetailPermi ? 'router-link' : 'span'" :to="`/customer/query/${order.consigneeVO.customerId}`">{{order.consigneeVO.nameEn}}</component>
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('电话')">
               +{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
             </el-descriptions-item>
@@ -197,6 +207,17 @@
                 {{row.warehouseInInfoVO ? row.warehouseInInfoVO.quantityAll : row.quantity}}
               </template>
             </el-table-column>
+            <el-table-column prop="weight" :label="$t('收费重量') + '(kg)'"  width="100px">
+              <template slot-scope="{row}">
+                {{row.chargeWeight}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="volume" :label="$t('收费方数') + '(m³)'"  width="100px">
+              <template slot-scope="{row}">
+                {{row.chargeVolume}}
+              </template>
+            </el-table-column>
+
             <el-table-column prop="" :label="$t('费用类型')">
               <template slot-scope="{row}">
                 <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.isPayAdvance" />
@@ -315,6 +336,11 @@
                 {{row.totalAmount}}{{currencyMap[row.currencyId]}}
               </template>
             </el-table-column>
+            <el-table-column :label="$t('核销比例')" prop="totalAmount">
+              <template slot-scope="{row}">
+                {{row.writeOffProportion || 0}}
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <!-- 这个地方v-hasPermi不生效，所以换checkPermi函数检查 -->
@@ -548,6 +574,10 @@ export default {
         return JSON.parse(this.order.departureVO.departure)
       }
       return {}
+    },
+    // 判断用户是否有查看客户详情的权限
+    hasCustomerDetailPermi(){
+      return checkPermi(['ecw:customer:index-query'])
     }
   },
   watch:{

src/views/ecw/order/success.vue

@@ -24,7 +24,7 @@
                         <template v-if="index < order.orderItemVOList.length - 1">{{ $t('、') }}</template>
                     </span>
                 </div>
-                <div class="line">{{$t('总件数')}}：{{order.sumNum}}</div>
+                <div class="line">{{$t('总件数')}}：{{order.costVO.totalNum}}</div>
           </div>
         </div>
         <div class="w-800" style="margin: auto">