diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js index 4ae5a823..b80f92cd 100644 --- a/src/api/emis/emisWaybill.js +++ b/src/api/emis/emisWaybill.js @@ -97,6 +97,14 @@ export function getWaybillDetail(billCode) { }) } +export function getEmisWaybillByBillCode(billCode) { + return request({ + url: '/emis/emisWaybill/getEmisWaybillByBillCode', + method: 'get', + params: {billCode: billCode} + }) +} + // 查询运单列表详细 export function getEmisWaybill(id) { return request({ diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue index ff790570..08983014 100644 --- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue +++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue @@ -320,7 +320,7 @@
- 确 定 + 保存批次 取 消
@@ -335,7 +335,7 @@ @@ -507,7 +507,7 @@ import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch"; import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl"; import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading"; -import { listEmisWaybill, getWaybillDetail } from "@/api/emis/emisWaybill"; +import { listEmisWaybill, getEmisWaybillByBillCode } from "@/api/emis/emisWaybill"; // import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; @@ -991,6 +991,7 @@ export default { } } this.wayBillData.params.isNeedBatch = 1; + this.wayBillData.params.batchType = this.coData.batchType; listEmisWaybill(this.wayBillData).then(response => { this.loading2 = false; if(response.code != 200){ @@ -1292,7 +1293,16 @@ export default { for(let i = 0; i < bcList.length; i++){ let billcode = bcList[i].trim(); if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){ - let billRes = await listEmisWaybill({billCode:billcode}); + + let billRes = await listEmisWaybill( + { + billCode:billcode, + params:{ + isNeedBatch:1, + batchType:this.coData.batchType + } + } + ); if(!billRes || billRes.code != 200){ this.$modal.msgError(billRes && billRes.msg) return;