diff --git a/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue b/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue
index b586ce86..71b4c952 100644
--- a/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndAbPanel/SignAndAbComparison.vue
@@ -78,7 +78,7 @@
type="primary"
plain
size="mini"
- @click="getList"
+ @click="handleExport"
>导出
@@ -87,12 +87,12 @@
-
+
{{ (scope.row.scanCount - scope.row.signCount) }}
-
+
{{ ((scope.row.signCount / scope.row.scanCount) * 100).toFixed(2) + '%' }}
@@ -216,16 +216,7 @@ export default {
/** 查询统计信息 */
getList() {
this.loading = true;
- console.log("---->this.queryParams,", this.dateTimeRange);
-
- if (null != this.dateTimeRange && '' != this.dateTimeRange) {
- this.queryParams.params.beginScanDate = dateToStr(this.dateTimeRange[0]);
- this.queryParams.params.endScanDate = dateToStr(this.dateTimeRange[1]);
- }else{
- this.queryParams.params.beginScanDate = null;
- this.queryParams.params.endScanDate = null;
- }
- this.tempQueryParams = {...this.queryParams};
+ this.tempQueryParams = this.initQueryParams(this.queryParams);
queryStatList(this.tempQueryParams).then(response => {
if(!response ||response.code != 200){
this.$modal.msgError(response && response.msg || "未知错误")
@@ -288,7 +279,18 @@ export default {
this.queryParams.isAsc = column.order;
this.getList();
},
-
+ initQueryParams(){
+ let qParam=null;
+ if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+ this.queryParams.params.beginScanDate = dateToStr(this.dateTimeRange[0]);
+ this.queryParams.params.endScanDate = dateToStr(this.dateTimeRange[1]);
+ }else{
+ this.queryParams.params.beginScanDate = null;
+ this.queryParams.params.endScanDate = null;
+ }
+ qParam={...this.queryParams};
+ return qParam;
+ },
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
@@ -304,7 +306,7 @@ export default {
qExportParam.pageNum=1;
qExportParam.pageSize=5000;
- listEmisWaybill(qExportParam).then(response => {
+ queryStatList(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@@ -321,7 +323,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
- filename: '统计',
+ filename: '签收异常对比统计',
autoWidth: true
})
loadingInstance.close()
@@ -337,59 +339,11 @@ export default {
if (j === 'kjlx') {
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
- if (j === 'fjr') {
- return v['sendName']+'--'+v['receiveName'];
+ if(j==='unSignCount'){
+ return v['scanCount']-v['signCount'];
}
- if (j === 'sendMobile') {
- return "";
- }
- if (j === 'paymentStatus') {
- return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
- }
-
- 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]);
+ if(j==='signRate'){
+ return ((v['signCount'] / v['scanCount']) * 100).toFixed(2) + '%';
}
return v[j]
}))