From 13cde325a1f9111e70e7956c63018bfa57577717 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 9 Jul 2024 13:57:59 +0800 Subject: [PATCH] md --- .../SubBillConfirmByMoneyList.vue | 32 +- .../emisSettleSubBill/subBillMergeMgnt.vue | 2209 +++++++++-------- src/views/monitor/logininfor/index.vue | 55 +- 3 files changed, 1231 insertions(+), 1065 deletions(-) diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index 43f585c1..9c6cd36b 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -220,6 +220,19 @@
+ +
+ 账单名称: + + 选择账期: + +
+ + + + + + @@ -437,6 +454,9 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue' import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; +import MergeBillForm from '@/views/emis/emisSettleSubBill/MergeBillForm.vue'; + + export default { name: "SubBillConfirmByMoneyList", // name: "SubBillConfirmByMonthList", @@ -457,8 +477,8 @@ export default { EmisSiteSimplePicker2, ProblemTypePicker, - TraceWaybillDetailView - + TraceWaybillDetailView, + MergeBillForm }, dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', @@ -487,11 +507,15 @@ export default { actionType:null, settleType:null, + billName:null, + billMonth:null, + titleMergeForm:null, openMergeForm:false, selectBillList:[], + storageName:null, queryStatInfoMap:null, @@ -707,6 +731,10 @@ export default { else if(this.actionType==3){ this.storageName="SubBillConfirmBySitehList_main"; } + else if(this.actionType==4){ + this.storageName="subBillMergeMgnt_main"; + this.activeTab='waitMerge'; + } }, handleClick(tab, event) { // console.log(tab, event); diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue index 40bc170a..77292e69 100644 --- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue +++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue @@ -1,404 +1,438 @@ @@ -1117,32 +1207,33 @@ export default { .feeItem{ - border: 1px solid #dfe6ec; + border: 1px solid #dfe6ec; + margin-bottom:50px; - ul{ - list-style: none; - padding: 0px; - margin: 0px; - width: 590px; - height: 32px; - line-height: 32px; - border: 1px solid #dfe6ec; - border-top: 0px; - font-size: 12px; + ul{ + list-style: none; + padding: 0px; + margin: 0px; + width: 590px; + height: 32px; + line-height: 32px; + border: 1px solid #dfe6ec; + border-top: 0px; + font-size: 12px; - } - ul li{ - display:block; width:33%; float:left;text-indent:2em - } - .th{ - background:#FFF; font-weight:bold; border-top:1px - } + } + ul li{ + display:block; width:33%; float:left;text-indent:2em + } + .th{ + background:#FFF; font-weight:bold; border-top:1px + } } - .statInfoValue{ - color: red; - font-size: 13px; - font-weight: 500; - } +.statInfoValue{ + color: red; + font-size: 13px; + font-weight: 500; + } diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 7833581a..10ec7054 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -263,11 +263,58 @@ export default { }).catch(() => {}); }, /** 导出按钮操作 */ + // handleExport() { + // this.download('monitor/logininfor/export', { + // ...this.queryParams + // }, `logininfor_${new Date().getTime()}.xlsx`) + // } + /** 导出按钮操作 */ handleExport() { - this.download('monitor/logininfor/export', { - ...this.queryParams - }, `logininfor_${new Date().getTime()}.xlsx`) - } + // this.download('system/sysLogininfor/export', { + // ...this.queryParams + // }, `sysLogininfor_${new Date().getTime()}.xlsx`) + const loadingInstance = this.$loading({ + text: '正在导出...' + }) + var qParam = {...this.queryParams}; + qParam.pageNum=1; + qParam.pageSize=5000; + + list(qParam).then(response => { + this.downloadLoading = false + if (response.code === 200) { + const curList = response.rows + import('@/vendor/Export2Excel').then(excel => { + const tHeader = ['访问ID','登录账号','用户名称','登录IP地址','登录地点','浏览器类型','操作系统','登录状态（0成功','提示消息','访问时间','创建者','创建时间','创建站点','data_from','登录网点名称','登录网点编码',]; + const filterVal = ['infoId','userName','nickName','ipaddr','loginLocation','browser','os','status','msg','loginTime','createBy','createTime','createSite','dataFrom','loginSiteName','loginSiteCode',]; + const data = this.formatJson(filterVal, curList, response.rows) + 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 => { + if (j === 'index') { + return ++index + } + if (j === 'status') { + var statusStr='成功' + if(v[j] == 1){ + statusStr='失败' + } + return statusStr; + } + return v[j] + })) + }, } };