From dada398007df40060d0577724cd0c884546291b1 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 13 Jun 2024 10:31:09 +0800 Subject: [PATCH 1/3] md --- src/components/CardWithHeader/index.vue | 4 +- .../EmisMonthpayAccountPicker.vue | 15 ++++- .../emis/customerService/traceRecordList.vue | 58 ++++++++++++++++--- .../emis/emisWaybill/sendWaybillList.vue | 17 +++--- .../emis/emisWaybill/waybillPreCalcFee.vue | 15 ++++- 5 files changed, 89 insertions(+), 20 deletions(-) diff --git a/src/components/CardWithHeader/index.vue b/src/components/CardWithHeader/index.vue index dd37b646..18f11e9d 100644 --- a/src/components/CardWithHeader/index.vue +++ b/src/components/CardWithHeader/index.vue @@ -2,7 +2,7 @@
-
+
{{ header }}
@@ -13,7 +13,7 @@ -
+
{{ header }}
diff --git a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue index b35d9d02..adaed7fa 100644 --- a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue +++ b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue @@ -27,6 +27,14 @@ type: String, required: false }, + payee: { + type: String, + required: false + }, + salesmen: { + type: String, + required: false + }, postCode:{ type: String, required: false @@ -84,7 +92,12 @@ initData() { this.loading = true; - let queryParams = {pageNumber:1,pageSize:1300}; + let queryParams = { + pageNumber:1, + pageSize:1300, + payee:this.payee, + salesmen:this.salesmen + }; this.bakOptionItems=[]; this.optionItems=[]; listSimpleEmisMonthpayAccount(queryParams).then(response => { diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue index 0b88612d..d12730b9 100644 --- a/src/views/emis/customerService/traceRecordList.vue +++ b/src/views/emis/customerService/traceRecordList.vue @@ -108,19 +108,59 @@ export default { 快件到达[金边],上一站是[],扫描员是[卿卿];网点:金边联系人:王荣联系电话:0888621888网点:联系人:王荣联系电话:0888621888扫描员:卿卿电话:095588368 [金边]已做派件扫描,扫描员是[卿卿],派件员是[卿卿];网点:金边联系人:王荣联系电话:0888621888扫描员:卿卿电话:095588368派件员:卿卿电话:095588368 快件已[签收],签收网点是[金边],')}签收人是[本人];网点:金边联系人:王荣联系电话:0888621888签收人:本人 + +10 揽收扫描（揽收，接口 2.1 揽收扫描 ） +20 发件扫描 （收，接口 2.1 揽收扫描 ） +30 到件扫描 +40 派件扫描 +50 签收扫描 +51 签收异常 +52 拒收 +60 退回件 +70 留仓扫描 +80 转件扫描 +-1 问题件 +100 入库扫描 +101 出库扫描 +200 合包扫描 +201 拆包扫描 +301 装车扫描 +302 卸车扫描 +700 报关扫描 +701 报关放行 +702 清关失败 +800 清关扫描 +801 清关放行 +802 清关失败 +999 其它 */ let content=''; const scanType=scanRecord.scanType; - // 揽收扫描 if(scanType=="10"){ content='快件在['+scanRecord.scanSite+']已做收件扫描,收件员是['+scanRecord.dispatchOrSendMan+']'; } + // 合包扫描 + else if(scanType=="200"){ + content='快件在['+scanRecord.scanSite+']合包，合包号[['+scanRecord.bagNo+']'; + } + // 拆包扫描 + else if(scanType=="201"){ + content='快件在['+scanRecord.scanSite+']已拆包'; + } // 发件扫描 else if(scanType=="20"){ content='快件已离开['+scanRecord.scanSite+']下一站发往[['+scanRecord.preOrNextStation+']'; } + // 装车扫描 + else if(scanType=="301"){ + content='快件已装车['+scanRecord.scanSite+']下一站发往[['+scanRecord.preOrNextStation+'],车牌号:'+scanRecord.carNo; + } + // 卸车扫描 + else if(scanType=="302"){ + content='快件已卸车['+scanRecord.scanSite+'],车牌号:'+scanRecord.carNo; + } // 到件扫描 else if(scanType=="30"){ content='快件已到达 ['+scanRecord.scanSite+']上一站是[['+scanRecord.preOrNextStation+']'; @@ -134,12 +174,16 @@ export default { content='快件在['+scanRecord.scanSite+']已签收，签收人['+scanRecord.signMan+']'; } // 留仓 - else if(scanType=="60"){ - content='快件[留仓],停留在网点 ['+scanRecord.scanSite+']'; + else if(scanType=="70"){ + content='快件[留仓],停留在网点 ['+scanRecord.scanSite+'],'+scanRecord.remark; } // 转单扫描 - else if(scanType=="70"){ - content='快件[转单],转件网点 ['+scanRecord.scanSite+'],转件人['+scanRecord.scanMan+']'; + else if(scanType=="80"){ + content='快件[转件],转件网点 ['+scanRecord.scanSite+'],转件人['+scanRecord.scanMan+']'; + } + // 转件第三方物流信息,拼接三方公司物流轨迹 + else if(scanType=="81"){ + content=''+scanRecord.remark+''; // 查询转单轨迹 // 拼接三方公司物流轨迹 } @@ -148,11 +192,11 @@ export default { content='已登记问题件,登记网点【['+scanRecord.scanSite+'],登记人['+scanRecord.scanMan+']'; } // 报关扫描 - else if(scanType=="800"){ + else if(scanType=="700"){ content='报关扫描，快件已报关['+scanRecord.scanSite+']下一站发往['+scanRecord.preOrNextStation+']'; } // 清关扫描 - else if(scanType=="900"){ + else if(scanType=="800"){ content='清关扫描，快件已清关['+scanRecord.scanSite+']下一站发往['+scanRecord.preOrNextStation+']'; } // content=''+content+''; diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 77426708..e67d6d75 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -310,6 +310,7 @@ @queryTable="getList" @selection-change="handleSelectionChange" @sort-change="handleSortChange" + @row-dblclick="handleShowTraceInfo" > @@ -339,10 +340,9 @@
- @@ -574,13 +574,13 @@ - - + + - + @@ -622,7 +622,7 @@ import TraceDetail from '@/views/emis/customerService/traceDetail.vue'; import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue'; - +import TraceWaybillDetailView from '@/views/emis/customerService//traceWaybillDetailView.vue'; import {timeDiffTime,timeFormat} from '@/utils/dateUtils' @@ -633,6 +633,7 @@ export default { // name: "DispatchWaybillList", components: { + TraceWaybillDetailView, EmisMonthpayAccountPicker, elDateAdvPicker,emisWaybillForm, CountryPicker1, @@ -683,6 +684,7 @@ export default { billCode:null, openTraceInfo:false, + currentTraceBillItem:null, currentTraceBillCode:null, queryOrderType:null, @@ -891,6 +893,7 @@ export default { }, handleShowTraceInfo(row){ this.currentTraceBillCode=row.billCode; + this.currentTraceBillItem=row; this.openTraceInfo=true; }, handleView(row){ diff --git a/src/views/emis/emisWaybill/waybillPreCalcFee.vue b/src/views/emis/emisWaybill/waybillPreCalcFee.vue index 098ba843..9ba4b218 100644 --- a/src/views/emis/emisWaybill/waybillPreCalcFee.vue +++ b/src/views/emis/emisWaybill/waybillPreCalcFee.vue @@ -63,7 +63,13 @@ - + + + + + + + @@ -75,7 +81,7 @@
- + (m³)
@@ -113,6 +119,7 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue'; import CardWithHeader from '@/components/CardWithHeader/index.vue'; +import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; export default { name: "WaybillPreCalcFee.vue", @@ -122,7 +129,8 @@ export default { TransLinePicker, CountryPicker0, ProvincePicker2, - CardWithHeader + CardWithHeader, + EmisMonthpayAccountPicker }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', @@ -345,6 +353,7 @@ export default { dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode, billWeight: this.form.billWeight, totalVolume: this.form.totalVolume, + custNo: this.form.custNo, customsClear:this.form.customsClear, customsEclaration:this.form.customsEclaration } From c11f249b114bd3b84cfe1f69fe975ee999f507a4 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 13 Jun 2024 10:40:54 +0800 Subject: [PATCH 2/3] md --- src/views/emis/customerService/traceRecordList.vue | 4 +++- src/views/emis/customerService/traceWaybillDetailView.vue | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue index d12730b9..6cb7bc9b 100644 --- a/src/views/emis/customerService/traceRecordList.vue +++ b/src/views/emis/customerService/traceRecordList.vue @@ -17,6 +17,8 @@ + +