Commit bd5af93b by KyleAlex

折扣不需要添加商户

parent 2f192684
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.9381e4d26421776449e5bbf4672f578c.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.05.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.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.0511df9736373caaad65.js></script><script type=text/javascript src=./static/js/vendor.191098631718b64db4bc.js></script><script type=text/javascript src=./static/js/main.c11d202ba7f161f1465d.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.9de52e178f550ad0da1cc80fac5e4eac.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.05.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.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.64a31d03ede0b04d2781.js></script><script type=text/javascript src=./static/js/vendor.191098631718b64db4bc.js></script><script type=text/javascript src=./static/js/main.a68b4233f775bd29f369.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={44: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:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"83048b124395daf15a7e",5:"76008f7c4ac7738a7fb6",6:"7238e563404dfb6e4a4e",7:"e0dc07c838093ee0105c",8:"3159773239a5b12d6d19",9:"c2f2547fa4d73f4d8a26",10:"050cc34992cc6b7d9a81",11:"6833d565b45e668a8f04",12:"40de817517a924ea1136",13:"30922a748c42d0069cc5",14:"9e4d2a6299696198fa6f",15:"f746c3d84fe215b0e8d8",16:"476faf210bab30163969",17:"d0b53f24a900366d2933",18:"345771d2f681dbc8940e",19:"bfc0a3c36a966ff0ec49",20:"301bfd1b9e4d6225b51b",21:"57dd7adf4aaa3a5a68ac",22:"452c39e097b94701947e",23:"188fb3bfadba88630f8a",24:"8d3ccc3d6684a9a37e3a",25:"597dc8acb4c5a084ef35",26:"3ca55a78dcdee5b0816d",27:"a72adbc49522e5ec7bab",28:"3d668c97a2c8f654037b",29:"e91d985a85837913a1de",30:"8b7f5e3a4bf531bc2dae",31:"51afc94c5bc16376c2f7",32:"e49c4e56704cc4798815",33:"875776191c5435e59905",34:"3fa688c4f4ab66c5c2f7",35:"4cf8227630d734bf50d6",36:"131f888c7703f2eacb53",37:"9a4bf737d809200a1480",38:"8d049d09f371dd8c3f10",39:"06217df77f10a0aee881",40:"6f905491d4588f8e08fd",41:"a97999411877ea1626da"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,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}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={44: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:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"83048b124395daf15a7e",5:"76008f7c4ac7738a7fb6",6:"7238e563404dfb6e4a4e",7:"e0dc07c838093ee0105c",8:"3159773239a5b12d6d19",9:"27af71db5e09e313a10e",10:"e217eeeaa52be3ce0777",11:"6833d565b45e668a8f04",12:"40de817517a924ea1136",13:"30922a748c42d0069cc5",14:"9e4d2a6299696198fa6f",15:"f746c3d84fe215b0e8d8",16:"476faf210bab30163969",17:"d0b53f24a900366d2933",18:"345771d2f681dbc8940e",19:"bfc0a3c36a966ff0ec49",20:"301bfd1b9e4d6225b51b",21:"57dd7adf4aaa3a5a68ac",22:"452c39e097b94701947e",23:"188fb3bfadba88630f8a",24:"8d3ccc3d6684a9a37e3a",25:"597dc8acb4c5a084ef35",26:"3ca55a78dcdee5b0816d",27:"a72adbc49522e5ec7bab",28:"3d668c97a2c8f654037b",29:"e91d985a85837913a1de",30:"8b7f5e3a4bf531bc2dae",31:"51afc94c5bc16376c2f7",32:"e49c4e56704cc4798815",33:"875776191c5435e59905",34:"3fa688c4f4ab66c5c2f7",35:"4cf8227630d734bf50d6",36:"131f888c7703f2eacb53",37:"9a4bf737d809200a1480",38:"8d049d09f371dd8c3f10",39:"06217df77f10a0aee881",40:"6f905491d4588f8e08fd",41:"a97999411877ea1626da"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,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.0511df9736373caaad65.js.map //# sourceMappingURL=manifest.64a31d03ede0b04d2781.js.map
\ No newline at end of file \ No newline at end of file
...@@ -60,11 +60,6 @@ ...@@ -60,11 +60,6 @@
<el-switch v-model="item.status"> </el-switch> <el-switch v-model="item.status"> </el-switch>
</el-form-item> </el-form-item>
<div class="form-child margin-20" v-if="item.status == true" :key="index"> <div class="form-child margin-20" v-if="item.status == true" :key="index">
<el-form-item label="选择商户">
<el-select size="small" v-model="item.cliqueEnterpriseIdArr" placeholder="请选择" multiple>
<el-option v-for="item in mechantOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="选择店铺"> <el-form-item label="选择店铺">
<el-select v-model="storeValue" v-if="!isJinHua"> <el-select v-model="storeValue" v-if="!isJinHua">
<el-option label="所有门店" value=""></el-option> <el-option label="所有门店" value=""></el-option>
...@@ -326,10 +321,6 @@ export default { ...@@ -326,10 +321,6 @@ export default {
obj.flag = false; obj.flag = false;
obj.text = '请选择商户'; obj.text = '请选择商户';
} }
if (data.gradeStrategyChannelList[i].channelType == 9 && !data.gradeStrategyChannelList[i].cliqueEnterpriseIdArr.length) {
obj.flag = false;
obj.text = '请选择商户';
}
if (data.gradeStrategyChannelList[i].channelType == 3) { if (data.gradeStrategyChannelList[i].channelType == 3) {
const storeGroupDom = this.$refs.storeGroup; const storeGroupDom = this.$refs.storeGroup;
let flag = null; let flag = null;
......
...@@ -60,11 +60,6 @@ ...@@ -60,11 +60,6 @@
<el-switch v-model="item.status"> </el-switch> <el-switch v-model="item.status"> </el-switch>
</el-form-item> </el-form-item>
<div class="form-child margin-20" v-if="item.status == true" :key="index"> <div class="form-child margin-20" v-if="item.status == true" :key="index">
<el-form-item label="选择商户">
<el-select v-model="item.cliqueEnterpriseIdArr" placeholder="请选择" multiple size="small">
<el-option v-for="item in mechantOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="选择店铺"> <el-form-item label="选择店铺">
<el-select v-model="storeValue" v-if="!isJinHua"> <el-select v-model="storeValue" v-if="!isJinHua">
<el-option label="所有门店" value=""></el-option> <el-option label="所有门店" value=""></el-option>
...@@ -327,10 +322,6 @@ export default { ...@@ -327,10 +322,6 @@ export default {
obj.flag = false; obj.flag = false;
obj.text = '请选择商户'; obj.text = '请选择商户';
} }
if (data.gradeStrategyChannelList[i].channelType == 9 && !data.gradeStrategyChannelList[i].cliqueEnterpriseIdArr.length) {
obj.flag = false;
obj.text = '请选择商户';
}
if (data.gradeStrategyChannelList[i].channelType == 3) { if (data.gradeStrategyChannelList[i].channelType == 3) {
const storeGroupDom = this.$refs.storeGroup; const storeGroupDom = this.$refs.storeGroup;
let flag = null; let flag = null;
......
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