diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js index bfcb5dec..1e3ccf8f 100644 --- a/src/api/emis/emisWaybill.js +++ b/src/api/emis/emisWaybill.js @@ -121,6 +121,15 @@ export function getEmisWaybillByBillCode(billCode) { }) } +export function getBatchDtl(query) { + return request({ + url: '/emis/emisTmsSiteBatchDtl/getBatchDtl', + method: 'get', + params: query + }) +} + + // 查询运单列表详细 export function getEmisWaybill(id) { return request({ diff --git a/src/views/emis/emisTmsCostFeeSplit/index.vue b/src/views/emis/emisTmsCostFeeSplit/index.vue index 80c03a14..8dc18326 100644 --- a/src/views/emis/emisTmsCostFeeSplit/index.vue +++ b/src/views/emis/emisTmsCostFeeSplit/index.vue @@ -148,7 +148,7 @@ - + diff --git a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue index 93282bf5..ef381ac2 100644 --- a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue +++ b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue @@ -7,10 +7,10 @@ - + - + diff --git a/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue b/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue index 169d7864..106da04e 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue @@ -578,6 +578,9 @@ export default { let packDetail = { batchNo: postForm.batchNo, billCode: billcode, + batchParcelQty: itemBill.parcelQty, + batchWeight: itemBill.billWeight, + batchVolume: itemBill.totalVolume, groupStatus: "1",//已组批次 }; diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index dd2ff970..44b988a8 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -2,49 +2,49 @@
- - + + - - + + - - - - - - -
- 批次名称规则：
-
- 1)快递(E)：
- 快递(E)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-提单号
- ENJDHKM250113+提单号
- 2)空运(A)：
- 空运(A)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-提单号
- ANJNHKM250113+提单号
- 3)陆运(L)：
- 陆运(L)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-车牌
- LNJJTKM250113+车牌
- 4)海运(S)：
- 海运(S)-上海-供应商-西港-250113-提单号
- SSHXG250113+提单号
- 5)铁路(R)：
- 铁路(R)-上海-供应商-南宁-250113-集装箱号
- RSHNN250113+集装箱号
- 6)国内进仓(D)：
+ + + + + + +
+ 批次名称规则：
+
+ 1)快递(E)：
+ 快递(E)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-提单号
+ ENJDHKM250113+提单号
+ 2)空运(A)：
+ 空运(A)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-提单号
+ ANJNHKM250113+提单号
+ 3)陆运(L)：
+ 陆运(L)-南京分拨中心(NJ)-供应商-昆明(KM)-250113-车牌
+ LNJJTKM250113+车牌
+ 4)海运(S)：
+ 海运(S)-上海-供应商-西港-250113-提单号
+ SSHXG250113+提单号
+ 5)铁路(R)：
+ 铁路(R)-上海-供应商-南宁-250113-集装箱号
+ RSHNN250113+集装箱号
+ 6)国内进仓(D)：
同行(D)-上海-供应商-南京分拨中心-250113-运单号/订单号 （顺丰、跨越、百世、安能、中通、申通、货拉拉、运满满等）
- DSHNN250113+运单号/订单号
-
+ DSHNN250113+运单号/订单号
- - +
+ + 批次名称: - + - - - + + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - - + + + + + - - + + - + - - + + - - + + - - - - + + + + - (kg) - - - - + (kg) + + + + - - - - - + + + + + - - + + - - + + - - - - - {{$t('总票数') + ': ' + (form.totalWaybillQty || 0)}} - - - - - {{$t('总重量') + ': ' + (form.totalWeight || 0)}} - - - - - {{$t('总件数') + ': ' + (form.totalParcelQty || 0)}} - - - - - {{$t('总体积') + ': ' + (form.totalVolume || 0)}} - - - - - {{$t('总结算重量') + ': ' + (form.totalSettlementWeight || 0)}} - - - - + + + + + {{$t('总票数') + ': ' + (form.totalWaybillQty || 0)}} + + + + + {{$t('总重量') + ': ' + (form.totalWeight || 0)}} + + + + + {{$t('总件数') + ': ' + (form.totalParcelQty || 0)}} + + + + + {{$t('总体积') + ': ' + (form.totalVolume || 0)}} + + + + + {{$t('总结算重量') + ': ' + (form.totalSettlementWeight || 0)}} + + + + - -
- 装柜示意图 -
+ +
+ 装柜示意图 +
- - - + + + + + + + + + + + - - - - - - - - - - - - + + + + -
- 装柜运单列表 -
- -
- - - 加入运单 - - - 移除运单 - - - 导出 - - -
- - +
+ 装柜运单列表 +
+
+ + + 加入运单 + + + 移除运单 + + + 导出 + + +
+ + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + + - - + + - - - - + + + +
- 保存批次 - 取 消 + 保存批次 + 取 消
- + - - -
+ + +
确定 - 取 消 -
+ 取 消 +
@@ -359,7 +372,7 @@ import { } from "@/api/emis/emisTmsSiteBatch"; import { listEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl"; import { listEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading"; -import { getEmisWaybillByBillCode } from "@/api/emis/emisWaybill"; +import { getEmisWaybillByBillCode, getBatchDtl} from "@/api/emis/emisWaybill"; import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; @@ -393,6 +406,10 @@ export default { required: false }, + name:{ + type:String, + default:'' + } }, components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker,EmisTmsSiteBatchSupplierPicker,EmisTmsSiteBatchNextSitePicker}, dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'], @@ -700,9 +717,14 @@ export default { listEmisTmsSiteBatchDtl({batchNo: batchNo}).then(response => { let rows=response.rows; let cvtBillList=rows.map(item=>{ - return item.waybillDetail + let batchVolume = item.batchVolume; + let batchParcelQty = item.batchParcelQty; + let batchWeight = item.batchWeight; + return { ... item.waybillDetail,batchVolume,batchParcelQty,batchWeight,batchId:item.id}; + // return item.waybillDetail }); this.waitBatchDtlList=cvtBillList; + this.computeTotal(); }); }, @@ -817,12 +839,29 @@ export default { let packDetail = { batchNo:this.form.batchNo, billCode: item.billCode, + batchParcelQty: item.parcelQty, + batchWeight: item.billWeight, + batchVolume: item.totalVolume, scanDate: null, scanStatus: "0", groupStatus: "1",//已组批次 scanMan: null, scanSite: null, }; + if(this.form.id != null){ // 编辑 + // packDetail.id = item.id; + packDetail.id = item.batchId; + } + if(item.batchVolume) { + packDetail.batchVolume = item.batchVolume; + } + if(item.batchParcelQty) { + packDetail.batchParcelQty = item.batchParcelQty; + } + if(item.batchWeight){ + packDetail.batchWeight = item.batchWeight; + } + this.form.batchDtlList.push(packDetail); } @@ -887,6 +926,7 @@ export default { this.$modal.msgError("请输入单号"); return; } + // 剔除重复值，并剔除已存在列表中的数据 let addBillCodeArr=this.inputBatchBillCode.trim().split(/[；\;\,\，\n]/)||[]; @@ -903,11 +943,27 @@ export default { for(let i = 0; i < billCodeArr.length; i++){ let billcode = billCodeArr[i].trim(); - getEmisWaybillByBillCode(billcode).then(res=>{ - let item=res.data; + let queryParams = { + billCode: billcode, + params:{ + startSiteCode: this.form.startSiteCode, + nextSiteCode: this.form.nextSiteCode, + supplierCode: this.form.supplierCode + } + } + getBatchDtl(queryParams).then(res=>{ + const billData = res.data; + const originalParcelQty = billData.batchParcelQty!==null?billData.batchParcelQty:billData.waybillDetail.parcelQty; + const originalBillWeight = billData.batchWeight!==null?billData.batchWeight:billData.waybillDetail.billWeight; + const originalTotalVolume = billData.batchVolume!==null?billData.batchVolume:billData.waybillDetail.totalVolume; + + let item = {...billData.waybillDetail,"batchParcelQty":billData.batchParcelQty,"batchWeight":billData.batchWeight,"batchVolume":billData.batchVolume, "originalParcelQty": originalParcelQty, "originalBillWeight": originalBillWeight, "originalTotalVolume": originalTotalVolume}; //新增字段存 剩余件数 + + + this.waitBatchDtlList.push(item); this.computeTotal(); - }); + }) } this.titleBatch=""; this.openBatch=false; @@ -956,9 +1012,9 @@ export default { let totalVolume=0; let totalSettlementWeight=0; this.waitBatchDtlList.forEach(item =>{ - totalParcelQty +=item.parcelQty; - totalWeight +=item.billWeight; - totalVolume +=item.totalVolume; + totalParcelQty +=(item.batchParcelQty!==null?item.batchParcelQty:item.parcelQty); + totalWeight +=(item.batchWeight!==null?item.batchWeight:item.billWeight); + totalVolume +=(item.batchVolume!==null?item.batchVolume:item.totalVolume); totalSettlementWeight +=item.settlementWeight; item.destCountry = this.form.destCountry; // item.sendSiteCode = this.form.sendSiteCode; @@ -982,6 +1038,18 @@ export default { this.getList(); }, handleAddWayBill(){ + if(this.form.startSiteCode == null || this.form.startSiteCode == ''){ + this.$modal.msgError("请选择起始网点"); + return; + } + if(this.form.nextSiteCode == null || this.form.nextSiteCode == ''){ + this.$modal.msgError("请选择下一网点"); + return; + } + if(this.form.supplierCode == null || this.form.supplierCode == ''){ + this.$modal.msgError("请选择供应商"); + return; + } this.openBatch = true; this.titleBatch = "批量输入运单号"; }, diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue index 577f8c46..b2d590bb 100644 --- a/src/views/emis/emisTmsSiteBatchMiss/index.vue +++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue @@ -42,6 +42,7 @@ +