收货看板-待上架列表

resources/views/store/receivingDashboard/punctualityProgress/index.blade.php

@@ -208,16 +208,17 @@
                 pollingFunction(this.searchData, 1000 * 30)
 
                 let column = [
-                    {name: 'receiveTaskNo', value: '收货任务号'},
-                    {name: 'status', value: '任务状态'},
-                    {name: 'asnNo', value: 'ASN号'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'customerName', value: '货主'},
-                    {name: 'workGroupName', value: '操作组'},
-                    {name: 'expectancyAmount', value: '预期总数'},
-                    {name: 'putawayAmount', value: '已上架总数'},
-                    {name: 'receiveAverageConsumeDuration', value: ' 收货平均耗时'},
-                    {name: 'putawayAverageConsumeDuration', value: '上架平均耗时'},
+                    {name: 'serial', value: '序号', neglect: true},
+                    {name: 'receiveTaskNo', value: '收货任务号', neglect: true},
+                    {name: 'status', value: '任务状态', neglect: true},
+                    {name: 'asnNo', value: 'ASN号', neglect: true},
+                    {name: 'reservationNo', value: '预约号', neglect: true},
+                    {name: 'customerName', value: '货主', neglect: true},
+                    {name: 'workGroupName', value: '操作组', neglect: true},
+                    {name: 'expectancyAmount', value: '预期总数', neglect: true},
+                    {name: 'putawayAmount', value: '已上架总数', neglect: true},
+                    {name: 'receiveAverageConsumeDuration', value: ' 收货平均耗时', neglect: true},
+                    {name: 'putawayAverageConsumeDuration', value: '上架平均耗时', neglect: true},
 
                 ];
                 new Header({
@@ -226,21 +227,23 @@
                     column: column,
                     data: this.resData.details.data,
                     restorationColumn: 'addtime',
+                    isCheckAllBox:false,
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
                 }).init();
 
                 let column2 = [
-                    {name: 'receiveTaskNo', value: '收货任务号'},
-                    {name: 'asnNo', value: 'ASN号'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'container', value: '容器号'},
-                    {name: 'commName', value: '商品名称'},
-                    {name: 'commSku', value: 'SKU'},
-                    {name: 'commBarcode', value: '条码'},
-                    {name: 'receiveQty', value: '收货数量'},
-                    {name: 'putawayTime', value: '上架时间'},
-                    {name: 'receiveConsumeDuration', value: '收货耗时'},
-                    {name: 'putawayConsumeDuration', value: '上架耗时'},
+                    {name: 'serial', value: '序号', neglect: true},
+                    {name: 'receiveTaskNo', value: '收货任务号', neglect: true},
+                    {name: 'asnNo', value: 'ASN号', neglect: true},
+                    {name: 'reservationNo', value: '预约号', neglect: true},
+                    {name: 'container', value: '容器号', neglect: true},
+                    {name: 'commName', value: '商品名称', neglect: true},
+                    {name: 'commSku', value: 'SKU', neglect: true},
+                    {name: 'commBarcode', value: '条码', neglect: true},
+                    {name: 'receiveQty', value: '收货数量', neglect: true},
+                    {name: 'putawayTime', value: '上架时间', neglect: true},
+                    {name: 'receiveConsumeDuration', value: '收货耗时', neglect: true},
+                    {name: 'putawayConsumeDuration', value: '上架耗时', neglect: true},
 
                 ];
                 new Header({
@@ -249,6 +252,7 @@
                     column: column2,
                     data: this.resData.details.data,
                     restorationColumn: 'addtime',
+                    isCheckAllBox:false,
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
                 }).init();
             },
@@ -317,7 +321,6 @@
                     let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}`
                     tempTip.showSuccess('开始查询,请稍后!');
                     axios.get(url, this.getSearch()).then(res => {
-                        tempTip.showSuccess('查询成功!');
                         if (res.data.code !== 200) {
                             this.resData.itemDetail = null;
                         } else {

resources/views/store/receivingDashboard/receivingTableList/index.blade.php

@@ -234,21 +234,22 @@
                 $('#list').removeClass('d-none');
                 pollingFunction(this.searchData, 1000 * 30)
                 let column = [
-                    {name: 'customerName', value: '货主'},
-                    {name: 'receiveTaskNo', value: '收货任务号'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'status', value: '状态'},
-                    {name: 'asnNo', value: 'ASN单号'},
-                    {name: 'createSingleTime', value: '开单时间'},
-                    {name: 'finishedReceiveTime', value: '完成收货时间'},
-                    {name: 'receivePerson', value: '关单员'},
-                    {name: 'expectancyAmount', value: ' 预期数'},
-                    {name: 'receivedAmount', value: '已收数'},
-                    {name: 'unfinishedReceiveAmount', value: '未收数'},
-                    {name: 'receiveConsumeDuration', value: '收货耗时'},
-                    {name: 'action', value: '查看明细'},
+                    {name: 'serial', value: '序号', neglect: true},
+                    {name: 'customerName', value: '货主', neglect: true},
+                    {name: 'receiveTaskNo', value: '收货任务号', neglect: true},
+                    {name: 'reservationNo', value: '预约号', neglect: true},
+                    {name: 'status', value: '状态', neglect: true},
+                    {name: 'asnNo', value: 'ASN单号', neglect: true},
+                    {name: 'createSingleTime', value: '开单时间', neglect: true},
+                    {name: 'finishedReceiveTime', value: '完成收货时间', neglect: true},
+                    {name: 'receivePerson', value: '关单员', neglect: true},
+                    {name: 'expectancyAmount', value: ' 预期数', neglect: true},
+                    {name: 'receivedAmount', value: '已收数', neglect: true},
+                    {name: 'unfinishedReceiveAmount', value: '未收数', neglect: true},
+                    {name: 'receiveConsumeDuration', value: '收货耗时', neglect: true},
+                    {name: 'action', value: '查看明细', neglect: true},
                     @can('入库管理-实时收货看板-关单')
-                    {name: 'closeAsn', value: '关单'},
+                    {name: 'closeAsn', value: '关单', neglect: true},
                     @endcan
                 ];
                 new Header({
@@ -257,20 +258,22 @@
                     column: column,
                     data: this.resData.details.data,
                     restorationColumn: 'addtime',
+                    isCheckAllBox:false,
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
                 }).init();
                 let column2 = [
-                    {name: 'receiveTaskNo', value: '收货任务号'},
-                    {name: 'asnNo', value: 'ASN号'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'descr', value: '商品名称'},
-                    {name: 'sku', value: 'SKU'},
-                    {name: 'expectedQty', value: '预期数'},
-                    {name: 'receivedQty', value: '收货数'},
-                    {name: 'receivePerson', value: '收货人'},
-                    {name: 'putawayQty',class:"text-danger font-weight-bold", value: '上架数'},
-                    {name: 'putawayPerson', value: '上架人'},
-                    {name: 'unfinishedReceiveQty',class:"text-danger font-weight-bold", value: '未收数'},
+                    {name: 'serial', value: '序号', neglect: true},
+                    {name: 'receiveTaskNo', value: '收货任务号', neglect: true},
+                    {name: 'asnNo', value: 'ASN号', neglect: true},
+                    {name: 'reservationNo', value: '预约号', neglect: true},
+                    {name: 'descr', value: '商品名称', neglect: true},
+                    {name: 'sku', value: 'SKU', neglect: true},
+                    {name: 'expectedQty', value: '预期数', neglect: true},
+                    {name: 'receivedQty', value: '收货数', neglect: true},
+                    {name: 'receivePerson', value: '收货人', neglect: true},
+                    {name: 'putawayQty',class:"text-danger font-weight-bold", value: '上架数', neglect: true},
+                    {name: 'putawayPerson', value: '上架人', neglect: true},
+                    {name: 'unfinishedReceiveQty',class:"text-danger font-weight-bold", value: '未收数', neglect: true},
                 ];
                 new Header({
                     el: "table_inner",
@@ -278,6 +281,7 @@
                     column: column2,
                     data: this.resData.details.data,
                     restorationColumn: 'addtime',
+                    isCheckAllBox:false,
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
                 }).init();
             },

resources/views/store/receivingDashboard/stayPutawayList.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title')时效进度@endsection
+@section('title')待上架列表@endsection
 @section('content')
     <div class="d-none" id="list">
         <!--查询            -->
@@ -43,16 +43,24 @@
                style="background: #fff;" id="table">
             <tr v-for="(item,i) in resData.details.data" :key="i">
                 <td class="td-warm text-muted "><span>@{{ i+1 }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.warehouseName }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.customerName }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.container }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.receiveTaskNo }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.status }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.asnNo }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.reservationNo }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.customerName }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.workGroupName }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.expectancyAmount }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.putawayAmount }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.receiveAverageConsumeDuration }}</span></td>
-                <td class="td-warm text-muted"><span>@{{ item.putawayAverageConsumeDuration }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.receivePerson }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.receiveTime }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.commSku }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.commBarcode }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.commName }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.quanlityCondition }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.attrWarehouse }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.produceDate }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.expiryDate }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.inboundDate }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.batchNumber }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.lotNo }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.stayPutawayQty }}</span></td>
             </tr>
         </table>
 
@@ -110,8 +118,6 @@
                 },
                 searchSelects: {
                     owners: {!! $owners !!},
-                    workGroups: {!! $workGroups !!},
-                    statuses: ['创建', '进行中', '完成', '超时完成'],
                 },
                 selectTr: null,
                 search: {
@@ -125,7 +131,7 @@
                 current: 1,
             },
             created() {
-                let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
+                let url = this.getBaseUrl() + `/api/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
             },
@@ -135,18 +141,26 @@
             mounted: function () {
                 $('#list').removeClass('d-none');
                 pollingFunction(this.searchData, 1000 * 30)
-
                 let column = [
-                    {name: 'receiveTaskNo', value: '收货任务号'},
-                    {name: 'status', value: '任务状态'},
-                    {name: 'asnNo', value: 'ASN号'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'customerName', value: '货主'},
-                    {name: 'workGroupName', value: '操作组'},
-                    {name: 'expectancyAmount', value: '预期总数'},
-                    {name: 'putawayAmount', value: '已上架总数'},
-                    {name: 'receiveAverageConsumeDuration', value: ' 收货平均耗时'},
-                    {name: 'putawayAverageConsumeDuration', value: '上架平均耗时'},
+                    {name: 'serial', value: '序号', neglect: true},
+                    {name: 'warehouseName', value: '仓库',neglect: true},
+                    {name: 'customerName', value: '货主',neglect: true},
+                    {name: 'container', value: '容器号',neglect: true},
+                    {name: 'receiveTaskNo', value: '收货任务号',neglect: true},
+                    {name: 'asnNo', value: 'ASN号',neglect: true},
+                    {name: 'receivePerson', value: '收货员',neglect: true},
+                    {name: 'receiveTime', value: '收货时间',neglect: true},
+                    {name: 'commSku', value: 'sku',neglect: true},
+                    {name: 'commBarcode', value: '条码',neglect: true},
+                    {name: 'commName', value: '商品名称',neglect: true},
+                    {name: 'quanlityCondition', value: '质量状态',neglect: true},
+                    {name: 'attrWarehouse', value: '属性仓',neglect: true},
+                    {name: 'produceDate', value: '生产日期',neglect: true},
+                    {name: 'expiryDate', value: '失效日期',neglect: true},
+                    {name: 'inboundDate', value: '入库日期',neglect: true},
+                    {name: 'batchNumber', value: '批号',neglect: true},
+                    {name: 'lotNo', value: '批次号',neglect: true},
+                    {name: 'stayPutawayQty', value: '待上架数量',neglect: true},
 
                 ];
                 new Header({
@@ -155,29 +169,7 @@
                     column: column,
                     data: this.resData.details.data,
                     restorationColumn: 'addtime',
-                    fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
-                }).init();
-
-                let column2 = [
-                    {name: 'warehouseName', value: '仓库'},
-                    {name: 'customerName', value: '货主'},
-                    {name: 'reservationNo', value: '预约号'},
-                    {name: 'container', value: '容器号'},
-                    {name: 'commName', value: '商品名称'},
-                    {name: 'commSku', value: 'SKU'},
-                    {name: 'commBarcode', value: '条码'},
-                    {name: 'receiveQty', value: '收货数量'},
-                    {name: 'putawayTime', value: '上架时间'},
-                    {name: 'receiveConsumeDuration', value: '收货耗时'},
-                    {name: 'putawayConsumeDuration', value: '上架耗时'},
-
-                ];
-                new Header({
-                    el: "table_inner",
-                    name: "details",
-                    column: column2,
-                    data: this.resData.details.data,
-                    restorationColumn: 'addtime',
+                    isCheckAllBox:false,
                     fixedTop: ($('#form_div').height()) + ($('#btn').height()) + 1,
                 }).init();
             },
@@ -239,22 +231,9 @@
                     } else if (flag === 'next' && this.current < this.resData.details.pages) {
                         this.current++;
                     }
-                    let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
+                    let url = this.getBaseUrl() + `/api/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
                     this.getPageResult(url);
                 },
-                showDetail(receiveTaskNo, reservationNo, asnNo) {
-                    let url = this.getBaseUrl() + `/api/receiveBoard/agingScheduleDetail?receiveTaskNo=${receiveTaskNo}&reservationNo=${reservationNo}&asnNo=${asnNo}`
-                    tempTip.showSuccess('开始查询,请稍后!');
-                    axios.get(url, this.getSearch()).then(res => {
-                        tempTip.showSuccess('查询成功!');
-                        if (res.data.code !== 200) {
-                            this.resData.itemDetail = null;
-                        } else {
-                            this.resData.itemDetail = res.data.data;
-                        }
-                    });
-                }
-
             },
 
         });