-
+
易碎照
@@ -609,7 +609,7 @@
-
+
家配照
-
+
签收照
@@ -2459,46 +2459,46 @@ export default {
fixed: false,
sortable: true,
},
- {
- label: '发站仓',
- prop: 'sendWarehouseName',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- label: '目的仓',
- prop: 'acceptWarehouseName',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- label: '发货时间',
- prop: 'waybillNumber',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- label: '入库时间',
- prop: 'warehouseEntryTimeEnd',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // label: '发站仓',
+ // prop: 'sendWarehouseName',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // label: '目的仓',
+ // prop: 'acceptWarehouseName',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // label: '发货时间',
+ // prop: 'waybillNumber',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // label: '入库时间',
+ // prop: 'warehouseEntryTimeEnd',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
// {
// label: '客户车次号',
// prop: 'trainNumber',
@@ -2567,67 +2567,103 @@ export default {
{
label: '包件状态',
prop: 'orderPackageStatusName',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- label: '冻结状态',
- prop: 'orderPackageFreezeStatusName',
- type: 2,
- values: '',
- width: '130',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
- {
- label: '上架状态',
- prop: 'orderPackageGroundingStatusName',
- type: 2,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [
+ {
+ label: '未签收',
+ value: '10'
+ },
+ {
+ label: '已签收',
+ value: '70'
+ },
+ ],
fixed: false,
sortable: true,
},
+ // {
+ // label: '冻结状态',
+ // prop: 'orderPackageFreezeStatusName',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ // {
+ // label: '上架状态',
+ // prop: 'orderPackageGroundingStatusName',
+ // type: 2,
+ // values: '',
+ // width: '130',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
label: '备货状态',
prop: 'orderPackageStockupStatusName',
- type: 2,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [
+ {
+ label: '待备货',
+ value: '10'
+ },
+ {
+ label: '已备货',
+ value: '20'
+ },
+ ],
fixed: false,
sortable: true,
},
{
label: '预约状态',
prop: 'orderPackageReservationStatusName',
- type: 2,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [
+ {
+ label: '待预约',
+ value: '10'
+ },
+ {
+ label: '已预约',
+ value: '20'
+ },
+ ],
fixed: false,
sortable: true,
},
{
label: '装车状态',
prop: 'orderPackageLoadingStatusName',
- type: 2,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [
+ {
+ label: '待装车',
+ value: '10'
+ },
+ {
+ label: '已装车',
+ value: '20'
+ },
+ ],
fixed: false,
sortable: true,
},
{
label: '装车时间',
prop: 'loadingTime',
- type: 2,
+ type: 4,
values: '',
width: '130',
checkarr: [],
@@ -2649,10 +2685,27 @@ export default {
{
label: '装车方式',
prop: 'scanStatus',
- type: 2,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [
+ {
+ label: '扫描',
+ value: '2'
+ },
+ {
+ label: '订单',
+ value: '3'
+ },
+ {
+ label: '一键装车',
+ value: '4'
+ },
+ {
+ label: '补录',
+ value: '5'
+ },
+ ],
fixed: false,
sortable: true,
},
@@ -2665,7 +2718,7 @@ export default {
{
label: '计划装车人',
prop: 'driverName',
- type: 2,
+ type: 1,
values: '',
width: '130',
checkarr: [],
@@ -2685,7 +2738,7 @@ export default {
{
label: '签收扫描时间',
prop: 'signingTime',
- type: 2,
+ type: 4,
values: '',
width: '130',
checkarr: [],
@@ -3169,6 +3222,39 @@ export default {
if (!index) delete this.inventoryQuery[row.prop];
this.handleInventory(this.page);
},
+ inputscReservationPackage(index, row) {
+ console.log('index', index);
+ console.log('row', row);
+ this.wrapoption.query[row.prop] = index;
+ if (!index) delete this.inventoryQuery[row.prop];
+ this.getWrapdetails(this.page);
+ },
+ timescReservationPackage(index, row) {
+ if (!!index) {
+ index = dayjs(index).format('YYYY-MM-DD');
+ }
+ this.wrapoption.query[row.prop] = index;
+ if (!index) {
+ delete this.wrapoption.query[row.prop];
+ }
+ this.getWrapdetails(this.page);
+ },
+ selectscReservationPackage(index, row) {
+ console.log(index, row);
+ if (row.prop === 'orderPackageStatusName') {
+ this.wrapoption.query['orderPackageStatus'] = index;
+ } else if (row.prop === 'orderPackageStockupStatusName') {
+ this.wrapoption.query['orderPackageStockupStatus'] = index;
+ } else if (row.prop === 'orderPackageReservationStatusName') {
+ this.wrapoption.query['orderPackageReservationStatus'] = index;
+ } else if (row.prop === 'orderPackageLoadingStatusName') {
+ this.wrapoption.query['orderPackageLoadingStatus'] = index;
+ } else {
+ this.wrapoption.query[row.prop] = index;
+ }
+ this.getWrapdetails(this.page);
+ },
+
timesc() {},
btnsc() {},
selectsc() {},
@@ -3352,7 +3438,7 @@ export default {
// }
const pushPhotoToRow = (photoArray, photoType) => {
-
+
photoArray.forEach(item => {
row.map[photoType].push({
name: item.response && item.response.data ? item.response.data.originalName : '',
@@ -3362,7 +3448,7 @@ export default {
});
});
};
- pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
+ pushPhotoToRow(this.DoorstepPhoto, 'photo_1');
pushPhotoToRow(this.StackingPhoto, 'photo_2');
pushPhotoToRow(this.FragilePhotos, 'photo_3');
pushPhotoToRow(this.HomePhotos, 'photo_4');
@@ -3564,7 +3650,7 @@ export default {
console.log(res, '复合返回值');
if(res.data.data){
this.CheckStore=res.data.data
-
+
if(res.data.data.printVOList){
// DoorstepPhoto 上门照片
// StackingPhoto 堆码照片
@@ -3592,7 +3678,7 @@ export default {
if(item.type =='photo_5'){
this.SignForPhotos.push({name:'',url:item.urlRoute})
}
-
+
})
}
console.log(this.CheckStore,'data');