diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 67dca799..5abaa4fc 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -136,13 +136,22 @@
-->
-
+
+
+
+
+
-
+
+
+ {{ scope.row.blUnpack == "1" ? "是" : "否" }}
+
+
+
@@ -206,7 +215,8 @@
{{ $t('下一网点') }}
-
+
+
@@ -235,12 +245,12 @@
- {{$t('总件数') + ': ' + (coData.parcelQty || 0)}}
+ {{$t('总件数') + ': ' + (coData.totalParcelQty || 0)}}
@@ -320,9 +330,13 @@
-
-
-
+
+
+ {{ scope.row.waybillStatus == "1" ? "是" : "否" }}
+
+
+
+
@@ -331,7 +345,8 @@
-
+
+
@@ -447,7 +462,8 @@
-
+
+
@@ -473,15 +489,15 @@ import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import { parseTime } from "@/utils/custom";
export default {
name: "PackageManagement",
- components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
- dicts: [
- ],
+ components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
+ dicts: ['emis_pack_status'],
data() {
return {
// 遮罩层
@@ -625,7 +641,7 @@ export default {
console.log("date picker---->", value)
this.wayBillData.dateTimeRange=value;
},
- handleAddCoPack(){
+ async handleAddCoPack(){
if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
this.$modal.msgError("请先选择必填项")
return;
@@ -651,12 +667,13 @@ export default {
opMan: this.$store.getters.empCode
}
if(this.coPackType == "add"){// 新增
- addEmisTmsPack(coPackItem).then(response => {
+ let response = await addEmisTmsPack(coPackItem);
+ // addEmisTmsPack(coPackItem).then(response => {
if(!response || response.code != 200){
this.$modal.msgError(response && response.msg || '新增合包失败')
return;
}
- })
+ // })
for(let i = 0; i< this.emisCoPackDetail.length;i++){
let packDetail = {
packNo:this.coData.packNo,
@@ -668,12 +685,13 @@ export default {
createBy: this.$store.getters.empCode,
createTime: parseTime(new Date())
};
- addEmisTmsPackDtl(packDetail).then(response => {
+ let response = await addEmisTmsPackDtl(packDetail);
+ // addEmisTmsPackDtl(packDetail).then(response => {
if(!response || response.code != 200){
this.$modal.msgError(response && response.msg || '合包明细新增失败')
return;
}
- })
+ // })
}
}else if(this.coPackType == "edit"){// 修改
//第一步：处理合包信息的更新；
@@ -682,7 +700,7 @@ export default {
|| this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
|| this.tempCoPackInfo.blUnpack != this.blUnpack
|| this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
- || this.tempCoPackInfo.parcelQty != this.coData.parcelQty
+ || this.tempCoPackInfo.totalParcelQty != this.coData.totalParcelQty
|| this.tempCoPackInfo.totalWeight != this.coData.totalWeight
|| this.tempCoPackInfo.totalVolume != this.coData.totalVolume
){
@@ -691,15 +709,16 @@ export default {
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.blUnpack = this.blUnpack;
this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
- this.tempCoPackInfo.parcelQty = this.coData.parcelQty;
+ this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
this.tempCoPackInfo.totalWeight = this.coData.totalWeight;
this.tempCoPackInfo.totalVolume = this.coData.totalVolume;
- updateEmisTmsPack(this.tempCoPackInfo).then(res => {
+ let res = await updateEmisTmsPack(this.tempCoPackInfo);
+ // updateEmisTmsPack(this.tempCoPackInfo).then(res => {
if(!res || res.code != 200){
this.$modal.msgError(res && res.msg || '未知错误')
return;
}
- });
+ // });
}
//第二步：处理运单列表的数据
let tempDelList = [];
@@ -715,14 +734,18 @@ export default {
return true;
}
})
- tempDelList.forEach(item =>{
- delEmisTmsPackDtl(item.id).then(res => {
+ // tempDelList.forEach(item =>{
+ for(let tdl = 0; tdl < tempDelList.length; tdl++){
+ let item = tempDelList[tdl];
+ let res = await delEmisTmsPackDtl(item.id);
+ // delEmisTmsPackDtl(item.id).then(res => {
if(!res || res.code != 200){
this.$modal.msgError(res && res.msg || '未知错误')
return;
}
- })
- })
+ // })
+ }
+ // })
//2.2：计算要新增的运单
tempAddList = this.emisCoPackDetail.filter(item => {
let ls = this.tempExistCoPackWayBillList.filter(cd => {
@@ -734,7 +757,9 @@ export default {
return true;
}
})
- tempAddList.forEach(item =>{
+ // tempAddList.forEach(item =>{
+ for(let tal = 0; tal < tempAddList.length; tal++){
+ let item = tempAddList[tal];
let packDetail = {
packNo:this.coData.packNo,
billCode: item.billCode,
@@ -745,13 +770,15 @@ export default {
createBy: this.$store.getters.empCode,
createTime: parseTime(new Date())
};
- addEmisTmsPackDtl(packDetail).then(response => {
+ let response = await addEmisTmsPackDtl(packDetail);
+ // addEmisTmsPackDtl(packDetail).then(response => {
if(!response || response.code != 200){
this.$modal.msgError(response && response.msg || '合包明细新增失败')
return;
}
- })
- })
+ // })
+ }
+ // })
}
this.openForm= false;
this.titleForm = "";
@@ -844,12 +871,12 @@ export default {
this.coMultiple = !selection.length
},
computeTotal(){
- let parcelQty=0;
+ let totalParcelQty=0;
let totalWeight=0;
let totalVolume=0;
this.emisCoPackDetail.forEach(item =>{
- parcelQty +=item.parcelQty;
- totalWeight +=item.totalWeight;
+ totalParcelQty +=item.parcelQty;
+ totalWeight +=item.billWeight;
totalVolume +=item.totalVolume;
item.destCountry = this.coData.destCountry;
item.sendStiteCode = this.coData.sendStiteCode;
@@ -857,7 +884,7 @@ export default {
item.blUnpack = this.blUnpack;
})
this.coData.totalWaybillQty=this.emisCoPackDetail.length;
- this.coData.parcelQty=parcelQty;
+ this.coData.totalParcelQty=totalParcelQty;
this.coData.totalWeight=totalWeight;
this.coData.totalVolume=totalVolume;
},
diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 45e10c11..7e3a2c54 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -433,7 +433,8 @@ export default {
scanArrivalData.push(
{
billCode:item.billCode,
- scanWeight:item.scanWeight
+ scanWeight:item.scanWeight,
+ scanDate:item.scanDate || new Date(),
}
);
}else if(item.scanType=="40") {
@@ -441,7 +442,8 @@ export default {
{
billCode:item.billCode,
scanWeight:item.scanWeight,
- dispatchOrSendManCode:item.dispatchOrSendManCode
+ dispatchOrSendManCode:item.dispatchOrSendManCode,
+ scanDate:item.scanDate || new Date(),
}
);
}
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index 324db6c6..c76377d8 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -371,7 +371,8 @@ export default {
{
billCode:item.billCode,
scanWeight:item.scanWeight,
- dispatchOrSendManCode:item.dispatchOrSendManCode
+ dispatchOrSendManCode:item.dispatchOrSendManCode,
+ scanDate:item.scanDate || new Date()
}
);
});
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index 4fd0a9ef..975e6f81 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -52,8 +52,8 @@
-
-
+
+
@@ -71,14 +71,14 @@
-
-
+
+
-
-
+
+
@@ -128,7 +128,7 @@
-
+
@@ -141,16 +141,16 @@
{{ parseTime(scope.row.registerDate) }}
-
-
-
+
+
{{ parseTime(scope.row.dispatchDate) }}
-
-
+
+
@@ -499,7 +499,8 @@ export default {
customerCode:item.customerCode,
customerName:item.customerName,
// dispatchOrSendManCode:item.dispatchOrSendManCode,
- scanDate:item.scanDate
+ // scanDate:item.scanDate
+ scanDate:item.scanDate || new Date()
}
);
});
@@ -541,6 +542,10 @@ export default {
this.$modal.msgError(scanRstItem.msg);
return;
}
+ if(scanRstItem.waybillStatus == "50"){
+ this.$modal.msgError("已扫描");
+ return;
+ }
let record =Object.assign({}, scanRstItem)
record.dispatchManCode=this.form.dispatchManCode;
record.signManCode=this.form.signManCode;
diff --git a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
index 9c4c8fae..b156d101 100644
--- a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
@@ -35,11 +35,11 @@
-
-
- 本站发件
- 本站到件
- 本站派件
+
+
+ 本站发件
+ 本站到件
+ 本站派件
diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 18de3b53..9a38616a 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -29,10 +29,10 @@
-
-
-
-
+
+
+
+
@@ -43,8 +43,8 @@
-
-
+
+
@@ -79,50 +79,85 @@
-
+
+ {{ $t("已签收") }}
/>
-
+
{{ parseTime(scope.row.scanDate) }}
-
-
+
+ {{ scope.row.waybillDetail.dispatchManName }}
+
+
- {{ parseTime(scope.row.xxx) }}
+ {{ parseTime(scope.row.waybillDetail.sendDate) }}
-
+
- {{ parseTime(scope.row.xxx) }}
+ {{ parseTime(scope.row.waybillDetail.estimateDate) }}
-
-
-
-
-
+
+
+ {{ scope.row.waybillDetail.transLineTypeName }}
+
+
+
+
+ {{ scope.row.waybillDetail.productTypeName }}
+
+
+
+
+ {{ scope.row.waybillDetail.timeType }}
+
+
+
+
+ {{ scope.row.waybillDetail.registerManName }}
+
+
+
+
+ {{ scope.row.waybillDetail.registerSiteName }}
+
+
- {{ parseTime(scope.row.xxx) }}
+ {{ parseTime(scope.row.waybillDetail.registerDate) }}
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ scope.row.waybillDetail.dataFrom }}
+
+
-
-
+
+
+ {{ scope.row.waybillDetail.receiveCountryName }}
+
+
+
+
+ {{ scope.row.waybillDetail.receiveProvinceName }}
+
+
@@ -260,7 +295,7 @@ export default {
queryParams.orderSN=this.queryParams.billCode;
queryParams.billCode=null;
}
-
+ queryParams.scanType="50";
listEmisTmsScanRecord(queryParams).then(response => {
this.tmsScanList = [];
this.loading = false;
@@ -286,8 +321,10 @@ export default {
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
},
onCountrySelect(item){
- this.form.countryName=item.name;
- this.form.countryCode=item.code;
+ this.queryParams.params.countryName=item.name;
+ this.queryParams.params.countryCode=item.code;
+ // this.form.countryName=item.name;
+ // this.form.countryCode=item.code;
},
onScanSiteSelect(item){
this.queryParams.scanSite=item && item.siteName;
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index ec18ac82..1a37264e 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -501,7 +501,8 @@ export default {
{
billCode:item.billCode,
scanWeight:item.scanWeight,
- dispatchOrSendManCode:item.dispatchOrSendManCode
+ dispatchOrSendManCode:item.dispatchOrSendManCode,
+ scanDate:item.scanDate || new Date()
}
);
}else if(item.scanType=="20") {
@@ -513,7 +514,7 @@ export default {
billCode:item.billCode,
scanWeight:item.scanWeight,
preOrNextStationCode:item.preOrNextStationCode,
- scanDate:item.scanDate
+ scanDate:item.scanDate || new Date()
}
);
}