Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao

src/main.js

@@ -123,7 +123,7 @@ Vue.prototype.$showFormValidateErrors = (errors) => {
    let createElement = vm.$createElement
    let fieldList = Object.values(errors)
    Element.Notification({
-         title: this.$t('表单错误'),
+         title: i18n.$t('表单错误'),
          type: 'warning',
          duration: 3000,
          message: createElement('div', fieldList.map(function (errorList) {

src/views/ecw/order/components/DetailProd.vue

@@ -10,7 +10,15 @@ export default {
     attrList: {
       type: Array,
       required: true
-    }
+    },
+    currencyMap: {
+      type: Object,
+      required: true
+    },
+    unitMap:{
+      type: Object,
+      required: true
+    },
   },
   computed:{
     // 显示特性
@@ -27,6 +35,15 @@ export default {
     },
   },
   methods:{
+    // 获取储位名称
+    getLocationName(locationArr){
+      if(!locationArr || !locationArr.length) return ''
+      let arr = []
+      locationArr.forEach(item => {
+        arr.push(`${item.areaName}${item.locationName || ''}`)
+      })
+      return Array.from(new Set(arr)).join(",")
+    },
     // 获取品名汇总数据
     getProdSummary(e){
       console.log("getProdSummart", e)
@@ -52,19 +69,19 @@ export default {
         volume: new Decimal(0),
       }
       this.list?.forEach(item => {
-        worth = worth.plus(item.worth)
-        fillData.num = fillData.num.plus(item.num)
-        fillData.weight = fillData.weight.plus(item.weight)
-        fillData.volume = fillData.volume.plus(item.volume)
-        fillData.quantity = fillData.quantity.plus(item.quantity)
+        worth = worth.plus(item.worth || 0)
+        fillData.num = fillData.num.plus(item.num || 0)
+        fillData.weight = fillData.weight.plus(item.weight || 0)
+        fillData.volume = fillData.volume.plus(item.volume || 0)
+        fillData.quantity = fillData.quantity.plus(item.quantity || 0)
         if(item.warehouseInInfoVO){
-          warehouseInData.num = warehouseInData.num.plus(item.cartonsNum)
-          warehouseInData.weight = warehouseInData.weight.plus(item.weight)
-          warehouseInData.volume = warehouseInData.volume.plus(item.volume)
-          warehouseInData.quantity = warehouseInData.quantity.plus(item.quantityAll)
+          warehouseInData.num = warehouseInData.num.plus(item.warehouseInInfoVO.cartonsNum || 0)
+          warehouseInData.weight = warehouseInData.weight.plus(item.warehouseInInfoVO.weight || 0)
+          warehouseInData.volume = warehouseInData.volume.plus(item.warehouseInInfoVO.volume || 0)
+          warehouseInData.quantity = warehouseInData.quantity.plus(item.warehouseInInfoVO.quantityAll || 0)
         }
-        chargeData.weight = chargeData.weight.plus(item.chargeWeight)
-        chargeData.volume = chargeData.volume.plus(item.chargeVolume)
+        chargeData.weight = chargeData.weight.plus(item.chargeWeight || 0)
+        chargeData.volume = chargeData.volume.plus(item.chargeVolume || 0)
       })
       const summary = Array(19).fill(null)
       summary[3] = this.$t("合计")

src/views/ecw/order/detail.vue

@@ -72,7 +72,11 @@
     <el-card class="card">
       <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('目的仓')">
+            {{$l(order.initialLogisticsInfoDto, 'destCountryTitle')}} -
+            {{$l(order.initialLogisticsInfoDto, 'destCityTitle')}} -
+            {{$l(order.initialLogisticsInfoDto, 'destTitle')}}
+        </el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
         <el-descriptions-item :label="$t('运输方式')" >
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
@@ -215,11 +219,19 @@
     <el-card class="card">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('货物详情')" name="first">
-          <detail-prod :list="order.orderItemVOList" :attr-list="attrList"></detail-prod>
+          <detail-prod :list="order.orderItemVOList"
+                       :attr-list="attrList"
+                       :currency-map="currencyMap"
+                       :unit-map="unitMap"
+          ></detail-prod>
         </el-tab-pane>
         <!--退参品名  退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改-->
         <el-tab-pane :label="$t('退仓/已混箱品名')" name="six">
-          <detail-prod :list="orderItemDeletedData" :attr-list="attrList"></detail-prod>
+          <detail-prod :list="orderItemDeletedData"
+                       :attr-list="attrList"
+                       :currency-map="currencyMap"
+                       :unit-map="unitMap"
+          ></detail-prod>
         </el-tab-pane>
         <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
         <el-tab-pane :label="$t('订单动态')" name="second">
@@ -613,16 +625,7 @@ export default {
     })
   },
   methods: {
-    checkPermi, // 检查权限
-    // 获取储位名称
-    getLocationName(locationArr){
-      if(!locationArr || !locationArr.length) return ''
-      let arr = []
-      locationArr.forEach(item => {
-        arr.push(`${item.areaName}${item.locationName || ''}`)
-      })
-      return Array.from(new Set(arr)).join(",")
-    },
+    checkPermi, // 检查权限,
     //订单信息显示更多
     handleChange(val){
       this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多')