aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master-xjkh' (#178) from master-xjkh into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/178
This commit is contained in:
wuteng 2025-12-29 17:22:40 +08:00
commit 95ca5e4d27
3 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emis/customerService/traceWaybillDetailView.vue
View File

@ -200,6 +200,10 @@ export default {
}else{ }else{
this.active=2; this.active=2;
} }
//转件 特殊处理
if(this.billDetail.blSign === '1'){
this.active=5;
}
}); });
}, },

82
src/views/emis/emisCustomerUser/moneyUserList.vue
View File

@ -56,7 +56,7 @@
slot="pageContent" slot="pageContent"
slot-scope="slotProps" slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'" :height="(slotProps.contentHeight)+'px'"
ref="refTable"
v-loading="loading" v-loading="loading"
border border
size="small" size="small"
@ -120,7 +120,7 @@
v-hasPermi="['emis:emisCustomerUser:remove']" v-hasPermi="['emis:emisCustomerUser:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
@ -129,7 +129,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['emis:emisCustomerUser:export']" v-hasPermi="['emis:emisCustomerUser:export']"
>导出</el-button> >导出</el-button>
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -148,12 +148,13 @@
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerCode}}</div> <div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerCode}}</div>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column :label="$t('所属现金客户')" align="center" prop="moneyUserName" min-width="140" />
<el-table-column :label="$t('寄件人')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" > <el-table-column :label="$t('寄件人')" align="left" prop="customerName" width="120" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div> <div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('微信信息')" align="center" prop="avatar" min-width="100" > <el-table-column :label="$t('微信信息')" align="center" prop="nickName" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<div style="height:20px"> <div style="height:20px">
<span>{{ scope.row.nickName }}</span> <span>{{ scope.row.nickName }}</span>
@ -182,7 +183,7 @@
<!-- <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" /> --> <!-- <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" /> -->
<el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" /> <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
<el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" > <el-table-column :label="$t('城市')" align="left" prop="cityName" min-width="130" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
<div > <div >
{{ scope.row.cityName }} {{ scope.row.countyName }} {{ scope.row.cityName }} {{ scope.row.countyName }}
@ -193,7 +194,6 @@
<el-table-column :label="$t('初次登记网点')" align="center" prop="ownerSiteName" min-width="150" /> <el-table-column :label="$t('初次登记网点')" align="center" prop="ownerSiteName" min-width="150" />
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" /> <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" /> <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('所属现金客户')" align="center" prop="moneyUserName" min-width="140" />
<el-table-column label="启用状态" align="center" prop="status" min-width="100" > <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag> <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
@ -316,16 +316,7 @@ export default {
/** 查询快递客户用户列表 */ /** 查询快递客户用户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.params = {}; listMoneyUser(this.queryParams).then(response => {
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.emisCustomerUserList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -410,35 +401,35 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// this.download('emis/emisCustomerUser/export', { const loadingInstance = this.$loading({
// ...this.queryParams text: '正在导出...'
// }, `emisCustomerUser_${new Date().getTime()}.xlsx`) })
const loadingInstance = this.$loading({ var qParam = { ...this.queryParams };
text: '正在导出...' qParam.pageNum = 1;
}) qParam.pageSize = 5000;
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisCustomerUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => { listMoneyUser(qParam).then(response => {
this.downloadLoading = false
if (response.code === 200) { if (response.code === 200) {
const curList = response.rows this.exportData(response.rows, loadingInstance);
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()
})
} }
}); });
}, },
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) { formatJson(filterVal, jsonData, resData) {
let index = 0 let index = 0
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {
@ -446,12 +437,17 @@ export default {
return ++index return ++index
} }
if (j === 'status') { if (j === 'status') {
var statusStr='xxx' let statusStr = ''
if(v[j] == 10){ if (v[j] == 0) {
statusStr='xxx' statusStr = '停用'
} else if (v[j] == 1) {
statusStr = '启用'
} }
return statusStr; return statusStr;
} }
if (j === 'cityName') {
return (v[j]||'')+(v['countyName']||'')
}
return v[j] return v[j]
})) }))
}, },

93
src/views/emis/emisCustomerUser/moneyUserListNew.vue
View File

@ -38,7 +38,7 @@
slot="pageContent" slot="pageContent"
slot-scope="slotProps" slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'" :height="(slotProps.contentHeight)+'px'"
ref="refTable"
v-loading="loading" v-loading="loading"
border border
size="small" size="small"
@ -62,7 +62,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['emis:emisCustomerUser:add']" v-hasPermi="['emis:emisMoneyUser:add']"
>新增客户</el-button> >新增客户</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -73,7 +73,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['emis:emisCustomerUser:edit']" v-hasPermi="['emis:emisMoneyUser:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -84,9 +84,19 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['emis:emisCustomerUser:remove']" v-hasPermi="['emis:emisMoneyUser:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisMoneyUser:export']"
>导出</el-button>
</el-col>
</el-row> </el-row>
</div> </div>
@ -200,15 +210,6 @@ export default {
/** 查询快递客户用户列表 */ /** 查询快递客户用户列表 */
getList() { getList() {
this.loading = true; 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 => { listMoneyUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisCustomerUserList = response.rows; this.emisCustomerUserList = response.rows;
this.total = response.total; this.total = response.total;
@ -293,34 +294,40 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// this.download('emis/emisCustomerUser/export', { const loadingInstance = this.$loading({
// ...this.queryParams
// }, `emisCustomerUser_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...' text: '正在导出...'
}) })
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisCustomerUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => { if(this.selectionList&&this.selectionList.length>0){
this.downloadLoading = false this.exportData(this.selectionList,loadingInstance);
if (response.code === 200) { }
const curList = response.rows else{
import('@/vendor/Export2Excel').then(excel => { let initParam= {...this.queryParams};
const tHeader = ['id','客户编码','客户名称','英文简称','电话','手机号','客户类型','结算类型','用户类型','所属公司','部门id','头像','性别','邀请人','最后登录ip','最后登录日期','称呼','union_id','wxopenid','主月结卡号','登录账号','登录密码','归属站点','国家','省份','城市','区县','镇','地址','email','发件国','发件省','发件区','发件区','发件镇','邮编','启用状态','真实姓名','身份证号','回款联系人','销售联系人','是否开通oms','是否短信','专属业务员','排序','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','修改站点代码',]; let qExportParam=this.deepClone(initParam);
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',]; qExportParam.pageNum=1;
const data = this.formatJson(filterVal, curList, response.rows) qExportParam.pageSize=20000;
excel.export_json_to_excel({ listMoneyUser(qExportParam).then(response => {
header: tHeader, if (response.code === 200) {
data, this.exportData(response.rows,loadingInstance);
filename: '快递客户用户', }
autoWidth: true });
}) }
loadingInstance.close() },
}) 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) { formatJson(filterVal, jsonData, resData) {
let index = 0 let index = 0
@ -329,11 +336,11 @@ export default {
return ++index return ++index
} }
if (j === 'status') { if (j === 'status') {
var statusStr='xxx' if (v[j] == 0) {
if(v[j] == 10){ return '停用'
statusStr='xxx' } else if (v[j] == 1) {
return '启用'
} }
return statusStr;
} }
return v[j] return v[j]
})) }))