Merge pull request 'master-xjkh' (#178) from master-xjkh into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/178
This commit is contained in:
wuteng
commit
95ca5e4d27
@ -200,6 +200,10 @@ export default {
|
||||
}else{
|
||||
this.active=2;
|
||||
}
|
||||
//转件 特殊处理
|
||||
if(this.billDetail.blSign === '1'){
|
||||
this.active=5;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
@ -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']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
@ -129,7 +129,7 @@
|
||||
@click="handleExport"
|
||||
v-hasPermi="['emis:emisCustomerUser:export']"
|
||||
>导出</el-button>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -148,12 +148,13 @@
|
||||
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerCode}}</div>
|
||||
</template>
|
||||
</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" >
|
||||
<template slot-scope="scope">
|
||||
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
|
||||
</template>
|
||||
</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">
|
||||
<div style="height:20px">
|
||||
<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="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="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">
|
||||
<div >
|
||||
{{ 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="payee" 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" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
|
||||
@ -316,16 +316,7 @@ 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 => {
|
||||
listMoneyUser(this.queryParams).then(response => {
|
||||
this.emisCustomerUserList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
@ -410,35 +401,35 @@ export default {
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('emis/emisCustomerUser/export', {
|
||||
// ...this.queryParams
|
||||
// }, `emisCustomerUser_${new Date().getTime()}.xlsx`)
|
||||
const loadingInstance = this.$loading({
|
||||
text: '正在导出...'
|
||||
})
|
||||
var qParam = {...this.queryParams};
|
||||
qParam.pageNum=1;
|
||||
qParam.pageSize=5000;
|
||||
const loadingInstance = this.$loading({
|
||||
text: '正在导出...'
|
||||
})
|
||||
var qParam = { ...this.queryParams };
|
||||
qParam.pageNum = 1;
|
||||
qParam.pageSize = 5000;
|
||||
|
||||
listEmisCustomerUser(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
|
||||
this.downloadLoading = false
|
||||
listMoneyUser(qParam).then(response => {
|
||||
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.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
|
||||
return jsonData.map(v => filterVal.map(j => {
|
||||
@ -446,12 +437,17 @@ export default {
|
||||
return ++index
|
||||
}
|
||||
if (j === 'status') {
|
||||
var statusStr='xxx'
|
||||
if(v[j] == 10){
|
||||
statusStr='xxx'
|
||||
let statusStr = ''
|
||||
if (v[j] == 0) {
|
||||
statusStr = '停用'
|
||||
} else if (v[j] == 1) {
|
||||
statusStr = '启用'
|
||||
}
|
||||
return statusStr;
|
||||
}
|
||||
if (j === 'cityName') {
|
||||
return (v[j]||'')+(v['countyName']||'')
|
||||
}
|
||||
return v[j]
|
||||
}))
|
||||
},
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
slot="pageContent"
|
||||
slot-scope="slotProps"
|
||||
:height="(slotProps.contentHeight)+'px'"
|
||||
|
||||
ref="refTable"
|
||||
v-loading="loading"
|
||||
border
|
||||
size="small"
|
||||
@ -62,7 +62,7 @@
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['emis:emisCustomerUser:add']"
|
||||
v-hasPermi="['emis:emisMoneyUser:add']"
|
||||
>新增客户</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
@ -73,7 +73,7 @@
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['emis:emisCustomerUser:edit']"
|
||||
v-hasPermi="['emis:emisMoneyUser:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
@ -84,9 +84,19 @@
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['emis:emisCustomerUser:remove']"
|
||||
v-hasPermi="['emis:emisMoneyUser:remove']"
|
||||
>删除</el-button>
|
||||
</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>
|
||||
</div>
|
||||
|
||||
@ -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,40 @@ 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;
|
||||
})
|
||||
|
||||
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()
|
||||
})
|
||||
}
|
||||
});
|
||||
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 +336,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]
|
||||
}))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user