Skip to content

Z
zhichan
Commit cc10ab7d by zhaoxiqing
Options

gsb

parent c3007dba
Showing with 108 additions and 30 deletions
bpo-admin/app/base/api/impl/ecompanyApi.js
......@@ -6,7 +6,7 @@ class EcompanyApi {
constructor() {
this.ecompanySve = system.getObject("service.ecompanySve");
this.esettleSve = system.getObject("service.esettleSve");
this.offlinecompanySve = system.getObject("service.offlinecompanySve")
}
async merchantNameSuggest(queryobj, qobj, req) {
......@@ -18,6 +18,15 @@ class EcompanyApi {
return system.getResult2(list);
}
async offlinemerchantNameSuggest(queryobj, qobj, req) {
var name = this.trim(queryobj.name);
if(!name) {
return system.getResult2([])
}
var list = await this.offlinecompanySve.suggest(name);
return system.getResult2(list);
}
async settleMerchantNameSuggest(queryobj, qobj, req) {
var name = this.trim(queryobj.name);
if(!name) {
......@@ -35,4 +44,4 @@ class EcompanyApi {
return o.toString().trim();
}
}
module.exports = EcompanyApi;
\ No newline at end of file
module.exports = EcompanyApi;
bpo-admin/app/base/controller/impl/channelCtl.js
......@@ -35,6 +35,15 @@ class ChannelCtl extends CtlBase {
}
}
async offlineMerchants(queryobj, obj, req) {
try {
return await this.offlinecompanySve.suggest(obj.name);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
// 渠道
async channelSuggest(queryobj, obj, req) {
try {
......@@ -88,12 +97,12 @@ class ChannelCtl extends CtlBase {
}
async merchantSave(queryobj, obj, req) {
try {
if(obj.origin_id == 10001){
var offlinecompany = await this.offlinecompanySve.updateCreate(obj);
if(offlinecompany != -1){
obj.origin_merchant_id = offlinecompany.id;
}
}
// if(obj.origin_id == 10001){
// var offlinecompany = await this.offlinecompanySve.updateCreate(obj);
// if(offlinecompany != -1){
// obj.origin_merchant_id = offlinecompany.id;
// }
// }
return await this.service.merchantSave(obj);
} catch (e) {
console.log(e);
......
bpo-admin/app/front/vues/pages/channelmanager/channelmanager.js
......@@ -33,12 +33,12 @@
{ required: true, message: '请输入渠道名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
],
idcode : [
/* idcode : [
{ validator: validMethod, trigger: 'blur' }
],
business_license : [
{ validator: validMethod, trigger: 'blur' }
],
],*/
idcard_front : [
{ validator: validMethod, trigger: 'blur' }
],
......@@ -74,7 +74,7 @@
getUploadConfig() {
var that = this;
this.$root.postReq("/web/uploadCtl/getOssConfig", {
}).then(function (d) {
console.log(d, "阿里接口");
if (d.status != -200) {
......@@ -181,7 +181,7 @@
/**if(d.data) {
d.data.isEnabled = d.data.isEnabled ? true : false;
}
self.dkcompany.owner_id = self.dkcompany.owner_id || "";
self.dkcompany.ctype = '1';
self.owner_id = (d.data.owner || {}).id || "";
......@@ -225,7 +225,7 @@
},
validfileds(rule, value, callback) {
var self = this;
if(rule.field == 'idcode') {
/* if(rule.field == 'idcode') {
if(!self.dkcompany.idcode) {
let msg = self.dkcompany.ctype == 1 ? "请输入统一社会信用代码": "请输入身份证";
return callback(new Error(msg));
......@@ -235,7 +235,7 @@
if(self.dkcompany.ctype == 1 && !self.dkcompany.business_license) {
return callback(new Error("请上传营业执照"));
}
}
}*/
if(rule.field == 'idcard_front') {
if(!self.dkcompany.idcard_front) {
return callback(new Error("请上传身份证正面"));
......@@ -272,7 +272,7 @@
}
});
setTimeout(() => {
self.ownerLoading = false;
self.ownerLoading = false;
}, 15000);
},
saveCompany() {
......@@ -304,4 +304,4 @@
},
},
vname: "gsb-dkcompanyadmin"
}
\ No newline at end of file
}
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html
......@@ -47,7 +47,7 @@
<el-button @click="openEdit()" style="float:right;width:100px;height:36px;color: #FFFFFF;font-weight: 400;border-radius: 4px;font-size: 14px;background-color: #59C1A6;padding-top:11px">增加商户</el-button>
</div>
<div>
<el-table
<el-table
stripe
fix="true"
:data="search.list"
......@@ -65,9 +65,9 @@
<el-table-column prop="contact_mobile" 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="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">
<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>
</template>
</el-table-column>
</el-table>
......@@ -130,7 +130,7 @@
:disabled="dkcompany.id && dkcompany.origin_merchant_id"
></el-autocomplete>
</el-form-item> -->
<el-form-item label="商户名称：" prop="merchant_name" v-if="is_api == 1" >
<el-form-item label="关联商户：" prop="merchant_name" v-if="is_api == 1" >
<el-select
v-model="dkcompany.merchant_name"
filterable
......@@ -154,9 +154,40 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商户名称：" prop="merchant_name" v-if="is_api == 0">
<el-input v-model="dkcompany.merchant_name" placeholder="请输入商户名称" maxlength="200" style="width:468px;" clearable ></el-input>
<el-form-item label="关联商户：" prop="merchant_name" v-if="is_api == 0">
<el-select
v-model="dkcompany.merchant_name"
filterable
remote
clearable
reserve-keyword
style="width:420px;float: left;"
placeholder="请搜索商户名称"
@change="merchantNameChangeoffline"
:remote-method="suggestMerchantNamesoffline"
:loading="merchantNameLoading"
:disabled="dkcompany.id && dkcompany.origin_merchant_id"
>
<el-option
v-for="item in merchantNameListoffline"
:key="item.id"
:label="item.name"
:value="item.id">
<span style="float: left;width:150px;">{{ item.name }}--{{ item.id }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商户名称：" prop="origin_merchant_name">
<el-input v-model="dkcompany.origin_merchant_name" placeholder="请输入商户名称" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item>
<el-form-item label="联系人：" prop="contact_man" >
<el-input v-model="dkcompany.contact_man" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input>
</el-form-item>
......@@ -203,4 +234,4 @@
</div>
</gsb-pcpage>
\ No newline at end of file
</gsb-pcpage>
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js
......@@ -20,7 +20,9 @@
owner_id: "",
merchantNameLoading: false,
merchantNameList: [],
merchantNameListoffline : [],
merchantNameMap:[],
merchantNameMapoffline : [],
search: {
list: [],
......@@ -48,6 +50,10 @@
{ required: true, message: '请输入商户名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
],
origin_merchant_name: [
{ required: true, message: '请输入商户名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
],
contact_man: [
{ required: true, message: '请输入联系人', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
......@@ -101,7 +107,7 @@
for (let i = 0; i < this.optionsMerchants.length; i++) {
if (value == this.optionsMerchants[i].id){
this.is_api = this.optionsMerchants[i].is_api
}
}
}
console.log(this.is_api);
},
......@@ -265,7 +271,7 @@
}
});
setTimeout(() => {
self.ownerLoading = false;
self.ownerLoading = false;
}, 15000);
},
saveCompany() {
......@@ -313,6 +319,24 @@
self.merchantNameLoading = false;
}, 15000);
},
suggestMerchantNamesoffline(query) {
var self = this;
self.merchantNameLoading = true;
self.$root.postReq("/web/channelCtl/offlineMerchants", {
name: query
}).then(function (d) {
self.merchantNameLoading = false;
self.merchantNameListoffline = d || [];
self.merchantNameMapoffline = {};
console.log("查询"+d);
for(let mn of self.merchantNameListoffline) {
self.merchantNameMapoffline[mn.id] = mn;
}
});
setTimeout(() => {
self.merchantNameLoading = false;
}, 15000);
},
merchantNameChange(val) {
var self = this;
console.log(val, "-------------");
......@@ -322,6 +346,15 @@
this.dkcompany.merchant_name = mn.name;
console.log(this.dkcompany);
},
merchantNameChangeoffline(val) {
var self = this;
console.log(val, "-------------");
let mn = self.merchantNameMapoffline[val] || {};
console.log(val, "-------------", mn);
this.dkcompany.origin_merchant_id = mn.id;
this.dkcompany.merchant_name = mn.name;
console.log(this.dkcompany);
},
},
vname: "gsb-dkcompanyadmin"
}
\ No newline at end of file
}
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