@@ -41,9 +46,9 @@
-
- 出库时间：{{ deliverydata.outboundDate }}
-
+
+
+
装车时间：{{ deliverydata.loadingTime }}
@@ -594,6 +599,66 @@ export default {
fixed: false,
sortable: true,
},
+ {
+ prop: 'isUrgentName',
+ label: '是否加急',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'assignStatusName',
+ label: '备货指派状态',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'stockupStatusName',
+ label: '备货状态',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'forkliftName',
+ label: '备货人员',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'outboundDate',
+ label: '出库时间',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'stockupDate',
+ label: '备货时间',
+ type: 1,
+ values: '',
+ width: '180',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
{
prop: 'loadingStatus',
label: '装车状态',
@@ -2433,26 +2498,27 @@ export default {
this.signform.deliverySignPictures
);
row.id = this.signform.deliveryId;
- row.deliverySignPictures = this.signform.deliverySignPictures.join(",");
+ row.deliverySignPictures = this.signform.deliverySignPictures;
row.clerkSignRemarks = this.signform.clerkSignRemarks;
row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
row.signingStatus = '2';
console.log('更新参数>>>>>>>>', row);
- // if (!!row.id){
- // updatesign(row).then(
- // () => {
- // this.$message({
- // type: 'success',
- // message: '操作成功!',
- // });
- // this.signBox = false;
- // this.onLoad();
- // },
- // error => {
- // console.log(error);
- // this.signBox = false;
- // }
- // );
+ if (!!row.id) {
+ updatesign(row).then(
+ () => {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.signBox = false;
+ this.onLoad();
+ },
+ error => {
+ console.log(error);
+ this.signBox = false;
+ }
+ );
+ }
} else {
let data = {};
console.log("---------------->this.deliverydata",this.deliverydata);
@@ -2685,10 +2751,12 @@ export default {
console.log('res.data>>>>>>>>>>>>', res.data.data);
const data = res.data.data;
this.deliverydata = data
- this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
+ // this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
+ this.deliverydata.remarks = data.remarks;
+
// this.deliverydata.teamResponsibility = b.join(',');
// console.log(
// 'data.stockupInfo.teamResponsibility------------------->',
@@ -2726,10 +2794,14 @@ export default {
console.log("---------------------------->packNum",packNum);
console.log("---------------------------->invenNum",invenNum);
console.log("---------------------------->signNum",signNum);
+ this.handleOrder(this.packpage);
+ this.handlePackage(this.packpage);
+ console.log("--------->deliveryType",this.deliverydata);
+ if(this.deliverydata.deliveryType !=='商配'){
+ this.handleInventory(this.packpage);
+ }
});
- this.handleOrder(this.packpage);
- this.handlePackage(this.packpage);
- this.handleInventory(this.packpage);
+
this.loading = false;
},
},
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 84186c34..3ac24891 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1578,6 +1578,7 @@ export default {
// this.getListOrders(this.page)
this.getListPackage()
+
});
this.loading = false;
@@ -1601,12 +1602,17 @@ export default {
// this.page.total = data.total
this.packageData =data
});
- signforInventoryList(signforId).then(res => {
- const data =res.data.data
- console.log("------------>data",data);
- // this.page.total = data.total
+ // console.log("data",data);
+ if (this.signfordata.deliveryType !== '商配' ){
+ signforInventoryList(signforId).then(res => {
+ const data =res.data.data
+ console.log("------------>data",data);
+ // this.page.total = data.total
this.inventoryData =data
- });
+ });
+ }
+
+
},
}
};
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 1b6b13e3..6057d07f 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -128,7 +128,7 @@
>
查 看
- 复 核
+ 复 核
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 01321530..0c3c1b71 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -110,21 +110,21 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -167,58 +167,6 @@
-
-
-
- 市配
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -236,15 +184,68 @@
+
+
+
+ 市配
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -968,19 +969,17 @@
data.masterDriverName = this.driverForm.masterDriverName;
data.masterVehicleNub = this.driverForm.masterVehicleNub;
}
- if (this.waixieForm.tripartiteSource) {
- tripartite = this.waixieForm;
- data.tripartite = tripartite;
- }
+
+ console.log("---------->tripartite",tripartite);
+
if (this.stockUpForm) {
- let params = this.stockUpForm;
- if (params.tripartiteSource) {
+ let params = this.waixieForm;
//三方配送数据构建
if (params.driverName) {
tripartite.driverName = params.driverName;
}
- if (params.deiverPhone) {
- tripartite.deiverPhone = params.deiverPhone;
+ if (params.driverPhone) {
+ tripartite.driverPhone = params.driverPhone;
}
if (params.vehicleNum) {
tripartite.vehicleNum = params.vehicleNum;
@@ -990,65 +989,82 @@
}
if (params.tripartiteSource) {
this.tripartiteSourceData.forEach(item => {
- if (params.tripartiteSource === item.dictValue) {
+ if (this.waixieForm.tripartiteSource == item.dictKey) {
tripartite.distributionCompanyId = item.dictKey;
tripartite.distributionCompany = item.dictValue;
}
});
+ data.tripartite = tripartite;
}
- data.tripartite = tripartite;
- } else {
+ // if (params.tripartiteSource) {
+ // this.tripartiteSourceData.forEach(item => {
+ // if (params.tripartiteSource === item.dictKey) {
+ // tripartite.distributionCompanyId = item.dictKey;
+ // tripartite.distributionCompany = item.dictValue;
+ // }
+ // });
+ // }
+ // console.log(":-----------> data.tripartite", data.tripartite);
// 自主配送
- if (params.loader) {
+ console.log("------------->this.stockUpForm.loader",this.stockUpForm.loader);
+ if (this.stockUpForm.loader) {
this.loaderData.forEach(a => {
- if (params.loader === a.dictKey) {
+ if (this.stockUpForm.loader === a.dictKey) {
stockup.loaderName = a.dictValue;
stockup.loaderId = a.dictKey;
}
});
}
-
- if (params.unloader) {
+ if (params.taskTime) {
+ stockup.taskTime = params.taskTime;
+ }
+ if (this.stockUpForm.unloader) {
this.loaderData.forEach(a => {
- if (params.loader === a.dictKey) {
+ if (this.stockUpForm.loader === a.dictKey) {
stockup.unloaderName = a.dictValue;
stockup.unloaderId = a.dictKey;
}
});
}
- if (params.forklift) {
- this.forkliftData.forEach(b => {
- if (params.forklift === b.dictKey) {
- stockup.forkliftName = b.dictValue;
- stockup.forkliftId = b.dictKey;
- }
- });
- }
- if (params.goodsAreaId) {
- this.goodsAreaData.forEach(c => {
- if (params.goodsAreaId === c.dictKey) {
- stockup.goodsAreaId = c.dictKey;
- stockup.goodsAreaName = c.dictValue;
- }
- });
- }
- if (params.stockupDate) {
- stockup.stockupDate = params.stockupDate;
- }
- if (params.remarks) {
- data.remarks = params.remarks;
+ console.log("------------->stockup",stockup);
+
+ // if (params.forklift) {
+ // this.forkliftData.forEach(b => {
+ // if (params.forklift === b.dictKey) {
+ // stockup.forkliftName = b.dictValue;
+ // stockup.forkliftId = b.dictKey;
+ // }
+ // });
+ // }
+ // if (params.goodsAreaId) {
+ // this.goodsAreaData.forEach(c => {
+ // if (params.goodsAreaId === c.dictKey) {
+ // stockup.goodsAreaId = c.dictKey;
+ // stockup.goodsAreaName = c.dictValue;
+ // }
+ // });
+ // }
+ // if (params.stockupDate) {
+ // stockup.stockupDate = params.stockupDate;
+ // }
+ if (this.stockUpForm.remarks) {
+ data.remarks = this.stockUpForm.remarks;
}
// if (this.loadAndUnload.length > 0) {
// stockup.loadAndUnload = this.loadAndUnload.join(',');
// }
- if (params.outboundDate) {
- stockup.outboundDate = params.outboundDate.toString();
+ // if (params.outboundDate) {
+ // stockup.outboundDate = params.outboundDate.toString();
+ // }
+ if (stockup){
+ data.stockup = stockup;
}
- data.stockup = stockup;
- }
- if (this.stockUpForm.taskTime) {
- data.taskTime = this.stockUpForm.taskTime.toString();
- }
+ if (this.stockUpForm.taskTime){
+ data.taskTime = this.stockUpForm.taskTime;
+ }
+ // if (this.stockUpForm.taskTime) {
+ // data.taskTime = this.stockUpForm.taskTime.toString();
+ // }
}
console.log('this.data------------>', this.data);
if (!this.deliveryListId) {
@@ -1060,6 +1076,7 @@
});
return;
}
+
console.log('>>>>>>>>>>>>', data);
deliveryTask(data).then((res) => {
this.$router.push({
@@ -1071,11 +1088,37 @@
let updateDate = {};
updateDate.reservationInfos = this.reservationData;
updateDate.id = this.deliveryListId;
- updateDate.stockupInfo = stockup;
- updateDate.remarks = data.remarks;
+ console.log("-------->stockup",stockup);
+ if (stockup.unloaderId){
+ updateDate.unloadingTeamId = stockup.unloaderId;
+ updateDate.unloadingTeamName = stockup.unloaderName;
+ }
+ if (stockup.loaderId){
+ updateDate.loadingTeamId = stockup.loaderId;
+ updateDate.loadingTeamName = stockup.loaderName;
+ }
+ if (stockup.taskTime){
+ updateDate.taskTime = stockup.taskTime;
+ }
+ // updateDate.stockupInfo = stockup;
+ console.log("------------>this.tripartite",tripartite);
+
+ if (tripartite){
+ updateDate.tripartite= tripartite;
+ }
+ // if (tripartite){
+ // updateDate.tripartite.distributionCompanyId = tripartite.distributionCompanyId;
+ // updateDate.tripartite.distributionCompany = tripartite.distributionCompany;
+ // }
+ console.log("---------------->data",data.remarks);
+ updateDate.remarks = this.stockUpForm.remarks;
+ updateDate.taskTime = this.stockUpForm.taskTime;
+ updateDate.otherFee = this.stockUpForm.otherFee;
+ console.log("------------>this.waixieForm",this.waixieForm);
console.log('->>>>>>>', this.waixieForm.tripartiteSource);
if (this.waixieForm.tripartiteSource) {
updateDate.tripartite = data.tripartite;
+
} else {
updateDate.allocationInfo = data.allocationInfo;
updateDate.masterDriverName = data.masterDriverName;
@@ -1233,6 +1276,8 @@
this.driverForm.driverPhone = '';
this.driverForm.vehicleNum = '';
this.driverForm.deliveryFee = '';
+ this.waixieForm = {};
+
} else {
// this.loadAndUnload = [];
this.serveType = [];
@@ -1244,7 +1289,7 @@
this.stockUpForm.deliveryType = '2';
// this.stockUpForm.deliveryWay = '2';
this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
- this.form.taskTime = dayjs().format('YYYY-MM-DD');
+ this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
},
ddd() {
@@ -1303,13 +1348,14 @@
getMarketDeliveryList(this.deliveryListId).then(async res => {
console.log('--------------->', res.data.data);
const deliveryData = res.data.data;
- this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate;
- this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime;
- this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId;
- this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId;
- this.stockUpForm.loader = deliveryData.stockupInfo.loaderId;
+ // this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate;
+ // this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime;
+ // this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId;
+ // this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId;
+ this.stockUpForm.loader = deliveryData.loadingTeamId;
+ this.stockUpForm.unloader = deliveryData.unloadingTeamId;
this.stockUpForm.taskTime = deliveryData.taskTime;
- this.stockUpForm.stockupDate = deliveryData.stockupInfo.stockupDate;
+ // this.stockUpForm.stockupDate = deliveryData.stockupInfo.stockupDate;
this.stockUpForm.remarks = deliveryData.remarks;
// if (deliveryData.stockupInfo.teamResponsibility) {
// this.loadAndUnload = deliveryData.stockupInfo.teamResponsibility.split(',');