From ed3f65d3c474498769742a3e0d9e203bae76dd25 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 10 Aug 2024 10:15:25 +0800 Subject: [PATCH] md --- src/components/XdTable/index.vue | 4 + .../emisSettleBill/panel/SiteConfimPanel.vue | 10 +++ .../InvoiceChRecordListReadOnly.vue | 4 +- .../panel/InvoiceDetailPanel.vue | 6 +- .../panel/InvoiceRecordApplyListPanel.vue | 32 +++++--- .../SubBillConfirmByMoneyList.vue | 10 ++- .../SubBillConfirmByMonthList.vue | 8 +- .../SubBillConfirmBySiteList.vue | 82 +++++++++++++++---- 8 files changed, 118 insertions(+), 38 deletions(-) diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue index b97e5842..1fb19aa5 100644 --- a/src/components/XdTable/index.vue +++ b/src/components/XdTable/index.vue @@ -881,6 +881,7 @@ export default { if(currentRow!=-1 && currentRow!=item.row){ // 去除末尾的\t selStr=this.trimTabChar(selStr,'\t',''); + selStr=selStr.trim(); selStr=selStr+"\n"; } @@ -896,6 +897,9 @@ export default { selStr=this.trimTabChar(selStr,'\t',''); // // console.log("=selStr==>",selStr); + // 去除两端空格 + selStr=selStr.trim(); + this.currentSelectStr=selStr; } diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index cef360d5..40edf3ce 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -122,6 +122,7 @@ @click="handleConfirmBySite" >确认账单 + - + - + + + + - @@ -390,7 +400,7 @@ - + @@ -400,19 +410,19 @@ - - + + - + diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index f73f2204..88a411cc 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -7,6 +7,8 @@ + + 确认不出账 - + >置出账异常 + 总票数:{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}, - 总运费:{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}} + 总运费:{{total}} diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue index e7678e49..386be97b 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue @@ -6,7 +6,7 @@ - + @@ -181,7 +181,7 @@ v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']" >确认不出账 - + 总票数:{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}, - 总运费:{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}} + 总运费:{{total}} diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index 41244ef9..c043734f 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -6,7 +6,7 @@ - + @@ -110,9 +110,20 @@ /> - + + + + + + + + + + + + @@ -389,7 +400,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; -import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; +import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue'; import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; @@ -416,7 +427,7 @@ export default { EmisSiteSimplePicker1, EmisSiteSimplePicker2, - ProblemTypePicker, + ProblemTypeMultiplePicker, TraceWaybillDetailView, MergeBillForm @@ -657,7 +668,11 @@ export default { remark: null, blSign:null, - mergeStatus:null + mergeStatus:null, + + problemQueryType:null, + problemQueryIds:null, + } }, }; @@ -999,19 +1014,56 @@ export default { this.billName=null; } }, + sortFun: function (attr, rev) { + //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序 + if (rev == undefined) { + rev = 1; + } else { + rev = (rev) ? 1 : -1; + } + + return function (a, b) { + a = a[attr]; + b = b[attr]; + if (a < b) { + return rev * -1; + } + if (a > b) { + return rev * 1; + } + return 0; + } + }, + // 排序 查询字段是表格中字段名字 动态取值排序顺序 handleSortChange(column) { - console.log("==column.prop==>",column.prop); - if(column.prop=='billCode'){ - this.queryParams.params.orderByColumn = 'billCode'; - } - else if(column.prop=='waybillDetail.sendDate'){ - this.queryParams.params.orderByColumn = 'sendDate'; - } + console.log(column) + this.currentPage = 1 // return to the first page after sorting + if (column.prop === 'billCode') { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending')); + console.log(this.emisSettleSubBillList); + } else if (column.prop === 'waybillDetail.sendDate') { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending')); + console.log(this.emisSettleSubBillList); + }else if (column.prop === 'priority') { + this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending')); + console.log(this.emisSettleSubBillList); + } + // this.showed_data = this.emisSettleSubBillList.slice(0, this.pageSize) // 排序完显示到第一页 + console.log('Finished') + // console.log(this.showed_data) - this.queryParams.isAsc = column.order; - this.getList(); + // console.log("==column.prop==>",column.prop); + // if(column.prop=='billCode'){ + // this.queryParams.params.orderByColumn = 'billCode'; + // } + // else if(column.prop=='waybillDetail.sendDate'){ + // this.queryParams.params.orderByColumn = 'sendDate'; + // } + + // this.queryParams.isAsc = column.order; + // this.getList(); }, /** 修改按钮操作 */