退仓品名优化

src/api/ecw/order.js

@@ -1039,3 +1039,11 @@ export function getOrderItemDeleted(orderId){
     method: 'get',
   })
 }
+
+//获得订单品名对应的退仓入仓货物详情
+export function getOrderWarehouseDeleted(orderId,orderItem){
+  return request({
+    url: '/order/order-warehouse-in/get-order-warehouse-in-deleted?orderId=' + orderId+'&orderItemId='+orderItem,
+    method: 'get'
+  })
+}

src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue

@@ -34,6 +34,13 @@
               >{{ $t('新建合包箱号') }}</el-button
             >
             <el-button class="ml-10" @click="pack">{{$t('补单')}}</el-button>
+            <span style="margin:0 20px">{{$t('状态')}}</span>
+            <el-select v-model="pkgStatus"  :placeholder="$t('状态')"  @change="changeStatus" >
+              <el-option :label="$t('全部')" value="0"></el-option>
+               <el-option :label="$t('未装箱')" value="1"></el-option>
+                <el-option :label="$t('装箱中')" value="2"></el-option>
+                <el-option :label="$t('已装箱')" value="3"></el-option>
+            </el-select>
           </el-row>
           <el-row style="margin-top: 5px">
             <el-table border :data="pagList" max-height="600px">
@@ -203,7 +210,8 @@ export default {
       showPackDialog: false,
       showPagedialogVisible: false,
       showPageTitle: '',
-      showPkgData: {}
+      showPkgData: {},
+      pkgStatus:"0" //装箱状态
     }
   },
   created() {
@@ -221,6 +229,9 @@ export default {
   methods: {
     formatDate,
     getList() {
+      if(this.pkgStatus>0){
+        this.queryParams.status = this.pkgStatus
+      }
       getMergePkgList(this.queryParams).then((res) => {
         this.pagList = res.data.list
         this.total = res.data.total
@@ -306,6 +317,9 @@ export default {
     // 提交补单
     onSupplementFinish(){
       this.showPackDialog = false
+    },
+    changeStatus(){
+      this.getList()
     }
   }
 }

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

@@ -64,10 +64,11 @@
             </template>
           </el-table-column>
         </el-table>
+
     </el-dialog>
 </template>
 <script>
-import { getOrder, getOrderWarehouseIn } from '@/api/ecw/order'
+import { getOrder, getOrderWarehouseIn,getOrderWarehouseDeleted} from '@/api/ecw/order'
 import { DICT_TYPE } from '@/utils/dict'
 import { parseTime } from '@/utils/ruoyi'
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
@@ -84,6 +85,7 @@ export default {
         order: Object, // order 和 orderId 二选一
         orderId: Number,
         orderItemId: Number,
+        type:Number
     },
     data(){
         return {
@@ -101,22 +103,32 @@ export default {
       },
       warehouseItem(){
         if(!this.warehouseList) return []
+        console.log(this.type)
+        if(this.type==2){
+          console.log(111)
+          return this.warehouseList
+        }
         return this.warehouseList.find(item => item.orderItemId == this.orderItemId) || []
       },
       title(){
         if(!this.orderItem) return '-'
         return this.$l(this.orderItem, 'prodTitle') + ' - ' + this.$t('入仓记录')
-      }
+      },
     },
 
     created(){
         this.show = true
+
         if(!this.order && this.orderId){
           getOrder(this.orderId).then(res => {
             this.orderDetail = res.data
           })
         }
-        this.getOrderWarehouseIn()
+        if(this.type==1){
+            this.getOrderWarehouseIn()
+        }else{
+          this.getOrderWarehouseDeleted()
+          }
     },
     methods:{
       // 获取储位名称
@@ -137,6 +149,11 @@ export default {
             this.warehouseList = res.data
           })
         },
+        getOrderWarehouseDeleted(){
+          getOrderWarehouseDeleted(this.info.orderId,this.orderItemId).then(res => {
+            this.warehouseList = res.data
+          })
+        },
         seePackLog(){
           this.$emit('openPackHistory',this.orderItemId)
         }

src/views/ecw/order/detail.vue

@@ -226,7 +226,7 @@
             <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>
+                <el-link type="primary" @click.native="showWarehouseLogs(row,1)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
                 <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
               </template>
             </el-table-column>
@@ -339,7 +339,7 @@
             <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>
+                <el-link type="primary" @click.native="showWarehouseLogs(row,2)">{{row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0}}</el-link>
                 <div v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.isMultiSpecification">({{$t('多规格')}})</div>
               </template>
             </el-table-column>
@@ -555,7 +555,7 @@
 
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
-    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" @openPackHistory="openPackHistory" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
+    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" :type="type" @openPackHistory="openPackHistory" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
     <el-dialog :title="$t('付款人')" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
       <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
         <el-table-column :label="$t('费用类型')" prop="label" width="200px">
@@ -726,6 +726,7 @@ export default {
       packAfterData:null,//显示打包历史详情
       attrList: [],
       orderItemDeletedData:[],//退仓品名
+      type:1
     }
   },
   computed:{
@@ -1005,7 +1006,8 @@ export default {
       window.open(this.order.packingListUrl)
     },
     // 显示入仓记录
-    showWarehouseLogs(row){
+    showWarehouseLogs(row,type){
+      this.type = type
       this.showWarehouseInItemId = row.orderItemId
     },
     getWarehouseIn(){