diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index c1f616ea..cdd22236 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -1244,6 +1244,11 @@ export default {
onDateSelect(value){
console.log("date picker---->", 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){
console.log("date picker---->", value)
@@ -1731,7 +1736,7 @@ export default {
// }
// this.emisCoPackDetail.push(this.waitPackList[p]);
// }
- let res = this.$refs.packListView.getPackBillList();
+ let res = await this.$refs.packListView.getPackBillList();
if(res.code == -1){
this.$message.error(res.message);
return;
diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue
index 04561a12..7a1d7787 100644
--- a/src/views/emis/emisTmsSiteBatch/packListView.vue
+++ b/src/views/emis/emisTmsSiteBatch/packListView.vue
@@ -64,7 +64,11 @@
-
+
+
+ {{ scope.row.receiveName }}
+
+
{{ scope.row.receiveCompany }}
@@ -200,6 +204,7 @@ export default {
}
},
async getPackBillList(){
+ debugger;
let billList = [];
let destCountry = "";
for(let i = 0; i < this.canSelectList.length; i++ ){
@@ -212,7 +217,7 @@ export default {
};
}
for(let p = 0; p < resList.rows.length;p++){
- if(resList.rows[p].main_bill_code){
+ if(resList.rows[p].mainBillCode){
if(!destCountry){
destCountry = resList.rows[p].destCountry;
}else if(destCountry != resList.rows[p].destCountry){
@@ -353,7 +358,13 @@ export default {
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 {
display: none; /* 隐藏checkbox */
}