Skip to content

Z
zhichan
Commit 2d05c8b5 by 李宏达
Options

lhd

parent 5d4d348b
Showing with 76 additions and 74 deletions
bpo-admin/app/front/vues/pages/channelmanager/channelmanager.html
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
row-style="height:50px;" > row-style="height:50px;" >
<el-table-column prop="id" label="渠道ID" :formatter="onColFormater" width="80" align="center" ></el-table-column> <el-table-column prop="id" label="渠道ID" :formatter="onColFormater" width="80" align="center" ></el-table-column>
<el-table-column prop="name" label="渠道名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="name" label="渠道名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="legal" label="信用代码/身份证号" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="idcode" label="信用代码/身份证号" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="phone" label="联系人" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="contact_man" label="联系人" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="owner.nickName" label="联系人电话" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="contact_mobile" label="联系人电话" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="addr" label="联系人邮箱" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="contact_email" label="联系人邮箱" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="addr" label="联系地址" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="contact_addr" label="联系地址" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column label="操作" align="center" > <el-table-column label="操作" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a> <a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a>
...@@ -77,17 +77,17 @@ ...@@ -77,17 +77,17 @@
</div> </div>
<span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">渠道信息</span> <span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">渠道信息</span>
</div> </div>
<el-form-item label="渠道类型：" prop="type" > <el-form-item label="渠道类型：" prop="ctype" >
<el-radio v-model="dkcompany.type" label="1">机构</el-radio> <el-radio v-model="dkcompany.ctype" label="1">机构</el-radio>
<el-radio v-model="dkcompany.type" label="2">个人</el-radio> <el-radio v-model="dkcompany.ctype" label="2">个人</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="渠道名称：" prop="name" > <el-form-item label="渠道名称：" prop="name" >
<el-input v-model="dkcompany.name" placeholder="请输入渠道名称" maxlength="100" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.name" placeholder="请输入渠道名称" maxlength="100" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码：" prop="legal" > <el-form-item label="统一社会信用代码：" prop="idcode" >
<el-input v-model="dkcompany.legal" placeholder="请输入统一社会信用代码" maxlength="30" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.idcode" placeholder="请输入统一社会信用代码" maxlength="30" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="营业执照：" prop="phone" v-if="dkcompany.type == 1"> <el-form-item label="营业执照：" prop="business_license" v-if="dkcompany.type == 1">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
style="display: inline-block;width:105px;height: 151px" style="display: inline-block;width:105px;height: 151px"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"> :before-upload="beforeAvatarUpload">
<img style="width: 100%;" v-if="imageUrl" :src="imageUrl" class="avatar"> <img style="width: 100%;" v-if="imageUrl" :src="business_license" class="avatar">
<i style="display: inline-block;width:105px;height: 151px" v-else class="el-icon-plus avatar-uploader-icon"></i> <i style="display: inline-block;width:105px;height: 151px" v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"> :before-upload="beforeAvatarUpload">
<img style="width: 100%;" v-if="imageUrl" :src="imageUrl" class="avatar"> <img style="width: 100%;" v-if="imageUrl" :src="idcard_front" class="avatar">
<img style="width: 100%;" v-else src="/imgs/idCodez.png" alt=""> <img style="width: 100%;" v-else src="/imgs/idCodez.png" alt="">
</el-upload> </el-upload>
<el-upload <el-upload
...@@ -120,21 +120,21 @@ ...@@ -120,21 +120,21 @@
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"> :before-upload="beforeAvatarUpload">
<img style="width: 100%;" v-if="imageUrl" :src="imageUrl" class="avatar"> <img style="width: 100%;" v-if="imageUrl" :src="idcard_back" class="avatar">
<img style="width: 100%;" v-else src="/imgs/idCodeb.png" alt=""> <img style="width: 100%;" v-else src="/imgs/idCodeb.png" alt="">
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="联系人：" prop="phone" > <el-form-item label="联系人：" prop="contact_man" >
<el-input v-model="dkcompany.phone" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_man" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话：" prop="phone" > <el-form-item label="联系电话：" prop="contact_mobile" >
<el-input v-model="dkcompany.phone" placeholder="请输入联系电话" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_mobile" placeholder="请输入联系电话" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系邮箱：" prop="addr" > <el-form-item label="联系邮箱：" prop="contact_email" >
<el-input v-model="dkcompany.sealName" placeholder="请输入联系邮箱" maxlength="100" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_email" placeholder="请输入联系邮箱" maxlength="100" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系地址：" prop="addr" > <el-form-item label="联系地址：" prop="contact_addr" >
<el-input v-model="dkcompany.addr" placeholder="请输入联系地址" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_addr" placeholder="请输入联系地址" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
bpo-admin/app/front/vues/pages/channelmanager/channelmanager.js
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
action: "" action: ""
}, },
dkcompany: { dkcompany: {
type: '1' ctype: '1'
}, },
editTitle: "新增", editTitle: "新增",
showEdit: false, showEdit: false,
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
}, },
mounted: function () { mounted: function () {
this.resetSearch(true); this.resetSearch(true);
this.getUploadConfig() this.getUploadConfig();
}, },
created: function () {}, created: function () {},
methods: { methods: {
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
if (!isJPG) { if (!isJPG) {
this.$message.error('上传头像图片只能是 JPG 格式!'); this.$message.error('上传头像图片只能是 JPG 格式!');
} };
return isJPG; return isJPG;
}, },
getEmptySearch() { getEmptySearch() {
...@@ -124,9 +124,7 @@ ...@@ -124,9 +124,7 @@
getList() { getList() {
var self = this; var self = this;
var params = this.getParams(); var params = this.getParams();
this.$root.postReq("/web/dkcompanyCtl/signList", { this.$root.postReq("/web/channelCtl/channelPage", params).then(function (d) {
search: params
}).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
self.search.list = d.data.rows || []; self.search.list = d.data.rows || [];
self.search.total = d.data.count || 0; self.search.total = d.data.count || 0;
...@@ -149,23 +147,23 @@ ...@@ -149,23 +147,23 @@
}, },
getDKcompany(id) { getDKcompany(id) {
var self = this; var self = this;
self.$root.postReq("/web/dkcompanyCtl/info", { self.$root.postReq("/web/channelCtl/channelInfo", {
id: id, id: id,
}).then(function (d) { }).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
if(d.data) { // if(d.data) {
d.data.isEnabled = d.data.isEnabled ? true : false; // d.data.isEnabled = d.data.isEnabled ? true : false;
} // }
self.dkcompany = d.data; self.dkcompany = d.data;
self.dkcompany.owner_id = self.dkcompany.owner_id || ""; // self.dkcompany.owner_id = self.dkcompany.owner_id || "";
self.dkcompany.type = '1'; // self.dkcompany.ctype = '1';
self.owner_id = (d.data.owner || {}).id || ""; // self.owner_id = (d.data.owner || {}).id || "";
if(d.data.owner) { // if(d.data.owner) {
self.ownerList = [d.data.owner]; // self.ownerList = [d.data.owner];
self.ownerMap["id_" + d.data.owner.id] = d.data.owner; // self.ownerMap["id_" + d.data.owner.id] = d.data.owner;
} else { // } else {
self.ownerList = null; // self.ownerList = null;
} // }
} else { } else {
self.$message.warning(d.msg || `您的网络不稳定, 请稍后重试`); self.$message.warning(d.msg || `您的网络不稳定, 请稍后重试`);
} }
...@@ -182,11 +180,12 @@ ...@@ -182,11 +180,12 @@
} }
if(id) { if(id) {
this.getDKcompany(id); this.getDKcompany(id);
// this.dkcompany.id = id
this.editTitle = "修改"; this.editTitle = "修改";
} else { } else {
this.ownerList = []; this.ownerList = [];
this.editTitle = "新增"; this.editTitle = "新增";
this.dkcompany = {isEnabled:true,type: '1'}; this.dkcompany = {ctype: '1'};
} }
this.showEdit = true; this.showEdit = true;
}, },
...@@ -214,7 +213,7 @@ ...@@ -214,7 +213,7 @@
ownerChange(val) { ownerChange(val) {
console.log(val, ); console.log(val, );
this.dkcompany.owner_id = val || 0; this.dkcompany.owner_id = val || 0;
this.dkcompany.type = '1'; this.dkcompany.ctype = '1';
this.owner = this.ownerMap["id_" + val]; this.owner = this.ownerMap["id_" + val];
console.log(this.owner); console.log(this.owner);
}, },
...@@ -242,7 +241,7 @@ ...@@ -242,7 +241,7 @@
self.saveLoading = true; self.saveLoading = true;
self.$refs.dkcompany.validate((valid) => { self.$refs.dkcompany.validate((valid) => {
if (valid) { if (valid) {
self.$root.postReq("/web/dkcompanyCtl/signSave", self.dkcompany).then(function (d) { self.$root.postReq("/web/channelCtl/channelSave", self.dkcompany).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
self.$message.success(`保存成功`); self.$message.success(`保存成功`);
self.showEdit = false; self.showEdit = false;
......
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html
...@@ -50,14 +50,14 @@ ...@@ -50,14 +50,14 @@
header-cell-style="background-color: #F5F5F5;color: #2F2F2F;font-size: 14px;font-weight:400;" header-cell-style="background-color: #F5F5F5;color: #2F2F2F;font-size: 14px;font-weight:400;"
row-style="height:50px;" > row-style="height:50px;" >
<el-table-column prop="id" label="商户ID" :formatter="onColFormater" width="80" align="center" ></el-table-column> <el-table-column prop="id" label="商户ID" :formatter="onColFormater" width="80" align="center" ></el-table-column>
<el-table-column prop="name" label="商户名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="merchant_name" label="商户名称" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="legal" label="渠道ID" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="channel_id" label="渠道ID" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="phone" label="渠道名称" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="channel_name" label="渠道名称" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="owner.nickName" label="统一社会信用代码" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="channel_idcode" label="统一社会信用代码" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="addr" label="联系人" :formatter="onColFormater" align="center" ></el-table-column> <el-table-column prop="contact_man" label="联系人" :formatter="onColFormater" align="center" ></el-table-column>
<el-table-column prop="sealId" label="联系人电话" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="contact_mobile" label="联系人电话" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="addr" label="联系人邮箱" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="contact_email" label="联系人邮箱" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column prop="addr" label="联系地址" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column> <el-table-column prop="contact_addr" label="联系地址" :formatter="onColFormater" align="center" show-overflow-tooltip ></el-table-column>
<el-table-column label="操作" align="center" > <el-table-column label="操作" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a> <a href="javascript:;" @click="openEdit(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">修改</a>
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
</div> </div>
<span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">商户信息</span> <span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">商户信息</span>
</div> </div>
<el-form-item label="渠道名称：" prop="name" > <el-form-item label="渠道名称：" prop="channel_id" >
<el-select v-model="dkcompany.name" placeholder="请选择渠道名称" style="width:468px;"> <el-select v-model="dkcompany.channel_id" placeholder="请选择渠道名称" style="width:468px;">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商户来源：" prop="name" > <el-form-item label="商户来源：" prop="origin_id" >
<el-select v-model="dkcompany.name" placeholder="请选择商户来源" style="width:468px;"> <el-select v-model="dkcompany.origin_id" placeholder="请选择商户来源" style="width:468px;">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商户名称：" prop="name" > <el-form-item label="商户名称：" prop="origin_merchant_id" >
<el-select v-model="dkcompany.name" placeholder="请选择商户名称" style="width:468px;"> <el-select v-model="dkcompany.origin_merchant_id" placeholder="请选择商户名称" style="width:468px;">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
...@@ -121,19 +121,19 @@ ...@@ -121,19 +121,19 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-input v-if='false' v-model="dkcompany.legal" placeholder="请输入商户名称" maxlength="30" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.merchant_name" placeholder="请输入商户名称" maxlength="30" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系人：" prop="phone" > <el-form-item label="联系人：" prop="contact_man" >
<el-input v-model="dkcompany.phone" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_man" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话：" prop="phone" > <el-form-item label="联系电话：" prop="contact_mobile" >
<el-input v-model="dkcompany.phone" placeholder="请输入联系电话" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_mobile" placeholder="请输入联系电话" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系邮箱：" prop="addr" > <el-form-item label="联系邮箱：" prop="contact_email" >
<el-input v-model="dkcompany.sealName" placeholder="请输入联系邮箱" maxlength="100" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_email" placeholder="请输入联系邮箱" maxlength="100" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系地址：" prop="addr" > <el-form-item label="联系地址：" prop="contact_addr" >
<el-input v-model="dkcompany.addr" placeholder="请输入联系地址" maxlength="200" style="width:468px;" clearable ></el-input> <el-input v-model="dkcompany.contact_addr" placeholder="请输入联系地址" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="归属人员：" prop="owner_id"> <!-- <el-form-item label="归属人员：" prop="owner_id">
<el-select <el-select
......
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
list: [], list: [],
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total : 0, total: 0,
name:'', channel_id : '',
origin_id:'',
merchant_name: ''
}, },
rules: { rules: {
name : [ name : [
...@@ -66,8 +68,10 @@ ...@@ -66,8 +68,10 @@
list: [], list: [],
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total : 0, total: 0,
name:'', channel_id : '',
origin_id:'',
merchant_name: ''
} }
}, },
resetSearch() { resetSearch() {
...@@ -87,9 +91,8 @@ ...@@ -87,9 +91,8 @@
getList() { getList() {
var self = this; var self = this;
var params = this.getParams(); var params = this.getParams();
this.$root.postReq("/web/dkcompanyCtl/signList", { this.$root.postReq("/web/channelCtl/merchantPage", params)
search: params .then(function (d) {
}).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
self.search.list = d.data.rows || []; self.search.list = d.data.rows || [];
self.search.total = d.data.count || 0; self.search.total = d.data.count || 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment