Skip to content

C
clique-web
Commit 276b97c9 by zhu_yu_dan
Options

fix:佣金结算规则新建品牌时去掉品牌验证

parent 9653b7c4
Showing with 10 additions and 9 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.399a8a1b791795d6e7c201dd2c62cbd5.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.dd9d4c8e03d4e8e304fc.js></script><script type=text/javascript src=./static/js/vendor.51b50fab0fc7581a90d6.js></script><script type=text/javascript src=./static/js/main.82c85e6a45de511146f5.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.0b433039c2bc26be901863c87c3508b7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.f316363cb434e631645f.js></script><script type=text/javascript src=./static/js/vendor.51b50fab0fc7581a90d6.js></script><script type=text/javascript src=./static/js/main.6b39c9a8e1b748fc17c6.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.dd9d4c8e03d4e8e304fc.js → dist/static/js/manifest.f316363cb434e631645f.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,b){for(var d,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var c={},f={43:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"aaee7353b0f7c6cd7878",1:"4cf2a332af8b02d35d2a",2:"f3d50a0efb2c504384f6",3:"fce3dad356f29a129ba1",4:"ec261277f3b77c23d303",5:"702d425b8b9fa617b145",6:"ee6b1cdb0d3c99f5286c",7:"5d80c7a5028f3df8d379",8:"62ea1c95635e202e9a9d",9:"e64fe180a9160ec8b676",10:"3b458f80443fff10d270",11:"8ae87a9cabc089995c29",12:"682c726e5b5c90c59316",13:"5735148d22224c4d550f",14:"56722011d0e13e162cfd",15:"0b54430ab22f62363bb3",16:"895326745b907907a1f1",17:"ab34b0afec19e2d9c06a",18:"408e75cd00a7578f1f86",19:"95b1283d77bc0e40e9d4",20:"a3296f6958ad848717fc",21:"6bce9b7ef9df6d6b316a",22:"7885822386653cba036f",23:"0aca9e9c4dec5d6f5b44",24:"766262ba8639d147913f",25:"2f5f2dc68bb86ddb14d9",26:"0d8c5802db7eabd31bb0",27:"bb8d430813e95b1de909",28:"5bf40f4177236f23174c",29:"38e0d123680f3aa3c59f",30:"d1168dbbb69e89ce1587",31:"0f78bf6da85e5d0afabf",32:"5e7aa9af743a75510857",33:"f4c219fc141e5975bbeb",34:"8de620d3ebb7a718484f",35:"5abc8a331e4f82cb3759",36:"ac9bfe3e1b9dd9e02f76",37:"c89934a34b7d80aa1d8e",38:"b95acc82e9c95b366b0f",39:"94334255128b66bd752e",40:"68fc66bac606477dadcb"}[e]+".js";var d=setTimeout(t,12e4);function t(){b.onerror=b.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return b.onerror=b.onload=t,r.appendChild(b),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={43:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"aaee7353b0f7c6cd7878",1:"4cf2a332af8b02d35d2a",2:"f3d50a0efb2c504384f6",3:"fce3dad356f29a129ba1",4:"ec261277f3b77c23d303",5:"702d425b8b9fa617b145",6:"ee6b1cdb0d3c99f5286c",7:"5d80c7a5028f3df8d379",8:"62ea1c95635e202e9a9d",9:"e64fe180a9160ec8b676",10:"3b458f80443fff10d270",11:"8ae87a9cabc089995c29",12:"682c726e5b5c90c59316",13:"5735148d22224c4d550f",14:"56722011d0e13e162cfd",15:"0b54430ab22f62363bb3",16:"895326745b907907a1f1",17:"ab34b0afec19e2d9c06a",18:"408e75cd00a7578f1f86",19:"95b1283d77bc0e40e9d4",20:"a3296f6958ad848717fc",21:"6bce9b7ef9df6d6b316a",22:"7885822386653cba036f",23:"0aca9e9c4dec5d6f5b44",24:"766262ba8639d147913f",25:"7da2306643895622931d",26:"8a0066b7e8cb8e9f2f14",27:"8ef65ff0748c2f296110",28:"5bf40f4177236f23174c",29:"38e0d123680f3aa3c59f",30:"d1168dbbb69e89ce1587",31:"0f78bf6da85e5d0afabf",32:"5e7aa9af743a75510857",33:"f4c219fc141e5975bbeb",34:"8de620d3ebb7a718484f",35:"5abc8a331e4f82cb3759",36:"ac9bfe3e1b9dd9e02f76",37:"c89934a34b7d80aa1d8e",38:"b95acc82e9c95b366b0f",39:"94334255128b66bd752e",40:"68fc66bac606477dadcb"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.dd9d4c8e03d4e8e304fc.js.map //# sourceMappingURL=manifest.f316363cb434e631645f.js.map
\ No newline at end of file \ No newline at end of file
src/view/companyGroup/brokerage/brokerageRule.vue
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<el-form-item label="商户名称"> <el-form-item label="商户名称">
<el-input disabled v-model="editForm.enterpriseName"></el-input> <el-input disabled v-model="editForm.enterpriseName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="结算品牌" class="is-required"> <el-form-item label="结算品牌">
<el-popover class="vertical-baseline" placement="bottom-start" width="284" trigger="click" v-model="popoverShow"> <el-popover class="vertical-baseline" placement="bottom-start" width="284" trigger="click" v-model="popoverShow">
<el-input @keydown.native.enter="getSettlementList('search')" class="search-brand" placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchBrand" clearable> </el-input> <el-input @keydown.native.enter="getSettlementList('search')" class="search-brand" placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchBrand" clearable> </el-input>
<el-checkbox-group v-if="optionsAll.length > 0" class="dm-checkbox-group" v-model="checkedList" @change="selectBrand"> <el-checkbox-group v-if="optionsAll.length > 0" class="dm-checkbox-group" v-model="checkedList" @change="selectBrand">
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
<div class="el-input__inner dm-store__inputtag"> <div class="el-input__inner dm-store__inputtag">
<el-tag v-for="(v, i) in checkedList" size="small" :key="i" closable @close="delItem(v, i)">{{ filterLabel(v) }}</el-tag> <el-tag v-for="(v, i) in checkedList" size="small" :key="i" closable @close="delItem(v, i)">{{ filterLabel(v) }}</el-tag>
<span class="gray-color dm-store__inputtag--tips" v-show="checkedList.length === 0">请选择结算品牌</span> <span class="gray-color dm-store__inputtag--tips" v-show="checkedList.length === 0">请选择结算品牌</span>
<div v-show="!selectBrandBool" class="el-form-item__error"> <!-- <div v-show="!selectBrandBool" class="el-form-item__error">
请选择结算品牌 请选择结算品牌
</div> </div> -->
</div> </div>
<el-popover placement="top-start" popper-class="select-shop__popper" width="300" trigger="hover"> <el-popover placement="top-start" popper-class="select-shop__popper" width="300" trigger="hover">
<el-tag v-for="(v, i) in checkedList" class="dm-store__total--tag" size="small" :key="i" closable @close="delItem(v, i)">{{ filterLabel(v) }}</el-tag> <el-tag v-for="(v, i) in checkedList" class="dm-store__total--tag" size="small" :key="i" closable @close="delItem(v, i)">{{ filterLabel(v) }}</el-tag>
...@@ -311,7 +311,8 @@ export default { ...@@ -311,7 +311,8 @@ export default {
}, },
// 编辑 保存 // 编辑 保存
saveBrandData() { saveBrandData() {
this.selectBrandBool = this.checkedList.length > 0 ? true : false; // this.selectBrandBool = this.checkedList.length > 0 ? true : false;
this.selectBrandBool = true; // 新:不必填
if (this.selectBrandBool) { if (this.selectBrandBool) {
let para = { let para = {
brandId: this.checkedList.join(','), brandId: this.checkedList.join(','),
......
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