-
+
+
diff --git a/src/views/emis/emisTmsPack/PackList.vue b/src/views/emis/emisTmsPack/PackList.vue
index 1bde72e6..6f7b783d 100644
--- a/src/views/emis/emisTmsPack/PackList.vue
+++ b/src/views/emis/emisTmsPack/PackList.vue
@@ -54,6 +54,7 @@
storageName="emisTmsPackList_main1_240702"
+
border
ref="table"
size="small"
@@ -253,6 +254,7 @@ export default {
},
// 选择表格数据
handleSelectionChange(selection){
+ this.selectionList=selection;
// let destCountry = "";
this.canSelectList = [];
for(let i = 0; i < selection.length; i++){
@@ -361,19 +363,12 @@ export default {
handleDoneSelectionChange(){
},
+
/** 查询TMS合包列表 */
getList() {
this.loading = true;
this.emisTmsPackList = [];
- // if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- // this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
- // this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1]));
- // }
- // this.queryParams.params["beginSendDate"] = null;
- // this.queryParams.params["endSendDate"] = null;
- // this.queryParams.params["isNeedPack"] = null;
- // this.queryParams.destCountry = this.queryParams.receiveCountry;
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
listEmisTmsPack(this.queryParams).then(response => {
this.emisTmsPackList = response.rows;
@@ -389,7 +384,6 @@ export default {
if(this.selectionList&&this.selectionList.length>0){
this.exportData(this.selectionList,loadingInstance);
- // this.$refs.refTable.exportData('寄件运单查询',this.selectionList,this.formatJson,loadingInstance)
}
else{
@@ -408,7 +402,7 @@ export default {
exportData(selData,loadingInstance){
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
- const exportParam=this.$refs.refTable.getExportParam();
+ const exportParam=this.$refs.table.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
@@ -428,63 +422,17 @@ export default {
if (j === 'index') {
return ++index
}
- if (j === 'kjlx') {
- return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+ if (j === 'packStatus') {
+ return this.selectDictLabel(this.dict.type.emis_pack_status,v[j]);
}
- if (j === 'fjr') {
- return v['sendName']+'--'+v['receiveName'];
- }
- if (j === 'sendMobile') {
- return "";
- }
- if (j === 'paymentStatus') {
- return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+ if (j === 'blUnpack') {
+ if(v[j] == 1){
+ return '是';
+ }else{
+ return '否';
+ }
}
- if (j === 'pickupMethod') {
- return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
- }
- if (j === 'customsEclaration') {
- return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
- }
- if (j === 'customsClear') {
- return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
- }
- if (j === 'packType') {
- return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
- }
-
- if (j === 'dispatchMethod') {
- if(v[j] == 1){
- return '派送';
- }else{
- return '自提';
- }
- }
- if (j === 'blMessage') {
- if(v[j] == 1){
- return '发送';
- }else{
- return '不发送';
- }
- }
- if (j === 'blAcceptMessage') {
- if(v[j] == 1){
- return '发送';
- }else{
- return '不发送';
- }
- }
- if (j === 'blSign') {
- if(v[j] == 1){
- return '已签收';
- }else{
- return '未签收';
- }
- }
- if (j === 'paymentType') {
- return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
- }
return v[j]
}))
},
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index abb180e3..0eb5ca7d 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -555,7 +555,7 @@ export default {
this.$refs.tanexPrinter.downPDF(orderList,false,null,this.currentSelection);
},
initQueryParams(){
- this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
+ this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
let qParam=null;
if(this.queryParams.billCode){
qParam={
@@ -564,7 +564,7 @@ export default {
billCode:this.queryParams.billCode,
}
}else{
- qParam=this.queryParams
+ qParam={...this.queryParams}
}
return qParam;
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 7d816e7e..2ef7d3d3 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -115,6 +115,22 @@
+
+
+
+ 附加信息
+
+
+ {{billDetail.extInfo}}
+
+
+
+
+
+
+
+
+