diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index 3e516070..53f3d64b 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -288,6 +288,7 @@ :height="(slotProps.contentHeight-200)+'px'" border stripe size="small" + ref="table" :data="emisTmsPackList" :showSearch.sync="showSearch" :queryParams="queryParams" @@ -977,18 +978,34 @@ export default { break; } }, - async expandChange(row){ - // row.packNo - this.emisTmsDonePackList=[]; - let resList = await listEmisTmsPackDtl({packNo: row.packNo}); - if(!resList || resList.code != 200){ - this.$message.error(resList && resList.msg || "未知错误"); + expandChange(row, expandedRows){ + if(expandedRows.length==0){// 没有扩展的行 + this.currentExpandedRow = null; return; } - // this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验 - // this.tempCoPackInfo = resData; - for(let p = 0; p < resList.rows.length;p++){ - this.emisTmsDonePackList.push(resList.rows[p].waybillDetail); + if(this.currentExpandedRow && expandedRows.length == 1 && expandedRows[0].packNo == this.currentExpandedRow.packNo){// 已经查询过了 + return; + } + this.loading = true; + this.currentExpandedRow = row; + this.emisTmsDonePackList=[]; + listEmisTmsPackDtl({packNo: row.packNo}).then(resList => { + if(!resList || resList.code != 200){ + this.$message.error(resList && resList.msg || "未知错误"); + return; + } + for(let p = 0; p < resList.rows.length;p++){ + this.emisTmsDonePackList.push(resList.rows[p].waybillDetail); + } + this.doneTotal = resList.total; + this.loading = false; + }); + if(expandedRows.length > 1){ + for(let i = 0; i < expandedRows.length; i++){ + if(row.packNo != expandedRows[i].packNo){ + this.$refs.table.$refs.table.$refs.elTable.toggleRowExpansion(expandedRows[i], false); + } + } } }, donothing(){ diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue index 55745869..c1f616ea 100644 --- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue +++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue @@ -285,6 +285,9 @@ + + + 0 ? this.waitPackList[0].receiveCountry : ''; + // // 将选中的“待组批次”的运单 置为 追加的运单号 + // for(let p = 0; p < this.waitPackList.length;p++){ + // if(this.waitPackList[p].receiveCountry != firstItemCountry){ + // this.$message.error("存在了不同的目的国家！"); + // this.emisCoPackDetail=[]; + // return ; + // } + // this.emisCoPackDetail.push(this.waitPackList[p]); + // } + let res = this.$refs.packListView.getPackBillList(); + if(res.code == -1){ + this.$message.error(res.message); + return; + } + this.emisCoPackDetail = [...res.list]; } this.tempExistCoPackWayBillList = [];// 清空临时保存的已有运单号 this.tempCoPackInfo={}; diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue new file mode 100644 index 00000000..04561a12 --- /dev/null +++ b/src/views/emis/emisTmsSiteBatch/packListView.vue @@ -0,0 +1,367 @@ + + + + + + diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue index 1a8754ba..c67709e5 100644 --- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue @@ -100,6 +100,24 @@ @click="getList" >导出 + +
+
+ 未回复 +
+
+ 已回复 +
+ +
+ 已处理 +
+ +
+ 已查看未处理 +
+
+ @@ -112,7 +130,8 @@ @@ -150,17 +169,23 @@ - + + + - + @@ -741,4 +766,33 @@ export default { vertical-align: top; white-space: nowrap; } + + .color-label { + padding: 5px 6px; + display: inline-block; + vertical-align: top; + } + + .color-label > .item{ + max-width: 120px; + min-width: 70px; + font-weight: bold; + text-align: center; + }; + + .noReply{ + background-color: rgb(255, 105, 180); + } + + .isRepay{ + background-color: rgb(0, 250, 154); + } + + .isDeal{ + background-color: rgb(240, 230, 140); + } + + .isSeeNoDeal{ + background-color: rgb(220, 220, 220); + } diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index 36baaf10..8473553d 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -179,7 +179,7 @@ diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue index 3a19f660..f31feb77 100644 --- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue @@ -92,6 +92,24 @@ @click="getList" >导出 + +
+
+ 未回复 +
+
+ 已回复 +
+ +
+ 已处理 +
+ +
+ 已查看未处理 +
+
+ @@ -104,7 +122,8 @@ @@ -142,17 +161,23 @@ - + + + - + @@ -880,4 +905,33 @@ export default { vertical-align: top; white-space: nowrap; } + + .color-label { + padding: 5px 6px; + display: inline-block; + vertical-align: top; + } + + .color-label > .item{ + max-width: 120px; + min-width: 70px; + font-weight: bold; + text-align: center; + }; + + .noReply{ + background-color: rgb(255, 105, 180); + } + + .isRepay{ + background-color: rgb(0, 250, 154); + } + + .isDeal{ + background-color: rgb(240, 230, 140); + } + + .isSeeNoDeal{ + background-color: rgb(220, 220, 220); + }