From 49605a06b9fe0079b66e88db0ca206b5b94bd860 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 29 Dec 2025 15:26:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../traceWaybillDetailView.vue | 4 + .../emisCustomerUser/moneyUserListNew.vue | 95 +++++++++++-------- 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue index 2a310fa0..a24e587a 100644 --- a/src/views/emis/customerService/traceWaybillDetailView.vue +++ b/src/views/emis/customerService/traceWaybillDetailView.vue @@ -200,6 +200,10 @@ export default { }else{ this.active=2; } + //转件 特殊处理 + if(this.billDetail.blSign === '1'){ + this.active=5; + } }); }, diff --git a/src/views/emis/emisCustomerUser/moneyUserListNew.vue b/src/views/emis/emisCustomerUser/moneyUserListNew.vue index 1e620332..c0e9c4df 100644 --- a/src/views/emis/emisCustomerUser/moneyUserListNew.vue +++ b/src/views/emis/emisCustomerUser/moneyUserListNew.vue @@ -38,7 +38,7 @@ slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" - + ref="refTable" v-loading="loading" border size="small" @@ -87,6 +87,16 @@ v-hasPermi="['emis:emisCustomerUser:remove']" >删除 + + 导出 + @@ -200,15 +210,6 @@ export default { /** 查询快递客户用户列表 */ getList() { this.loading = true; - this.queryParams.params = {}; - if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) { - this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0]; - this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1]; - } - if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) { - this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0]; - this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1]; - } listMoneyUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => { this.emisCustomerUserList = response.rows; this.total = response.total; @@ -293,34 +294,48 @@ export default { }, /** 导出按钮操作 */ handleExport() { - // this.download('emis/emisCustomerUser/export', { - // ...this.queryParams - // }, `emisCustomerUser_${new Date().getTime()}.xlsx`) - const loadingInstance = this.$loading({ + const loadingInstance = this.$loading({ text: '正在导出...' - }) - var qParam = {...this.queryParams}; - qParam.pageNum=1; - qParam.pageSize=5000; + }) + var qParam = {...this.queryParams}; + // 增加导出记录 + let postExportRecord={ + menuName: '寄件运单查询', + dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate, + } - listEmisCustomerUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => { - this.downloadLoading = false - if (response.code === 200) { - const curList = response.rows - import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['id','客户编码','客户名称','英文简称','电话','手机号','客户类型','结算类型','用户类型','所属公司','部门id','头像','性别','邀请人','最后登录ip','最后登录日期','称呼','union_id','wxopenid','主月结卡号','登录账号','登录密码','归属站点','国家','省份','城市','区县','镇','地址','email','发件国','发件省','发件区','发件区','发件镇','邮编','启用状态','真实姓名','身份证号','回款联系人','销售联系人','是否开通oms','是否短信','专属业务员','排序','备注','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建网点','修改站点代码',]; - const filterVal = ['id','customerCode','customerName','customerNameEn','phone','mobile','customerType','settledType','userType','company','deptId','avatar','sex','invitationInfo','loginIp','loginDate','nickName','unionId','openid','monthlyPayCode','userName','password','ownerSite','country','province','city','county','town','address','email','sendCountry','sendProvince','sendCity','sendCounty','sendTown','postCode','status','realName','idNo','payee','salesmen','blOpenOms','blSms','opEmpCode','orderNum','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',]; - const data = this.formatJson(filterVal, curList, response.rows) - excel.export_json_to_excel({ - header: tHeader, - data, - filename: '快递客户用户', - autoWidth: true - }) - loadingInstance.close() - }) - } - }); + this.addExportAuditRecord(postExportRecord); + + if(this.selectionList&&this.selectionList.length>0){ + this.exportData(this.selectionList,loadingInstance); + } + else{ + let initParam= {...this.queryParams}; + let qExportParam=this.deepClone(initParam); + qExportParam.pageNum=1; + qExportParam.pageSize=20000; + listMoneyUser(qExportParam).then(response => { + if (response.code === 200) { + this.exportData(response.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 @@ -329,11 +344,11 @@ export default { return ++index } if (j === 'status') { - var statusStr='xxx' - if(v[j] == 10){ - statusStr='xxx' + if (v[j] == 0) { + return '停用' + } else if (v[j] == 1) { + return '启用' } - return statusStr; } return v[j] })) From 654dfcbe5169535c448c9b1136de78a8f8741e7d Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 29 Dec 2025 15:39:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=8E=B0=E9=87=91=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisCustomerUser/moneyUserListNew.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/emis/emisCustomerUser/moneyUserListNew.vue b/src/views/emis/emisCustomerUser/moneyUserListNew.vue index c0e9c4df..e7c5b6ee 100644 --- a/src/views/emis/emisCustomerUser/moneyUserListNew.vue +++ b/src/views/emis/emisCustomerUser/moneyUserListNew.vue @@ -62,7 +62,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['emis:emisCustomerUser:add']" + v-hasPermi="['emis:emisMoneyUser:add']" >新增客户 @@ -73,7 +73,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['emis:emisCustomerUser:edit']" + v-hasPermi="['emis:emisMoneyUser:edit']" >修改 @@ -84,7 +84,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['emis:emisCustomerUser:remove']" + v-hasPermi="['emis:emisMoneyUser:remove']" >删除 @@ -94,7 +94,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['emis:emisCustomerUser:export']" + v-hasPermi="['emis:emisMoneyUser:export']" >导出 From e57e717b92b7a6dc4abea1eda2d9d07fed785013 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Mon, 29 Dec 2025 17:21:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisCustomerUser/moneyUserList.vue | 82 +++++++++---------- .../emisCustomerUser/moneyUserListNew.vue | 8 -- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue index 60492e85..9b3e8cab 100644 --- a/src/views/emis/emisCustomerUser/moneyUserList.vue +++ b/src/views/emis/emisCustomerUser/moneyUserList.vue @@ -56,7 +56,7 @@ slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight)+'px'" - + ref="refTable" v-loading="loading" border size="small" @@ -120,7 +120,7 @@ v-hasPermi="['emis:emisCustomerUser:remove']" >删除 - + {{scope.row.customerCode}} --> + - +