diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue
index 96a95e2c..7e9666fa 100644
--- a/src/views/emis/customerService/traceWaybillDetailView.vue
+++ b/src/views/emis/customerService/traceWaybillDetailView.vue
@@ -76,7 +76,7 @@ import BillPicList from './billPicList.vue';
import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
import { getWaybillDetail } from "@/api/emis/emisWaybill";
-import { getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord";
+import { queryLastRecord,getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -174,7 +174,11 @@ export default {
this.active=2;
}
});
-
+ },
+ showLastTrace(billCode){
+ queryLastRecord(item.billCode).then(response => {
+ let data=response.data;
+ });
},
onCanSeeBillDetail(isCan){
diff --git a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
index 139a4f6b..9ff88298 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
@@ -38,7 +38,7 @@
clearable
v-model="queryParams.scanType"
>
-
+
@@ -296,8 +296,9 @@ export default {
status: null,
delFlag: null,
remark: null,
- params:{},//扩展参数
-
+ params:{
+ scanQueryType:1,
+ },//扩展参数
// scanSite:null,
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：0
// scanType:"",
@@ -326,14 +327,14 @@ export default {
};
},
created() {
-
- },
- mounted() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[timeFormat(start), timeFormat(end)]
+ },
+ mounted() {
+
},
methods: {
initQueryParams(){
@@ -354,52 +355,11 @@ export default {
/** 查询扫描记录列表 */
getList() {
this.loading = true;
- // this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
- // this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
-
- // let queryType = this.queryParams.queryType;
- // if(queryType == "1"){
- // this.queryParams.orderSN=null;
- // }else if(queryType == "0"){
- // this.queryParams.orderSN=this.queryParams.billCode;
- // this.queryParams.billCode=null;
- // }
-
let qParam=this.initQueryParams();
-
listEmisTmsScanRecord(qParam).then(response => {
- this.scanRecordDataList = [];
- // this.total = 0;
this.loading = false;
- // let rows = response.rows;
this.scanRecordDataList= response.rows;
this.total = response.total;
- // if(!rows || rows.length == 0){
- // this.$modal.msgError("未查到单号");
- // return;
- // }
- // for (let index = 0; index < rows.length; index++) {
- // let scanRstItem = rows[index];
- // console.log(scanRstItem);
-
- // let record =Object.assign({}, scanRstItem)
- // // record.carNo=scanRstItem.carNo;
- // // record.scanData=scanRstItem.scanData;
- // // record.scanType=scanRstItem.scanType;
- // // if(queryType == "1"){
- // // this.queryParams.orderSN=null;
- // // }
- // record.queryType = this.queryParams.queryType;
- // record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- // record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- // // record.createTime=scanRstItem.createTime;
- // // record.scanWeight=scanRstItem.scanWeight;
- // // console.log(record)
- // // let indexBillCode=record.billCode;
- // // this.dataMap[indexBillCode]=record;
- // // this.emisTmsScanRecordList.push(record);
- // this.scanRecordDataList.push(record);
- // }
});
},
// 取消按钮
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 2081ff69..ddf0fd7b 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -1637,7 +1637,9 @@ methods: {
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
- this.calcBillFee();
+ // this.calcBillFee();
+ this.handleCalcSettlementWeight();
+
}
},
onSendSiteSelect(item){
@@ -2317,22 +2319,6 @@ methods: {
pointer-events: auto;
}
-// .notify-success{
-// top: 1.7rem !important;
-// right: 0.32rem !important;
-// width: 2rem !important;
-// height: 0.96rem !important;
-// background: rgba(131, 213, 134, 0.1) !important;
-// border-radius: 0.04rem 0px 0px 0.04rem !important;
-// }
-// .notify-error{
-// top: 2.7rem !important;
-// right: 0.32rem !important;
-// width: 2rem !important;
-// height: 0.96rem !important;
-// background: rgba(255, 31, 36, 0.05) !important;
-// border-radius: 0.04rem 0px 0px 0.04rem !important;
-// }
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 5c87439c..c0d42267 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1637,7 +1637,9 @@ methods: {
if(item!=null && item.length==2){
this.form.transLine=item[0];
this.form.productType=item[1];
- this.calcBillFee();
+ // this.calcBillFee();
+ this.handleCalcSettlementWeight();
+
}
},
onSendSiteSelect(item){
@@ -2317,22 +2319,6 @@ methods: {
pointer-events: auto;
}
-// .notify-success{
-// top: 1.7rem !important;
-// right: 0.32rem !important;
-// width: 2rem !important;
-// height: 0.96rem !important;
-// background: rgba(131, 213, 134, 0.1) !important;
-// border-radius: 0.04rem 0px 0px 0.04rem !important;
-// }
-// .notify-error{
-// top: 2.7rem !important;
-// right: 0.32rem !important;
-// width: 2rem !important;
-// height: 0.96rem !important;
-// background: rgba(255, 31, 36, 0.05) !important;
-// border-radius: 0.04rem 0px 0px 0.04rem !important;
-// }
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 7a3b53bf..ebe2ebcb 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -59,7 +59,7 @@
-
+