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

src/api/ecw/order.js

@@ -1052,14 +1052,6 @@ export function getOrderItemDeleted(orderId){
   })
 }
 
-//退仓品名列表
-export function getOrderCheckInfo(orderId){
-  return request({
-    url: '/ecw/order/order-check-info/' + orderId,
-    method: 'get',
-  })
-}
-
 // 打包页面订单数据统计
 export function getPackStatistics(orderId){
   return request({

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,25 +161,25 @@ 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('品名')" />-->
       <el-table-column :label="$t('品牌')"  width="90px">
         <template slot-scope="{row}">
-          <template v-if="row.brandName">{{row.brandName}}</template>
+          <template v-if="row.checkBrandName">{{row.checkBrandName}}</template>
           <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,33 +189,25 @@ 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.warehouseInInfoVO">
-            {{row.warehouseInInfoVO.cartonsNum}}{{$t('箱')}}
-            {{row.warehouseInInfoVO.weight}}Kg
-            {{row.warehouseInInfoVO.volume}}m³
-            {{row.warehouseInInfoVO.quantityAll}}{{$t('个')}}
+          <div v-if="row.warehouseCheckInfoVO">
+            {{row.warehouseCheckInfoVO.cartonsNum}}{{$t('箱')}}
+            {{row.warehouseCheckInfoVO.weight}}Kg
+            {{row.warehouseCheckInfoVO.volume}}m³
+            {{row.warehouseCheckInfoVO.quantity}}{{$t('个')}}
           </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

@@ -326,19 +326,20 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane :label="$t('到仓详情')" name="seven">
-          <check-detail-prod :list="orderCheckInfoData"
+          <check-detail-prod :list="warehouseCheckInfoData"
                        :attr-list="attrList"
                        :prod-type-list="prodTypeList"
                        :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'
@@ -497,7 +498,7 @@ export default {
       packAfterData:null,//显示打包历史详情
       attrList: [],
       orderItemDeletedData:[],//退仓品名
-      orderCheckInfoData:[],//到仓详情
+      warehouseCheckInfoData:[],//到仓详情
       prodTypeList:[],//商品类型列表
       type:1
     }
@@ -579,7 +580,6 @@ export default {
       this.getOrder();
       this.getOfferNumber()
       this.getOrderItemDeleted()
-      this.getOrderCheckInfo()
       this.getProdTypeList();
     }
 
@@ -599,6 +599,7 @@ export default {
     handleChange(val){
       this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多')
     },
+
     getAirCompany(){
       getSupplier(this.order.airlineCompany).then(res => {
         this.$set(this.order,'companyName',this.$l(res.data,'company'))
@@ -618,6 +619,12 @@ export default {
       getOrder(that.orderId).then(response => {
         that.order = response.data;
         if(that.order.airlineCompany) that.getAirCompany()
+        for (let index in this.order.orderItemVOList) {
+          let item = this.order.orderItemVOList[index];
+          if (item.warehouseCheckInfoVO) {
+            this.warehouseCheckInfoData.push(item)
+          }
+        }
       });
     },
     //退仓品名
@@ -628,14 +635,6 @@ export default {
         that.orderItemDeletedData = response.data;
       });
     },
-    getOrderCheckInfo(){
-      let that = this
-      // TODO 待提供执行查询接口
-      // getOrderCheckInfo(that.orderId).then(response => {
-          getOrderItemDeleted(that.orderId).then(response => {
-        that.orderCheckInfoData = response.data;
-      });
-    },
     /** 获取产品类型列表 */
     getProdTypeList() {
       getProductTypeList().then((response) => {

src/views/ecw/order/index.vue

@@ -329,9 +329,9 @@
             >
               <el-button type="text">{{ $t("操作") }}</el-button>
               <el-dropdown-menu slot="dropdown">
-                <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核，或者是卸柜到仓）-->
+                <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核或者是卸柜到仓 ， shipmentState==307 表示已预装，待封柜， shipmentState==407 表示已预装，待封柜）-->
                 <template
-                  v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0"
+                  v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0 && scope.row.shipmentState != 307 && scope.row.shipmentState != 407"
                 >
                   <el-dropdown-item
                     @click.native="handleUpdate(scope.row)"