From 70963fdf5e0db5aabe88ea92601b9f9dec57244f Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 8 Jun 2024 21:10:56 +0800 Subject: [PATCH] md --- src/api/emis/emisTmsScanRecord.js | 9 + .../DatePickerAdv/elDateAdvPicker.vue | 94 +- src/utils/dateUtils.js | 6 +- .../CustomerAddressSimplePicker.vue | 4 + .../emis/emisWaybill/centerWaybillList.vue | 103 ++- .../emis/emisWaybill/dispatchWaybillList.vue | 109 ++- .../emis/emisWaybill/emisWaybillDetail.vue | 864 ------------------ .../emis/emisWaybill/sendWaybillList.vue | 119 ++- 8 files changed, 243 insertions(+), 1065 deletions(-) delete mode 100644 src/views/emis/emisWaybill/emisWaybillDetail.vue diff --git a/src/api/emis/emisTmsScanRecord.js b/src/api/emis/emisTmsScanRecord.js index 6fa19e2a..a6442ede 100644 --- a/src/api/emis/emisTmsScanRecord.js +++ b/src/api/emis/emisTmsScanRecord.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { data } from 'jquery' // 扫描操作记录 export function doScan(data) { @@ -9,6 +10,14 @@ export function doScan(data) { }) } +export function queryWaybillTraceInfo(appId,trackingNo,lang,sign) { + return request({ + url: '/emis/emisTmsScanRecord/queryWaybillTraceInfo', + method: 'get', + params:{appId:appId,trackingNo:trackingNo,lang:lang,sign:sign} + }) +} + // 签收异常数据对比 export function queryStatList(query){ return request({ diff --git a/src/components/DatePickerAdv/elDateAdvPicker.vue b/src/components/DatePickerAdv/elDateAdvPicker.vue index 56cde078..b0b46c19 100644 --- a/src/components/DatePickerAdv/elDateAdvPicker.vue +++ b/src/components/DatePickerAdv/elDateAdvPicker.vue @@ -1,38 +1,34 @@ + - + diff --git a/src/utils/dateUtils.js b/src/utils/dateUtils.js index 38ff964f..16513ede 100644 --- a/src/utils/dateUtils.js +++ b/src/utils/dateUtils.js @@ -40,7 +40,11 @@ export function timeAdd(date, num = 1, nuit = "day", format = "YYYY-MM-DD") { * date 需要格式化的数据 * format 格式化的格式 */ -export function timeFormat(date, format = "YYYY-MM-DD") { +export function timeFormat(date, format = "YYYY-MM-DD HH:mm:ss") { + return dayjs(date).format(format); +} + +export function timeFormatDay(date, format = "YYYY-MM-DD") { return dayjs(date).format(format); } diff --git a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue index ecd57700..633c1295 100644 --- a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue @@ -71,6 +71,9 @@ export default { type: [String, Number], required: false }, + useSiteCode:{ + type:[String,Number] + }, addressType:{ type:[String,Number] }, @@ -115,6 +118,7 @@ export default { pageNum:1, pageSize:5, searchValue:null, + useSiteCode:this.useSiteCode, addressType: this.addressType, country:this.countryCode, } diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue index a1255b26..8bee4f37 100644 --- a/src/views/emis/emisWaybill/centerWaybillList.vue +++ b/src/views/emis/emisWaybill/centerWaybillList.vue @@ -65,7 +65,7 @@ - +
@@ -73,7 +73,7 @@
- + 超时未签收 @@ -338,7 +338,27 @@ - + + + + + + + @@ -586,8 +605,10 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; +import TraceDetail from '@/views/emis/customerService/traceDetail.vue'; -import {dateToStr} from '@/utils/custom' +import {timeDiffTime,timeFormat} from '@/utils/dateUtils' +import { formatSearchStr,deepClone } from '@/utils/index' export default { name: "SendWaybillList", @@ -607,7 +628,9 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, - ProblemTypePicker + ProblemTypePicker, + + TraceDetail }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', @@ -640,6 +663,10 @@ export default { titleForm: "", billCode:null, + openTraceInfo:false, + currentTraceBillCode:null, + dateRange:[], + queryOrderType:null, queryOrderDateType:null, queryExpireNotSign:null, @@ -827,23 +854,21 @@ export default { }; }, created() { - const end = new Date() + if(this.$store.getters.ownerSiteCode!='88888'){ + this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; + } const start = new Date() + const end = new Date() + start.setHours(0,0,0,0) end.setHours(23,59,59,0) - this.dateTimeRange=[start,end]; + this.dateRange=[timeFormat(start), timeFormat(end)] - this.getList(); this.queryOrderType="1"; this.queryOrderDateType="1"; - // this.queryExpireNotSign="1" + // this.queryExpireNotSign="1" - // 调整表格的高度，不允许滚动 - this.$nextTick(function() { - let queryFormEl = this.$refs.queryForm.$el; - let tableH = queryFormEl.offsetHeight+190; - this.tableHeight = window.innerHeight - tableH; - }); + this.getList(); }, mounted() { const end = new Date() @@ -853,17 +878,25 @@ export default { this.dateTimeRange=[start,end]; }, methods: { + calcDeliveryTime(startData,endDate){ + return timeDiffTime(startData,endDate) + }, //标红table指定行 tableRowClassName({row, rowIndex}) { - if (row.blIsQuestion=='1') { - return 'warning-row'; - } - else if (row.waybillStatus=='50') { + + if (row.blSign=='1') { return 'success-row'; } + else if (row.blIsQuestion=='1') { + return 'warning-row'; + } return ''; }, + handleShowTraceInfo(row){ + this.currentTraceBillCode=row.billCode; + this.openTraceInfo=true; + }, /** 查询运单列表列表 */ getList() { this.loading = true; @@ -871,13 +904,14 @@ export default { // this.queryOrderType="1"; // this.queryOrderDateType="1"; - if(this.queryParams.billCode){ + if(this.queryParams.billCode){ if(this.queryOrderType != "1"){ - this.queryParams.orderSn=this.queryParams.billCode+""; - this.queryParams.billCode=null; + this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode); + this.queryParams.billCode=null; }else{ // 处理子单号 - let billArr = this.queryParams.billCode.split(","); + let qBillCode=formatSearchStr(this.queryParams.billCode); + let billArr = qBillCode.split(","); let newBillCodeStr=""; billArr.forEach(item=>{ if(item.startsWith("T")){ @@ -891,21 +925,8 @@ export default { } } - if(this.dateTimeRange&&this.dateTimeRange.length==2){ + this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate"); - let startDate = new Date(this.dateTimeRange[0]); - let endDate= new Date(this.dateTimeRange[1]); - startDate=dateToStr(startDate); - endDate=dateToStr(endDate) - - if(this.queryOrderDateType != "1"){ - this.queryParams.params["beginCreateTime"] = startDate; - this.queryParams.params["endCreateTime"] = endDate; - }else{ - this.queryParams.params["beginSendDate"] = startDate; - this.queryParams.params["endSendDate"] = endDate; - } - } listEmisWaybill(this.queryParams).then(response => { this.emisWaybillList = response.rows; diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue index 11259d89..a2ddcab1 100644 --- a/src/views/emis/emisWaybill/dispatchWaybillList.vue +++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue @@ -22,13 +22,13 @@ - +
发货时间
- + 超时未签收 @@ -332,7 +332,28 @@ - + + + + + + + + @@ -578,8 +596,10 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; +import TraceDetail from '@/views/emis/customerService/traceDetail.vue'; -import {dateToStr} from '@/utils/custom' +import {timeDiffTime,timeFormat} from '@/utils/dateUtils' +import { formatSearchStr,deepClone } from '@/utils/index' export default { // name: "SendWaybillList", @@ -599,7 +619,9 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, - ProblemTypePicker + ProblemTypePicker, + + TraceDetail }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', @@ -632,6 +654,9 @@ export default { titleForm: "", billCode:null, + openTraceInfo:false, + currentTraceBillCode:null, + queryOrderType:null, queryOrderDateType:null, queryExpireNotSign:null, @@ -640,26 +665,9 @@ export default { id:null, titleView:"", openView: false, - // 更新网点时间范围 - daterangeOrderDate: [], - // 更新网点时间范围 - daterangeEstimateDate: [], - // 更新网点时间范围 - daterangePickStartDate: [], - // 更新网点时间范围 - daterangePickFinishDate: [], - // 更新网点时间范围 - daterangeDispFdDate: [], - // 更新网点时间范围 - daterangeRegisterDate: [], - // 更新网点时间范围 - daterangeSendDate: [], - // 更新网点时间范围 - daterangeProduceBillDate: [], - // 更新网点时间范围 - daterangeCreateTime: [], - // 更新网点时间范围 - daterangeUpdateTime: [], + + dateRange:[], + // 查询参数 queryParams: { pageNum: 1, @@ -819,22 +827,38 @@ export default { }; }, created() { - this.queryParams.dispatchSiteCode=this.$store.getters.ownerSiteCode; + + if(this.$store.getters.ownerSiteCode!='88888'){ + this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; + } + const start = new Date() + const end = new Date() + + start.setHours(0,0,0,0) + end.setHours(23,59,59,0) + this.dateRange=[timeFormat(start), timeFormat(end)] + this.queryOrderType="1"; this.queryOrderDateType="1"; - // this.queryExpireNotSign="1" + // this.queryExpireNotSign="1" this.getList(); - }, mounted() { }, methods: { + calcDeliveryTime(startData,endDate){ + return timeDiffTime(startData,endDate) + }, + handleShowTraceInfo(row){ + this.currentTraceBillCode=row.billCode; + this.openTraceInfo=true; + }, //标红table指定行 - tableRowClassName({row, rowIndex}) { + tableRowClassName({row, rowIndex}) { if (row.blIsQuestion=='1') { return 'warning-row'; } @@ -848,15 +872,15 @@ export default { /** 查询运单列表列表 */ getList() { this.loading = true; - this.queryParams.params = {}; if(this.queryParams.billCode){ if(this.queryOrderType != "1"){ - this.queryParams.orderSn=this.queryParams.billCode+""; - this.queryParams.billCode=null; + this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode); + this.queryParams.billCode=null; }else{ // 处理子单号 - let billArr = this.queryParams.billCode.split(","); + let qBillCode=formatSearchStr(this.queryParams.billCode); + let billArr = qBillCode.split(","); let newBillCodeStr=""; billArr.forEach(item=>{ if(item.startsWith("T")){ @@ -870,13 +894,8 @@ export default { } } - if(this.dateTimeRange&&this.dateTimeRange.length==2){ - if(this.queryOrderDateType != "1"){ - this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime"); - }else{ - this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate"); - } - } + this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate"); + listEmisWaybill(this.queryParams).then(response => { this.emisWaybillList = response.rows; diff --git a/src/views/emis/emisWaybill/emisWaybillDetail.vue b/src/views/emis/emisWaybill/emisWaybillDetail.vue deleted file mode 100644 index b0038123..00000000 --- a/src/views/emis/emisWaybill/emisWaybillDetail.vue +++ /dev/null @@ -1,864 +0,0 @@ - - - - - - diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue index 6b36c6f1..b8e13727 100644 --- a/src/views/emis/emisWaybill/sendWaybillList.vue +++ b/src/views/emis/emisWaybill/sendWaybillList.vue @@ -25,13 +25,13 @@ - +
发货时间
- + 超时未签收 @@ -330,8 +330,28 @@ - - + + + + + + + + @@ -580,8 +599,11 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; +import TraceDetail from '@/views/emis/customerService/traceDetail.vue'; -import {dateToStr} from '@/utils/custom' + + +import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import { formatSearchStr,deepClone } from '@/utils/index' export default { @@ -602,7 +624,9 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, - ProblemTypePicker + ProblemTypePicker, + + TraceDetail }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', @@ -623,8 +647,7 @@ export default { multiple: true, // 显示搜索条件 showSearch: true, - // 创建时间搜索 - dateTimeRange:[], + // 总条数 total: 0, // 运单列表表格数据 @@ -635,6 +658,9 @@ export default { titleForm: "", billCode:null, + openTraceInfo:false, + currentTraceBillCode:null, + queryOrderType:null, queryOrderDateType:null, queryExpireNotSign:null, @@ -643,26 +669,9 @@ export default { id:null, titleView:"", openView: false, - // 更新网点时间范围 - daterangeOrderDate: [], - // 更新网点时间范围 - daterangeEstimateDate: [], - // 更新网点时间范围 - daterangePickStartDate: [], - // 更新网点时间范围 - daterangePickFinishDate: [], - // 更新网点时间范围 - daterangeDispFdDate: [], - // 更新网点时间范围 - daterangeRegisterDate: [], - // 更新网点时间范围 - daterangeSendDate: [], - // 更新网点时间范围 - daterangeProduceBillDate: [], - // 更新网点时间范围 - daterangeCreateTime: [], - // 更新网点时间范围 - daterangeUpdateTime: [], + + // 时间搜索 + dateRange:[], // 查询参数 queryParams: { pageNum: 1, @@ -829,11 +838,7 @@ export default { const start = new Date() start.setHours(0,0,0,0) end.setHours(23,59,59,0) - this.datetimeRange=[start, end] - this.datetimeRange[0]=dateToStr(this.datetimeRange[0]); - this.datetimeRange[1]=dateToStr(this.datetimeRange[1]); - console.log(this.datetimeRange) - + this.dateRange=[timeFormat(start), timeFormat(end)] this.queryOrderType="1"; this.queryOrderDateType="1"; @@ -845,23 +850,29 @@ export default { }, methods: { + calcDeliveryTime(startData,endDate){ + return timeDiffTime(startData,endDate) + }, //标红table指定行 tableRowClassName({row, rowIndex}) { - if (row.blIsQuestion=='1') { - return 'warning-row'; - } - else if (row.waybillStatus=='50') { + + if (row.blSign=='1') { return 'success-row'; } + else if (row.blIsQuestion=='1') { + return 'warning-row'; + } return ''; }, + handleShowTraceInfo(row){ + this.currentTraceBillCode=row.billCode; + this.openTraceInfo=true; + }, /** 查询运单列表列表 */ getList() { this.loading = true; - - // this.queryOrderType="1"; // this.queryOrderDateType="1"; if(this.queryParams.billCode){ @@ -885,18 +896,7 @@ export default { } } - console.log(this.dateTimeRange); - // if(this.dateTimeRange&&this.dateTimeRange.length==2){ - // this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime"); - this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate"); - - // if(this.queryOrderDateType != "1"){ - // }else{ - // } - // } - - - console.log(this.queryParams); + this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate"); listEmisWaybill(this.queryParams).then(response => { this.emisWaybillList = response.rows; @@ -906,7 +906,7 @@ export default { }, onDateSelect(value){ - this.dateTimeRange=value; + // this.dateTimeRange=value; // scanDate }, /** 搜索按钮操作 */ @@ -1016,10 +1016,7 @@ export default { getIndex($index) { return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1 }, - /** 时间搜索响应函数 */ - dateTimeChange(value){ - this.dateTimeRange=value; - }, + } };