aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-16 13:17:23 +08:00
parent c3835dc1a6
commit ed92ef8b3a
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/emis/emisWaybill.js
View File

@ -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) { export function getEmisWaybill(id) {
return request({ return request({

18
src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
View File

@ -320,7 +320,7 @@
</XdTable> </XdTable>
<div style="text-align: center;margin-bottom: 10px;" v-if="!disabled"> <div style="text-align: center;margin-bottom: 10px;" v-if="!disabled">
<el-button type="primary" @click="handleAddCoPack">确 定</el-button> <el-button type="primary" @click="handleAddCoPack">保存批次</el-button>
<el-button @click="handleCancelCo">取 消</el-button> <el-button @click="handleCancelCo">取 消</el-button>
</div> </div>
@ -335,7 +335,7 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">
<el-button type="primary" @click="submitFormBatch">保存批次</el-button> <el-button type="primary" @click="submitFormBatch">确定</el-button>
<el-button @click="cancelBatch">取 消</el-button> <el-button @click="cancelBatch">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -507,7 +507,7 @@
import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch"; import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl"; import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading"; 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 elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm'; import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@ -991,6 +991,7 @@ export default {
} }
} }
this.wayBillData.params.isNeedBatch = 1; this.wayBillData.params.isNeedBatch = 1;
this.wayBillData.params.batchType = this.coData.batchType;
listEmisWaybill(this.wayBillData).then(response => { listEmisWaybill(this.wayBillData).then(response => {
this.loading2 = false; this.loading2 = false;
if(response.code != 200){ if(response.code != 200){
@ -1292,7 +1293,16 @@ export default {
for(let i = 0; i < bcList.length; i++){ for(let i = 0; i < bcList.length; i++){
let billcode = bcList[i].trim(); let billcode = bcList[i].trim();
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){ 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){ if(!billRes || billRes.code != 200){
this.$modal.msgError(billRes && billRes.msg) this.$modal.msgError(billRes && billRes.msg)
return; return;