diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 669e327c..83659881 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -1,14 +1,14 @@
-
-
-
- 运单号
- 订单号
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
导出
-
-
+
+
@@ -109,26 +109,26 @@
-
- {{ parseTime(scope.row.waybillDetail.sendDate) }}
-
+
+ {{ parseTime(scope.row.waybillDetail.sendDate) }}
+
-
- {{ parseTime(scope.row.waybillDetail.estimateDate) }}
-
+
+ {{ parseTime(scope.row.waybillDetail.estimateDate) }}
+
-
+
{{ scope.row.waybillDetail.transLineTypeName }}
-
+
-
-
-
+
+
+
{{ scope.row.waybillDetail.productTypeName }}
@@ -162,8 +162,8 @@
- {{ scope.row.waybillDetail.customerName }}
-
+ {{ scope.row.waybillDetail.customerName }}
+
@@ -320,22 +320,7 @@ export default {
/** 查询扫描记录列表 */
getList() {
this.loading = true;
- console.log("---->this.queryParams,", this.queryParams);
- let queryParams = Object.assign({},this.queryParams);
- if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- queryParams.params.beginScanDate = dateToStr(new Date(this.dateTimeRange[0]));
- queryParams.params.endScanDate = dateToStr(new Date(this.dateTimeRange[1]));
- }else{
- queryParams.params.beginScanDate = null;
- queryParams.params.endScanDate = null;
- }
- if(this.queryParams.params.queryOrderType == "1"){
- queryParams.orderSN=null;
- }else if(this.queryParams.params.queryOrderType == "0"){
- queryParams.orderSN=this.queryParams.billCode;
- queryParams.billCode=null;
- }
- queryParams.scanType="50";
+ let queryParams = this.initQueryParams();
listEmisTmsScanRecord(queryParams).then(response => {
this.tmsScanList = [];
this.loading = false;
@@ -356,6 +341,24 @@ export default {
}
});
},
+ initQueryParams() {
+ let qParam = Object.assign({}, this.queryParams);
+ if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+ qParam.params.beginScanDate = dateToStr(new Date(this.dateTimeRange[0]));
+ qParam.params.endScanDate = dateToStr(new Date(this.dateTimeRange[1]));
+ } else {
+ qParam.params.beginScanDate = null;
+ qParam.params.endScanDate = null;
+ }
+ if (this.queryParams.params.queryOrderType == "1") {
+ qParam.orderSN = null;
+ } else if (this.queryParams.params.queryOrderType == "0") {
+ qParam.orderSN = this.queryParams.billCode;
+ qParam.billCode = null;
+ }
+ qParam.scanType = "50";
+ return qParam;
+ },
onStaffSelect(item){
this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
@@ -440,25 +443,12 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
- const loadingInstance = this.$loading({
- text: '正在导出...'
- })
- let queryParams = Object.assign({},this.queryParams);
- queryParams.pageNum=1;
- queryParams.pageSize=5000;
- if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- queryParams.params.beginSignDate = this.dateTimeRange[0];
- queryParams.params.endSignDate = this.dateTimeRange[1];
- }else{
- queryParams.params.beginSignDate = null;
- queryParams.params.endSignDate = null;
- }
- if(this.queryParams.params.queryOrderType == "1"){
- queryParams.orderSN=null;
- }else if(this.queryParams.params.queryOrderType == "0"){
- queryParams.orderSN=this.queryParams.billCode;
- queryParams.billCode=null;
- }
+ const loadingInstance = this.$loading({
+ text: '正在导出...'
+ })
+ let queryParams = this.initQueryParams();
+ queryParams.pageNum = 1;
+ queryParams.pageSize = 5000;
listEmisTmsScanRecord(queryParams).then(response => {
this.downloadLoading = false
let rows = response.rows;
@@ -467,40 +457,27 @@ export default {
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.queryType = this.queryParams.queryType;
- // record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- // record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- // this.tmsScanList.push(record);
- // }
if (response.code === 200) {
- const curList = []
- for (let index = 0; index < response.rows.length; index++) {
- let scanRstItem = response.rows[index];
- let record =Object.assign({}, scanRstItem)
- record.orderType = this.queryParams.orderType;
- record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
- record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
- curList.push(record);
- }
- import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['id','单号','单号类型','车牌号','扫描时间','扫描类型','扫描网点','上/下一网点','扫描员','录入时间','扫描重量'];
- const filterVal = ['id','billCode','orderType','carNo','scanDate','scanType','scanSite','preOrNextStation','scanMan','createTime','scanWeight'];
- const data = this.formatJson(filterVal, curList, curList)
- excel.export_json_to_excel({
- header: tHeader,
- data,
- filename: '签收记录',
- autoWidth: true
- })
- loadingInstance.close()
- })
+ this.exportData(rows,loadingInstance);
}
});
},
+ exportData(selData, loadingInstance) {
+ const curList = selData
+ import('@/vendor/Export2Excel').then(excel => {
+ const exportParam = this.$refs.refTable.getExportParam();
+ const tHeader = exportParam.header;
+ const filterVal = exportParam.filter;
+ const data = this.formatJson(filterVal, curList, selData)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '签收记录列表',
+ autoWidth: true
+ })
+ loadingInstance.close()
+ })
+ },
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
@@ -508,18 +485,50 @@ export default {
return ++index
}
if (j === 'status') {
- var statusStr='xxx'
- if(v[j] == 10){
- statusStr='xxx'
- }
- return statusStr;
+ return '已签收';
+ }
+ if (j === 'sendDate') {
+ //formatJson
+ return v['waybillDetail']?.[j]||'';
+ }
+ //waybillDetail.estimateDate
+ if (j === 'estimateDate') {
+ return v['waybillDetail']?.[j]||'';
+ }
+ //waybillDetail.transLineTypeName
+ if (j === 'transLineTypeName') {
+ return v['waybillDetail']?.[j]||'';
+ }
+ //paymentType
+ if (j === 'paymentType') {
+ return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail'][j]);
+ }
+ //waybillDetail.timeType
+ if (j === 'timeType') {
+ return v['waybillDetail']?.[j]||'';
+ }
+ //waybillDetail.customerName
+ if (j === 'customerName') {
+ return v['waybillDetail']?.[j]||'';
+ }
+ //waybillDetail.receiveCountryName
+ if (j === 'waybillDetail.receiveCountryName') {
+ return v['waybillDetail']?.['receiveCountryName']||'';
+ }
+ // waybillDetail.receiveProvinceName
+ if (j === 'waybillDetail.receiveProvinceName') {
+ return v['waybillDetail']?.['receiveProvinceName']||'';
+ }
+ //waybillDetail.productTypeName
+ if (j === 'productTypeName') {
+ return v['waybillDetail']?.[j]||'';
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
- return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+ return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
}
};
@@ -527,26 +536,26 @@ export default {