Skip to content

Z
zhichan
Commit 2cff34fd by zhaoxiqing
Options

Merge branch 'bpo-admin' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-admin

parents f66efa79 20f2725e
Showing with 124 additions and 6 deletions
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html
...@@ -34,6 +34,17 @@ ...@@ -34,6 +34,17 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div style="float:left;width: 300px;">
<span style="color:2F2F2F;font-size: 14px;" >关联商户： </span>
<el-select v-model="search.types" placeholder="请选择是否商户关联" style="max-width:200px;height: 36px;">
<el-option
v-for="item in optionsTypes"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
<div style="float:left;margin-top:5px;"> <div style="float:left;margin-top:5px;">
<el-button @click="resetSearch()" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;" >重置</el-button> <el-button @click="resetSearch()" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;" >重置</el-button>
<el-button @click="opSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;margin-right: 10px;" >搜索</el-button> <el-button @click="opSearch" style="float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;margin-right: 10px;" >搜索</el-button>
...@@ -68,6 +79,7 @@ ...@@ -68,6 +79,7 @@
<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>
<!-- <a href="javascript:;" v-if="scope.row.origin_id == 10000 && !scope.row.origin_merchant_name" @click="relevancy(scope.row.id)" style="text-decoration: none;color:#59C1A6;font-size: 14px;">关联</a> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -137,12 +149,12 @@ ...@@ -137,12 +149,12 @@
remote remote
clearable clearable
reserve-keyword reserve-keyword
style="width:420px;float: left;" style="width:468px;float: left;"
placeholder="请搜索商户名称" placeholder="请搜索商户名称"
@change="merchantNameChange" @change="merchantNameChange"
:remote-method="suggestMerchantNames" :remote-method="suggestMerchantNames"
:loading="merchantNameLoading" :loading="merchantNameLoading"
:disabled="dkcompany.id && dkcompany.origin_merchant_id" :disabled="dkcompany.id && dkcompany.origin_merchant_id || dkcompany.types"
> >
<el-option <el-option
v-for="item in merchantNameList" v-for="item in merchantNameList"
...@@ -163,12 +175,12 @@ ...@@ -163,12 +175,12 @@
remote remote
clearable clearable
reserve-keyword reserve-keyword
style="width:420px;float: left;" style="width:468px;float: left;"
placeholder="请搜索商户名称" placeholder="请搜索商户名称"
@change="merchantNameChangeoffline" @change="merchantNameChangeoffline"
:remote-method="suggestMerchantNamesoffline" :remote-method="suggestMerchantNamesoffline"
:loading="merchantNameLoading" :loading="merchantNameLoading"
:disabled="dkcompany.id && dkcompany.origin_merchant_id" :disabled="dkcompany.id && dkcompany.origin_merchant_id || dkcompany.types"
> >
<el-option <el-option
v-for="item in merchantNameListoffline" v-for="item in merchantNameListoffline"
...@@ -230,8 +242,92 @@ ...@@ -230,8 +242,92 @@
<div style="margin-left: 200px;"> <div style="margin-left: 200px;">
<el-button :loading="saveLoading" @click="saveCompany" style="width:120px;height:36px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button> <el-button :loading="saveLoading" @click="saveCompany" style="width:120px;height:36px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- <el-dialog width="862px" :visible.sync="showEdit2">
<div slot="title">
<span style="margin-left:9px;margin-top:-3px;;width:72px; height:25px; font-size:18px; font-family:PingFangSC-Regular; font-weight:400; color:rgba(51,51,51,1); line-height:25px;">{{editTitle}}商户</span>
<div style="width: 862px; height: 1px;background-color: #E3E3E3;margin: 17px 20px 0px -20px"></div>
</div>
<el-form :model="dkcompany" :rules="rules" ref="dkcompany" label-width="100px" label="right" style="padding:0px 100px;" >
<div style="0px 10px; line-height: 15px;padding-bottom:40px;">
<div style="width:2px;height:15px;float: left;background-color: #54C4A7">
</div>
<span style="font-size:15px;color: #333333;float: left;font-weight:bold;margin-left: 7px;">商户信息</span>
</div>
<el-form-item label="渠道名称：" prop="channel_id" >
<el-select v-model="dkcompany.channel_id" filterable placeholder="请选择渠道名称" style="width:468px;" :disabled="dkcompany.id">
<el-option
v-for="item in optionsChannel"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商户来源：" prop="origin_id" >
<el-select v-model="dkcompany.origin_id" placeholder="请选择商户来源" style="width:468px;" @change="originMerchantsPost">
<el-option
v-for="item in optionsMerchants"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="关联商户：" prop="origin_merchant_name" v-if="is_api == 1" >
<el-select
v-model="dkcompany.origin_merchant_name"
filterable
remote
clearable
reserve-keyword
style="width:468px;float: left;"
placeholder="请搜索商户名称"
@change="merchantNameChange"
:remote-method="suggestMerchantNames"
:loading="merchantNameLoading"
>
<el-option
v-for="item in merchantNameList"
: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" v-if="is_api == 0">
<el-select
v-model="dkcompany.origin_merchant_name"
filterable
remote
clearable
reserve-keyword
style="width:468px;float: left;"
placeholder="请搜索商户名称"
@change="merchantNameChangeoffline"
:remote-method="suggestMerchantNamesoffline"
:loading="merchantNameLoading"
>
<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>
<div style="margin-left: 200px;">
<el-button :loading="saveLoading" @click="saveCompany" style="width:120px;height:36px; background:#54C4A7; border-radius:4px;color: #FFFFFF;font-size: 16px;padding-top: 10px;">保存</el-button>
</div>
</el-dialog> -->
</div> </div>
</gsb-pcpage> </gsb-pcpage>
bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
dkcompany: {}, dkcompany: {},
editTitle: "新增", editTitle: "新增",
showEdit: false, showEdit: false,
showEdit2: false,
saveLoading: false, saveLoading: false,
ownerList:[], ownerList:[],
ownerMap:[], ownerMap:[],
...@@ -23,7 +24,15 @@ ...@@ -23,7 +24,15 @@
merchantNameListoffline : [], merchantNameListoffline : [],
merchantNameMap:[], merchantNameMap:[],
merchantNameMapoffline : [], merchantNameMapoffline : [],
optionsTypes:[
{
id: 0,
name: '是'
},{
id: 1,
name: '否'
}
],
search: { search: {
list: [], list: [],
currentPage: 1, currentPage: 1,
...@@ -211,6 +220,16 @@ ...@@ -211,6 +220,16 @@
}, },
toDetail(id) { toDetail(id) {
}, },
relevancy(id) {
this.ownerLoading = false;
this.saveLoading = false;
this.owner_id = null;
if(this.$refs.dkcompany) {
this.$refs.dkcompany.resetFields();
}
this.getDKcompany(id);
this.showEdit2 = true;
},
openEdit(id) { openEdit(id) {
this.ownerLoading = false; this.ownerLoading = false;
this.saveLoading = false; this.saveLoading = false;
...@@ -274,6 +293,9 @@ ...@@ -274,6 +293,9 @@
self.ownerLoading = false; self.ownerLoading = false;
}, 15000); }, 15000);
}, },
saveCompany2() {
},
saveCompany() { saveCompany() {
var self = this; var self = this;
self.saveLoading = true; self.saveLoading = true;
......
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