退仓品名

src/api/ecw/order.js

@@ -1032,3 +1032,10 @@ export function getOrderItemCommonAttr(orderId, excludeOrderWarehouseInId){
     params: {orderId, excludeOrderWarehouseInId}
   })
 }
+//退仓品名列表
+export function getOrderItemDeleted(orderId){
+  return request({
+    url: '/ecw/order/order-item-info-when-warehouse-in-deleted/' + orderId,
+    method: 'get',
+  })
+}

src/views/ecw/order/detail.vue

@@ -318,6 +318,119 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <el-tab-pane :label="$t('退仓品名')" name="six">
+          <el-table :data="orderItemDeletedData" border style="width: 100%">
+            <el-table-column :label="$t('序号')" width="90px">
+              <template slot-scope="scope">{{scope.$index + 1}}</template>
+            </el-table-column>
+            <el-table-column prop="prodTitleZh" :label="$t('中文品名')" />
+            <el-table-column prop="prodTitleEn" :label="$t('英文品名')" />
+            <el-table-column prop="brand" :label="$t('品牌')"  width="90px">
+              <template slot-scope="{row}">
+                <template v-if="row.brandName">{{row.brandName}}</template>
+                <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="brand" :label="$t('特性')"  width="90px">
+              <template slot-scope="{row}">
+                {{showAttrText(row.warehouseInInfoVO ? row.warehouseInProdAttrIds : row.prodAttrIds)}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="num" :label="$t('填单件数')"  width="90px"/>
+            <el-table-column prop="sumNum" :label="$t('入仓件数')"  width="90px">
+              <template slot-scope="{row}">
+                <el-link type="primary" @click.native="showWarehouseLogs(row)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
+                <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="unit" :label="$t('单位')" width="90px">
+              <template slot-scope="{row}">
+                <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
+              </template>
+            </el-table-column>
+
+            <el-table-column prop="worth" :label="$t('货值')"  width="120px"/>
+            <el-table-column prop="" :label="$t('材质')">
+              <template slot-scope="{row}">
+                <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="volume" :label="$t('体积') + '(m³)'"  width="90px">
+              <template slot-scope="{row}">
+                {{row.warehouseInInfoVO ? row.warehouseInInfoVO.volume : row.volume}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="weight" :label="$t('重量') + '(kg)'"  width="90px">
+              <template slot-scope="{row}">
+                {{row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="warehouseInInfoVO.quantityAll" :label="$t('数量') + '(个)'"  width="90px">
+              <template slot-scope="{row}">
+                {{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" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="" :label="$t('用途')">
+              <template slot-scope="{row}">
+                <div v-if="row.usageIds">
+                  <div v-for="(item,index) in row.usageIds.split(',')">
+                    <dict-tag :type="DICT_TYPE.OREER_ITEM_USAGE" :value="item" />
+                    <span v-if="(index+1)!=row.usageIds.split(',').length">,</span>
+                  </div>
+                </div>
+                <div v-else></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="" :label="$t('成交单价')"  width="220px">
+              <template slot-scope="{row}">
+
+                <template v-if="row.charging ==1">
+                  <template v-if="!row.originalSeaFreight">{{ $t('未报价') }}</template>
+                  <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
+                </template>
+                <template v-else-if="!row.originalSeaFreight && !row.originalClearanceFreight">{{ $t('未报价') }}</template>
+                <template v-else>
+                  <el-link type="primary" @click="showFeeDetail(row, 'freight')">
+                      {{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
+                  </el-link>
+                  <el-link type="primary" @click="showFeeDetail(row, 'clearance')">
+                      {{$t('清关费')}}：{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
+                  </el-link >
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="" :label="$t('储位')">
+              <template slot-scope="{row}">
+                  <template v-if="row.warehouseInInfoVO">
+                    {{getLocationName(row.warehouseInInfoVO.orderLocationMergeVOSet)}}
+                  </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="" :label="$t('填单快递单号')">
+              <template slot-scope="{row}">
+                <!-- 这里不知道什么原因被改成了入仓单号，现根据bug单改成填单快递单号，如需更改请注明缘由
+                https://zentao.test.jdshangmen.com/bug-view-2645.html -->
+                {{ row.expressNo }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
         <el-tab-pane :label="$t('订单动态')" name="second">
           <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
             <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="parseTime(activity.businessTime)">
@@ -533,7 +646,7 @@
 </template>
 
 <script>
-import {getOrder, operateLogPage} 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'
@@ -611,7 +724,8 @@ export default {
       showFeeSummary: false, // 是否显示费用汇总
       shopPackId:null,//显示打包历史的ID
       packAfterData:null,//显示打包历史详情
-      attrList: []
+      attrList: [],
+      orderItemDeletedData:[],//退仓品名
     }
   },
   computed:{
@@ -687,6 +801,7 @@ export default {
       this.orderId = this.$route.query.orderId
       this.getOrder();
       this.getOfferNumber()
+      this.getOrderItemDeleted()
     }
 
     getCurrencyList().then(res => this.currencyList = res.data)
@@ -844,6 +959,14 @@ export default {
         if(that.order.airlineCompany) that.getAirCompany()
       });
     },
+    //退仓品名
+    getOrderItemDeleted(){
+      let that = this
+      // 执行查询
+      getOrderItemDeleted(that.orderId).then(response => {
+        that.orderItemDeletedData = response.data;
+      });
+    },
     /* loadBrands(){
       let brandIds = []
       this.form.orderItemVOList.forEach(item => {