订单相关-到仓详情页面数据完善

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

@@ -5,6 +5,10 @@ import { parseTime } from '@/utils/ruoyi'
 export default {
   name: 'CheckDetailProd',
   props: {
+    unloadTime: {
+      type: String,
+      required: false
+    },
     list: {
       type: Array,
       required: true
@@ -47,6 +51,9 @@ export default {
         }
       };
     },
+    getUnloadTime() {
+      return this.unloadTime;
+    },
     // 显示特性
     showAttrText(){
       return ids => {
@@ -62,6 +69,14 @@ export default {
   },
   methods:{
 
+    // 处理异常
+    handleError(row) {
+      this.$emit("closeStart", "close");
+      this.$router.push({
+        path: `/order/pending?id=${row.orderId}`,
+      });
+    },
+
     // 获取储位名称
     getLocationName(locationArr){
       if(!locationArr || !locationArr.length) return ''
@@ -114,10 +129,12 @@ export default {
           warehouseInData.volume = warehouseInData.volume.plus(item.warehouseInInfoVO.volume || 0)
           warehouseInData.quantity = warehouseInData.quantity.plus(item.warehouseInInfoVO.quantityAll || 0)
         }
-        toWarehouseData.checkNum = toWarehouseData.checkNum.plus(item.checkNum || 0)
-        toWarehouseData.checkWeight = toWarehouseData.checkWeight.plus(item.checkWeight || 0)
-        toWarehouseData.checkVolume = toWarehouseData.checkVolume.plus(item.checkVolume || 0)
-        toWarehouseData.checkQuantity = toWarehouseData.checkQuantity.plus(item.checkQuantity || 0)
+        if (item.warehouseCheckInfoVO){
+          toWarehouseData.checkNum = toWarehouseData.checkNum.plus(item.warehouseCheckInfoVO.cartonsNum || 0)
+          toWarehouseData.checkWeight = toWarehouseData.checkWeight.plus(item.warehouseCheckInfoVO.weight || 0)
+          toWarehouseData.checkVolume = toWarehouseData.checkVolume.plus(item.warehouseCheckInfoVO.volume || 0)
+          toWarehouseData.checkQuantity = toWarehouseData.checkQuantity.plus(item.warehouseCheckInfoVO.quantity || 0)
+        }
         chargeData.weight = chargeData.weight.plus(item.chargeWeight || 0)
         chargeData.volume = chargeData.volume.plus(item.chargeVolume || 0)
       })
@@ -144,10 +161,10 @@ export default {
       <el-table-column :label="$t('序号')" width="90px">
         <template slot-scope="scope">{{scope.$index + 1}}</template>
       </el-table-column>
-      <el-table-column :label="$t('品名')">
+      <el-table-column :label="$t('品名')" width="180px">
           <template slot-scope="{row}">
-            <span>{{ getProdTypeName(row.prodType) }}</span>
-            <span>{{row.prodTitleZh}}/{{row.prodTitleEn}}</span>
+            <div>{{ getProdTypeName(row.prodType) }}</div>
+            <div>{{row.prodTitleZh}}/{{row.prodTitleEn}}</div>
           </template>
       </el-table-column>
       <!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->
@@ -157,12 +174,12 @@ export default {
           <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('特性')"  width="90px">
+      <el-table-column :label="$t('特性')"  width="120px">
         <template slot-scope="{row}">
           {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
         </template>
       </el-table-column>
-      <el-table-column  :label="$t('装柜/出货信息')"  width="90px">
+      <el-table-column  :label="$t('装柜/出货信息')"  width="150px">
         <template slot-scope="{row}">
           <div v-if="row.warehouseInInfoVO">
             {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
@@ -172,7 +189,7 @@ export default {
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="sumNum" :label="$t('到仓信息')"  width="90px">
+      <el-table-column prop="sumNum" :label="$t('到仓信息')"  width="150px">
         <template slot-scope="{row}">
           <div v-if="row.warehouseCheckInfoVO">
             {{row.warehouseCheckInfoVO.cartonsNum}}{{$t('箱')}}
@@ -182,23 +199,15 @@ export default {
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('到仓时间')">
+      <el-table-column :label="$t('到仓时间')" width="150px">
         <template slot-scope="{row}">
-          {{row.unloadTime|parseTime}}
+          {{parseTime(row.warehouseCheckInfoVO.checkTime)}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('异常类型')" >
         <template slot-scope="{row}">
-          <div v-for="(exception, i) in row.itemException" :key="i" :src="row.itemException">
-            <router-link
-                :to="{
-              path: '/exception/detail',
-              query: { id: exception.id }
-            }"
-                class="link-type"
-            >
-              <span>{{exception.msg}}</span>
-            </router-link>
+          <div v-for="(itemException, i) in row.itemExceptionList" :key="i" :src="row.itemExceptionList" >
+            <el-button type="text" size="small" @click="handleError(row)">{{itemException.exceptionType}}-{{itemException.result}}</el-button>
           </div>
         </template>
       </el-table-column>

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

@@ -250,8 +250,8 @@ export default {
       </el-table-column>
       <el-table-column prop="prodTitleZh" :label="$t('品名')">
         <template slot-scope="{row}">
-          <span>{{ getProdTypeName(row.prodType) }}</span>
-          <span>{{row.prodTitleZh}}/{{row.prodTitleEn}}</span>
+          <div>{{ getProdTypeName(row.prodType) }}</div>
+          <div>{{row.prodTitleZh}}/{{row.prodTitleEn}}</div>
         </template>
       </el-table-column>
       <!--<el-table-column prop="prodTitleEn" :label="$t('品名')" />-->

src/views/ecw/order/detail.vue

@@ -332,13 +332,14 @@
                        :currency-map="currencyMap"
                        :unit-map="unitMap"
                        :transport-id="order.transportId"
+                       :unload-time="order.unloadTime|parseTime"
           ></check-detail-prod>
         </el-tab-pane>
         <!-- 这个地方v-hasPermi不生效，所以换checkPermi函数检查 -->
         <el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
           <el-table :data="logs" v-loading="logsLoading">
             <el-table-column :label="$t('时间')" width="150">
-              <template slot-scope="{row}">{{ parseTime(row.createTime) }}</template>
+              <template slot-scope="{row}">{{ row.createTime|parseTime}}</template>
             </el-table-column>
             <el-table-column :label="$t('操作人')" prop="creatorName" width="150"> </el-table-column>
             <el-table-column :label="$t('操作人类型')" width="100">
@@ -410,7 +411,7 @@
 </template>
 
 <script>
-import {getOrder, operateLogPage, getOrderItemDeleted, getOrderCheckInfo} from '@/api/ecw/order'
+import {getOrder, operateLogPage, getOrderItemDeleted} from '@/api/ecw/order'
 import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -578,7 +579,6 @@ export default {
       this.getOrder();
       this.getOfferNumber()
       this.getOrderItemDeleted()
-      this.getOrderCheckInfo()
       this.getProdTypeList();
     }