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

组批次页面，完善选择合包去组批次的逻辑

Browse Source
This commit is contained in:
liuyp 2024-06-22 19:40:17 +08:00
parent ce50947ceb
commit 5f12990e04
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
View File

@ -1244,6 +1244,11 @@ export default {
onDateSelect(value){ onDateSelect(value){
console.log("date picker---->", value) console.log("date picker---->", value)
this.dateTimeRange=value; this.dateTimeRange=value;
if(this.queryParams.params.queryOrderDateType == '1'){
// 下单时间
this.queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
this.queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
}
}, },
onWayBillDateSelect(value){ onWayBillDateSelect(value){
console.log("date picker---->", value) console.log("date picker---->", value)
@ -1731,7 +1736,7 @@ export default {
// } // }
// this.emisCoPackDetail.push(this.waitPackList[p]); // this.emisCoPackDetail.push(this.waitPackList[p]);
// } // }
let res = this.$refs.packListView.getPackBillList(); let res = await this.$refs.packListView.getPackBillList();
if(res.code == -1){ if(res.code == -1){
this.$message.error(res.message); this.$message.error(res.message);
return; return;

17
src/views/emis/emisTmsSiteBatch/packListView.vue
View File

@ -64,7 +64,11 @@
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" /> <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" /> <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" /> <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100"> <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCompany }}</span> <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
@ -200,6 +204,7 @@ export default {
} }
}, },
async getPackBillList(){ async getPackBillList(){
debugger;
let billList = []; let billList = [];
let destCountry = ""; let destCountry = "";
for(let i = 0; i < this.canSelectList.length; i++ ){ for(let i = 0; i < this.canSelectList.length; i++ ){
@ -212,7 +217,7 @@ export default {
}; };
} }
for(let p = 0; p < resList.rows.length;p++){ for(let p = 0; p < resList.rows.length;p++){
if(resList.rows[p].main_bill_code){ if(resList.rows[p].mainBillCode){
if(!destCountry){ if(!destCountry){
destCountry = resList.rows[p].destCountry; destCountry = resList.rows[p].destCountry;
}else if(destCountry != resList.rows[p].destCountry){ }else if(destCountry != resList.rows[p].destCountry){
@ -353,7 +358,13 @@ export default {
font-weight: normal; font-weight: normal;
} }
} }
.ellipsis {
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;
}
.el-table .disabled-row .cell .el-checkbox__inner { .el-table .disabled-row .cell .el-checkbox__inner {
display: none; /* 隐藏checkbox */ display: none; /* 隐藏checkbox */
} }