Skip to content

C
clique-web
Commit 45c1682f by Kyle_Li
Options

Merge branch 'feature/归属' into 'master' 

Feature/归属

See merge request !2
parents 7679b49f 7920240e
Showing with 89 additions and 24 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.61608bfde357c1160b93ba76ea800497.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.7fa16324f4328566e343.js></script><script type=text/javascript src=./static/js/vendor.b8016fb88b6057c28cf3.js></script><script type=text/javascript src=./static/js/main.88734a052bc45edd56b3.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.b85b0faa6998a1d86011281afb8230c2.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.e4c4b3cad01e18fa6dab.js></script><script type=text/javascript src=./static/js/vendor.b8016fb88b6057c28cf3.js></script><script type=text/javascript src=./static/js/main.88734a052bc45edd56b3.js></script></body></html>
\ No newline at end of file
dist/static/js/25.4296a39b67f0576f0f9f.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/25.8a8b84ab6a2660a11f66.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.7fa16324f4328566e343.js → dist/static/js/manifest.e4c4b3cad01e18fa6dab.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var t,d,o,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var f={},a={45:0};function b(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,b){c=a[e]=[f,b]});c[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1a9062cf3b66d39d4b0c",5:"ffdcf04be84cb66de194",6:"33a8c614b17cb307bcc7",7:"c13128768479e817c19d",8:"7bea65cf0aaaa55be739",9:"0115c667339384926175",10:"267a736b0da367c20063",11:"40664d43b121d72c8da3",12:"14eff4e709242dff20ee",13:"767ff61451126a99fcbb",14:"72309a766accd310abb1",15:"caf452efc7b7ff8d5551",16:"0aeee92ce1726a867cce",17:"dabf1ec5bb70eb055bed",18:"0f0e36d73b1c908c0867",19:"a9543afaa4bab28978b1",20:"cc4a472f72765c729e6b",21:"3cd0b42d5b9cfb9320d8",22:"e5067f1fcc41b0a49160",23:"78d793b6286f4975bdcd",24:"60f0ab0163ae6f738507",25:"4296a39b67f0576f0f9f",26:"2b047f71ae5e4708f030",27:"8add0d2864601699f6cd",28:"68831fd985d520e286ee",29:"cd9f7f2dd605129d0844",30:"fff11bb4eebe6adc8237",31:"9ff68b0fadb91c34c9f3",32:"02df071160562b22e44e",33:"7db2ec0054954fc5c246",34:"fa6c8bb5d25818e42fae",35:"535ea612485b8f48eb93",36:"bd06c1abf17e00bb707a",37:"964e672dc955b70a5ad3",38:"2d79798421fc4dd5b59b",39:"ddcd9b5a1c35568ea4f4",40:"c502c6a8aff7b5fafad5",41:"4f76d3c2b4f43c67636e",42:"a1a5a3c5369ebb863e1a"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.7fa16324f4328566e343.js.map
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},f={45:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1a9062cf3b66d39d4b0c",5:"ffdcf04be84cb66de194",6:"33a8c614b17cb307bcc7",7:"c13128768479e817c19d",8:"7bea65cf0aaaa55be739",9:"0115c667339384926175",10:"267a736b0da367c20063",11:"40664d43b121d72c8da3",12:"14eff4e709242dff20ee",13:"767ff61451126a99fcbb",14:"72309a766accd310abb1",15:"caf452efc7b7ff8d5551",16:"0aeee92ce1726a867cce",17:"dabf1ec5bb70eb055bed",18:"0f0e36d73b1c908c0867",19:"a9543afaa4bab28978b1",20:"cc4a472f72765c729e6b",21:"3cd0b42d5b9cfb9320d8",22:"e5067f1fcc41b0a49160",23:"78d793b6286f4975bdcd",24:"60f0ab0163ae6f738507",25:"8a8b84ab6a2660a11f66",26:"2b047f71ae5e4708f030",27:"8add0d2864601699f6cd",28:"68831fd985d520e286ee",29:"cd9f7f2dd605129d0844",30:"fff11bb4eebe6adc8237",31:"9ff68b0fadb91c34c9f3",32:"02df071160562b22e44e",33:"7db2ec0054954fc5c246",34:"fa6c8bb5d25818e42fae",35:"535ea612485b8f48eb93",36:"bd06c1abf17e00bb707a",37:"964e672dc955b70a5ad3",38:"2d79798421fc4dd5b59b",39:"ddcd9b5a1c35568ea4f4",40:"c502c6a8aff7b5fafad5",41:"4f76d3c2b4f43c67636e",42:"a1a5a3c5369ebb863e1a"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e4c4b3cad01e18fa6dab.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/memberCardSetEnterprise.vue
......@@ -74,10 +74,39 @@
<el-switch v-model="belongAuthForm.storeEdit" @change="changeSwitch($event, 4)"> </el-switch>
</el-form-item>
<el-form-item label="修改次数限制" prop="" v-if="belongAuthForm.storeEdit == true">
<el-radio v-model="belongAuthForm.storeEditTimesType" label="1" @change="changeRadio($event, 11, 'store')">最多修改</el-radio>
<el-input v-model="belongAuthForm.storeEditTimes" @change="changeInput($event, 13, 'storeEditTimes')"></el-input><label>次</label>
<el-radio class="m-l-16" v-model="belongAuthForm.storeEditTimesType" label="2" @change="changeRadio($event, 11, 'store')">每月最多修改1次</el-radio>
<el-radio v-model="belongAuthForm.storeEditTimesType" label="3" @change="changeRadio($event, 11, 'store')">每年最多修改1次</el-radio>
<el-radio
v-model="belongAuthForm.storeEditTimesType"
label="1"
@change="changeRadio($event,11,'store')">最多修改
<el-input
:disabled="belongAuthForm.storeEditTimesType!='1'"
maxLength="6"
v-model="belongAuthForm.storeEditTimes"
@change="changeInput($event,13,'storeEditTimes')">
</el-input><label>次</label>
</el-radio>
<el-radio
v-model="belongAuthForm.storeEditTimesType"
label="2"
@change="changeRadio($event,11,'store')">每月最多修改
<el-input
:disabled="belongAuthForm.storeEditTimesType!='2'"
maxLength="6"
v-model="belongAuthForm.storeEditMonthTimes"
@change="changeInput($event,18,'storeEditTimes')"></el-input><label>次</label>
</el-radio>
<el-radio
v-model="belongAuthForm.storeEditTimesType"
label="3"
@change="changeRadio($event,11,'store')">每年最多修改
<el-input
:disabled="belongAuthForm.storeEditTimesType!='3'"
maxLength="6"
v-model="belongAuthForm.storeEditYearTimes"
@change="changeInput($event,19,'storeEditTimes')"></el-input><label>次</label>
</el-radio>
</el-form-item>
<el-form-item label="修改专属导购" prop="">
......@@ -85,10 +114,30 @@
</el-form-item>
<el-form-item label="修改次数限制" prop="" v-if="belongAuthForm.clerkEdit == true">
<el-radio v-model="belongAuthForm.clerkEditTimesType" :disabled="belongAuthForm.storeEditTimesType == 2 || belongAuthForm.storeEditTimesType == 3 ? true : false" label="1" @change="changeRadio($event, 12)">最多修改</el-radio>
<el-input v-model="belongAuthForm.clerkEditTimes" @change="changeInput($event, 14, 'clerkEditTimes')"></el-input><label>次</label>
<el-radio class="m-l-16" v-model="belongAuthForm.clerkEditTimesType" label="2" @change="changeRadio($event, 12)">每月最多修改1次 </el-radio>
<el-radio v-model="belongAuthForm.clerkEditTimesType" :disabled="belongAuthForm.storeEditTimesType == 2 ? true : false" label="3" @change="changeRadio($event, 12)">每年最多修改1次</el-radio>
<el-radio v-model="belongAuthForm.clerkEditTimesType" label="1" @change="changeRadio($event,12, 'clerk')">最多修改
<el-input
:disabled="belongAuthForm.clerkEditTimesType!='1'"
maxLength="6"
v-model="belongAuthForm.clerkEditTimes"
@change="changeInput($event,14,'clerkEditTimes')">
</el-input><label>次</label>
</el-radio>
<el-radio v-model="belongAuthForm.clerkEditTimesType" label="2" @change="changeRadio($event,12, 'clerk')">每月最多修改
<el-input
:disabled="belongAuthForm.clerkEditTimesType!='2'"
maxLength="6"
v-model="belongAuthForm.clerkEditMonthTimes"
@change="changeInput($event,20,'clerkEditTimes')"></el-input><label>次</label>
</el-radio>
<el-radio v-model="belongAuthForm.clerkEditTimesType" label="3" @change="changeRadio($event,12, 'clerk')">每年最多修改
<el-input
:disabled="belongAuthForm.clerkEditTimesType!='3'"
maxLength="6"
v-model="belongAuthForm.clerkEditYearTimes"
@change="changeInput($event,21,'clerkEditTimes')"></el-input><label>次</label>
</el-radio>
</el-form-item>
</el-form>
</div>
......@@ -145,9 +194,13 @@ export default {
storeEdit: true,
storeEditTimesType: '1',
storeEditTimes: '',
storeEditMonthTimes: '',
storeEditYearTimes: '',
clerkEdit: true,
clerkEditTimesType: '1',
clerkEditTimes: ''
clerkEditTimes: '',
clerkEditMonthTimes: '',
clerkEditYearTimes: ''
},
// 服务门店变更
tableData: [
......@@ -172,15 +225,15 @@ export default {
let that = this;
that.saveSet(tag, e);
// 判断归属门店修改次数
if (!!flag && flag == 'store') {
if (e == 2) {
that.belongAuthForm.clerkEditTimesType = '2';
that.saveSet('12', 2);
}
if (e == 3) {
that.belongAuthForm.clerkEditTimesType = '3';
that.saveSet('12', 3);
}
if (!!flag && ['clerk', 'store'].includes(flag)) {
let marking = {
clerk: 'store',
store: 'clerk',
11: '12',
12: '11'
};
that.belongAuthForm[`${marking[flag]}EditTimesType`] = String(e);
that.saveSet(marking[tag], e);
}
},
saveSet(type, value) {
......@@ -272,7 +325,15 @@ export default {
e = !!parseInt(String(e).replace(/[^\d]/g, '')) ? parseInt(String(e).replace(/[^\d]/g, '')) : '0';
that.belongAuthForm.storeEditTimes = !!parseInt(String(that.belongAuthForm.storeEditTimes).replace(/[^\d]/g, '')) ? parseInt(String(that.belongAuthForm.storeEditTimes).replace(/[^\d]/g, '')) : 0;
that.belongAuthForm.clerkEditTimes = !!parseInt(String(that.belongAuthForm.clerkEditTimes).replace(/[^\d]/g, '')) ? parseInt(String(that.belongAuthForm.clerkEditTimes).replace(/[^\d]/g, '')) : 0;
if (that.belongAuthForm.storeEditTimes > that.belongAuthForm.clerkEditTimes) {
that.belongAuthForm.storeEditMonthTimes = !!parseInt(String(that.belongAuthForm.storeEditMonthTimes).replace(/[^\d]/g,'')) ? parseInt(String(that.belongAuthForm.storeEditMonthTimes).replace(/[^\d]/g,'')) : 0;
that.belongAuthForm.storeEditYearTimes = !!parseInt(String(that.belongAuthForm.storeEditYearTimes).replace(/[^\d]/g,'')) ? parseInt(String(that.belongAuthForm.storeEditYearTimes).replace(/[^\d]/g,'')) : 0;
that.belongAuthForm.clerkEditYearTimes = !!parseInt(String(that.belongAuthForm.clerkEditYearTimes).replace(/[^\d]/g,'')) ? parseInt(String(that.belongAuthForm.clerkEditYearTimes).replace(/[^\d]/g,'')) : 0;
that.belongAuthForm.clerkEditMonthTimes = !!parseInt(String(that.belongAuthForm.clerkEditMonthTimes).replace(/[^\d]/g,'')) ? parseInt(String(that.belongAuthForm.clerkEditMonthTimes).replace(/[^\d]/g,'')) : 0;
if (
that.belongAuthForm.storeEditTimes > that.belongAuthForm.clerkEditTimes
|| that.belongAuthForm.storeEditMonthTimes > that.belongAuthForm.clerkEditMonthTimes
|| that.belongAuthForm.storeEditYearTimes > that.belongAuthForm.clerkEditYearTimes
) {
that.$message.error({
duration: 1000,
message: '修改服务门店次数必须小于修改专属导购次数'
......@@ -308,8 +369,12 @@ export default {
that.belongAuthForm.clerkEdit = member.clerkEdit == 1 ? true : false;
that.belongAuthForm.storeEditTimesType = String(member.storeEditTimesType); //1自定义次数 2 每月修改1次 3每年修改1次
that.belongAuthForm.storeEditTimes = member.storeEditTimes; //自定义次数
that.belongAuthForm.storeEditMonthTimes = member.storeEditMonthTimes;
that.belongAuthForm.storeEditYearTimes = member.storeEditYearTimes;
that.belongAuthForm.clerkEditTimesType = String(member.clerkEditTimesType); //1自定义次数 2 每月修改1次 3每年修改1次
that.belongAuthForm.clerkEditTimes = member.clerkEditTimes; //自定义次数
that.belongAuthForm.clerkEditMonthTimes = member.clerkEditMonthTimes;
that.belongAuthForm.clerkEditYearTimes = member.clerkEditYearTimes;
}
return;
......
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