Skip to content

Z
zhichan
Commit cc10ab7d by zhaoxiqing
Options

gsb

parent c3007dba
Showing with 96 additions and 14 deletions
bpo-admin/app/base/api/impl/ecompanyApi.js
...@@ -6,7 +6,7 @@ class EcompanyApi { ...@@ -6,7 +6,7 @@ class EcompanyApi {
constructor() { constructor() {
this.ecompanySve = system.getObject("service.ecompanySve"); this.ecompanySve = system.getObject("service.ecompanySve");
this.esettleSve = system.getObject("service.esettleSve"); this.esettleSve = system.getObject("service.esettleSve");
this.offlinecompanySve = system.getObject("service.offlinecompanySve")
} }
async merchantNameSuggest(queryobj, qobj, req) { async merchantNameSuggest(queryobj, qobj, req) {
...@@ -18,6 +18,15 @@ class EcompanyApi { ...@@ -18,6 +18,15 @@ class EcompanyApi {
return system.getResult2(list); 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) { async settleMerchantNameSuggest(queryobj, qobj, req) {
var name = this.trim(queryobj.name); var name = this.trim(queryobj.name);
if(!name) { if(!name) {
......
bpo-admin/app/base/controller/impl/channelCtl.js
...@@ -35,6 +35,15 @@ class ChannelCtl extends CtlBase { ...@@ -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) { async channelSuggest(queryobj, obj, req) {
try { try {
...@@ -88,12 +97,12 @@ class ChannelCtl extends CtlBase { ...@@ -88,12 +97,12 @@ class ChannelCtl extends CtlBase {
} }
async merchantSave(queryobj, obj, req) { async merchantSave(queryobj, obj, req) {
try { try {
if(obj.origin_id == 10001){ // if(obj.origin_id == 10001){
var offlinecompany = await this.offlinecompanySve.updateCreate(obj); // var offlinecompany = await this.offlinecompanySve.updateCreate(obj);
if(offlinecompany != -1){ // if(offlinecompany != -1){
obj.origin_merchant_id = offlinecompany.id; // obj.origin_merchant_id = offlinecompany.id;
} // }
} // }
return await this.service.merchantSave(obj); return await this.service.merchantSave(obj);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
......
bpo-admin/app/front/vues/pages/channelmanager/channelmanager.js
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
{ required: true, message: '请输入渠道名称', trigger: 'blur' }, { required: true, message: '请输入渠道名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],
idcode : [ /* idcode : [
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],
business_license : [ business_license : [
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],*/
idcard_front : [ idcard_front : [
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
}, },
validfileds(rule, value, callback) { validfileds(rule, value, callback) {
var self = this; var self = this;
if(rule.field == 'idcode') { /* if(rule.field == 'idcode') {
if(!self.dkcompany.idcode) { if(!self.dkcompany.idcode) {
let msg = self.dkcompany.ctype == 1 ? "请输入统一社会信用代码": "请输入身份证"; let msg = self.dkcompany.ctype == 1 ? "请输入统一社会信用代码": "请输入身份证";
return callback(new Error(msg)); return callback(new Error(msg));
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
if(self.dkcompany.ctype == 1 && !self.dkcompany.business_license) { if(self.dkcompany.ctype == 1 && !self.dkcompany.business_license) {
return callback(new Error("请上传营业执照")); return callback(new Error("请上传营业执照"));
} }
} }*/
if(rule.field == 'idcard_front') { if(rule.field == 'idcard_front') {
if(!self.dkcompany.idcard_front) { if(!self.dkcompany.idcard_front) {
return callback(new Error("请上传身份证正面")); return callback(new Error("请上传身份证正面"));
......
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
:disabled="dkcompany.id && dkcompany.origin_merchant_id" :disabled="dkcompany.id && dkcompany.origin_merchant_id"
></el-autocomplete> ></el-autocomplete>
</el-form-item> --> </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 <el-select
v-model="dkcompany.merchant_name" v-model="dkcompany.merchant_name"
filterable filterable
...@@ -154,9 +154,40 @@ ...@@ -154,9 +154,40 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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>
<el-form-item label="联系人：" prop="contact_man" > <el-form-item label="联系人：" prop="contact_man" >
<el-input v-model="dkcompany.contact_man" 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>
......
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
owner_id: "", owner_id: "",
merchantNameLoading: false, merchantNameLoading: false,
merchantNameList: [], merchantNameList: [],
merchantNameListoffline : [],
merchantNameMap:[], merchantNameMap:[],
merchantNameMapoffline : [],
search: { search: {
list: [], list: [],
...@@ -48,6 +50,10 @@ ...@@ -48,6 +50,10 @@
{ required: true, message: '请输入商户名称', trigger: 'blur' }, { required: true, message: '请输入商户名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
], ],
origin_merchant_name: [
{ required: true, message: '请输入商户名称', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' }
],
contact_man: [ contact_man: [
{ required: true, message: '请输入联系人', trigger: 'blur' }, { required: true, message: '请输入联系人', trigger: 'blur' },
{ validator: validMethod, trigger: 'blur' } { validator: validMethod, trigger: 'blur' }
...@@ -313,6 +319,24 @@ ...@@ -313,6 +319,24 @@
self.merchantNameLoading = false; self.merchantNameLoading = false;
}, 15000); }, 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) { merchantNameChange(val) {
var self = this; var self = this;
console.log(val, "-------------"); console.log(val, "-------------");
...@@ -322,6 +346,15 @@ ...@@ -322,6 +346,15 @@
this.dkcompany.merchant_name = mn.name; this.dkcompany.merchant_name = mn.name;
console.log(this.dkcompany); 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" vname: "gsb-dkcompanyadmin"
} }
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