Skip to content

C
clique-web
Commit 65f5721e by zhu_yu_dan
Options

fix:原始成本主体配置文案

parent 9d5580cd
Showing with 59 additions and 16 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.fd9d1609727d871c6f00a9a6e2ea1847.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.02.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 type=text/javascript src=./static/js/manifest.066d3aa38ab49778125f.js></script><script type=text/javascript src=./static/js/vendor.728eaf7ac913b7b8b28d.js></script><script type=text/javascript src=./static/js/main.af654f665bb0d2449121.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.f747c53afc6c1ea22db3a661a6095b28.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.02.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 type=text/javascript src=./static/js/manifest.cb3397a4ecdafdc56742.js></script><script type=text/javascript src=./static/js/vendor.728eaf7ac913b7b8b28d.js></script><script type=text/javascript src=./static/js/main.fc03c91926662aaf1ad4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/10.d2ba8a3243de70acf942.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/10.f91775b38aecb2e1ef77.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/14.bb17399d23a17a6cb399.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/14.c98b829e39fb2372b709.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/7.6c897f7b6f27b76ba157.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/8.a1bdde636f07e8d49ac8.js → dist/static/js/7.ffab14e263d1e0325996.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.ffab14e263d1e0325996.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/7.6c897f7b6f27b76ba157.js → dist/static/js/8.153b8ec2a7a0d13ad959.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.153b8ec2a7a0d13ad959.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/8.a1bdde636f07e8d49ac8.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/9.61b24d54ed890e6408da.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/9.7ec528898b2754704a36.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.066d3aa38ab49778125f.js → dist/static/js/manifest.cb3397a4ecdafdc56742.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},f={40:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;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:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"64e02515c82f0c273bf3",5:"ae32efa6a124e74a06b9",6:"299b5cc81c72c66903d4",7:"6c897f7b6f27b76ba157",8:"a1bdde636f07e8d49ac8",9:"61b24d54ed890e6408da",10:"d2ba8a3243de70acf942",11:"4415062b9407ee85b91f",12:"4c22b15f12385cdc9bf9",13:"d558113341652c2ce6d7",14:"c98b829e39fb2372b709",15:"45aae6c7fea70e7a57e7",16:"efa8fb60f2a60ae68825",17:"eec8faa06bb5f86d1ea9",18:"266076f821a6371c601b",19:"942944b185ad205555d6",20:"ad84af1f1258597e4cf3",21:"cf5e3c1976a4679be463",22:"6f5cc6954be390e85b81",23:"18ef14b5634c5a57b10c",24:"15cdd7c3e39df0079f38",25:"9223994b4155745bc4a4",26:"0834bf38b624c1121dcf",27:"688b32d909196a130ecc",28:"780c8a13d8efdc7d322e",29:"40f24c1d6bcd3953e48e",30:"2cbfd23140dabe1ef281",31:"d2f2bcb2fce1b11a5617",32:"edb0493e74664b500f17",33:"cb1f57d4375f48a1c52b",34:"8f2801d1894bc4b06204",35:"03d40edad45bf1c8c819",36:"619f59e2f1077e855627",37:"54c0c6fcdc5f7778f7c9"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)d=n(n.s=t[i]);return d};var a={},f={40:0};function n(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,n),f.l=!0,f.exports}n.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,n){c=f[e]=[a,n]});c[2]=a;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:"6a7b63b6a9447c78e969",1:"73ceba26c1aaf431359d",2:"06984e75209b3ac2131d",3:"2ad9744fc945a86b15c6",4:"64e02515c82f0c273bf3",5:"ae32efa6a124e74a06b9",6:"299b5cc81c72c66903d4",7:"ffab14e263d1e0325996",8:"153b8ec2a7a0d13ad959",9:"7ec528898b2754704a36",10:"f91775b38aecb2e1ef77",11:"4415062b9407ee85b91f",12:"4c22b15f12385cdc9bf9",13:"d558113341652c2ce6d7",14:"bb17399d23a17a6cb399",15:"45aae6c7fea70e7a57e7",16:"efa8fb60f2a60ae68825",17:"eec8faa06bb5f86d1ea9",18:"266076f821a6371c601b",19:"942944b185ad205555d6",20:"ad84af1f1258597e4cf3",21:"cf5e3c1976a4679be463",22:"6f5cc6954be390e85b81",23:"18ef14b5634c5a57b10c",24:"15cdd7c3e39df0079f38",25:"9223994b4155745bc4a4",26:"0834bf38b624c1121dcf",27:"688b32d909196a130ecc",28:"780c8a13d8efdc7d322e",29:"40f24c1d6bcd3953e48e",30:"2cbfd23140dabe1ef281",31:"d2f2bcb2fce1b11a5617",32:"edb0493e74664b500f17",33:"cb1f57d4375f48a1c52b",34:"8f2801d1894bc4b06204",35:"03d40edad45bf1c8c819",36:"619f59e2f1077e855627",37:"54c0c6fcdc5f7778f7c9"}[e]+".js";var o=setTimeout(b,12e4);function b(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=b,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.066d3aa38ab49778125f.js.map //# sourceMappingURL=manifest.cb3397a4ecdafdc56742.js.map
\ No newline at end of file \ No newline at end of file
src/view/companyGroup/integral/originalCostSet.vue
...@@ -85,9 +85,12 @@ ...@@ -85,9 +85,12 @@
<el-table-column prop="integralTypeName" label="产生渠道"> </el-table-column> <el-table-column prop="integralTypeName" label="产生渠道"> </el-table-column>
<el-table-column prop="jiesuan" label="原始成本（若选择服务门店/开卡门店，而会员该字段为空，则记在无归属下）" width="600"> <el-table-column prop="jiesuan" label="原始成本（若选择服务门店/开卡门店，而会员该字段为空，则记在无归属下）" width="600">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.chengben.length > 0">
<el-radio-group @change="changeOldObj(scope.row, scope.row.showMainPartCost, scope.$index)" v-model="scope.row.showMainPartCost"> <el-radio-group @change="changeOldObj(scope.row, scope.row.showMainPartCost, scope.$index)" v-model="scope.row.showMainPartCost">
<el-radio v-for="(item, index) in scope.row.chengben" :key="index" :label="item.MP_CODE">{{ item.MP_NAME }}</el-radio> <el-radio v-for="(item, index) in scope.row.chengben" :key="index" :label="item.MP_CODE">{{ item.MP_NAME }}</el-radio>
</el-radio-group> </el-radio-group>
</div>
<div v-else>管理增加积分操作时选择的原始成本主体，如无具体门店请选择无归属</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
...@@ -600,6 +600,7 @@ export default { ...@@ -600,6 +600,7 @@ export default {
this.tempBusinessId = res.data.result; this.tempBusinessId = res.data.result;
this.useId = res.data.result; this.useId = res.data.result;
this.dialogVisiblePeople = false; this.dialogVisiblePeople = false;
this.searchParams = '';
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
......
src/view/companyGroup/membershipSystem/addPointSystem.vue
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
<el-option v-for="(item, ind) in mechantOption" :key="ind" :label="item.label" :value="item.value"> </el-option> <el-option v-for="(item, ind) in mechantOption" :key="ind" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用商品" class="padding-0"> <el-form-item label="适用商品" class="padding-0">
<el-select v-model="item.channelRelationProType" placeholder="请选择" @change="changeGood($event)"> <el-select v-model="item.channelRelationProType" placeholder="请选择" @change="changeGood($event)">
<el-option v-for="item in applyGoods" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in applyGoods" :key="item.value" :label="item.label" :value="item.value"> </el-option>
...@@ -531,12 +530,10 @@ export default { ...@@ -531,12 +530,10 @@ export default {
if (valid) { if (valid) {
// 处理数据 // 处理数据
let data = JSON.parse(JSON.stringify(that.ruleForm)); let data = JSON.parse(JSON.stringify(that.ruleForm));
if (!data.strategyName) { if (!data.strategyName) {
showMsg.showmsg('请填写策略名称', 'error'); showMsg.showmsg('请填写策略名称', 'error');
return; return;
} }
let flag = !data.integralGet.fee || String(data.integralGet.integral) == ''; let flag = !data.integralGet.fee || String(data.integralGet.integral) == '';
if (data.integralGetStatus == 1 && flag) { if (data.integralGetStatus == 1 && flag) {
showMsg.showmsg('请填写获取规则', 'error'); showMsg.showmsg('请填写获取规则', 'error');
...@@ -552,12 +549,10 @@ export default { ...@@ -552,12 +549,10 @@ export default {
return; return;
} }
} }
if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') { if (data.integralGetStatus == 1 && !Number(data.integralGetFreezeDays) && data.integralGetFreezeDays != '0') {
showMsg.showmsg('请填写积分冻结期', 'error'); showMsg.showmsg('请填写积分冻结期', 'error');
return; return;
} }
if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) { if (data.integralGetStatus == 1 && !Number(data.integralGetEffectiveDays)) {
showMsg.showmsg('请填写积分有效期', 'error'); showMsg.showmsg('请填写积分有效期', 'error');
return; return;
...@@ -919,7 +914,7 @@ export default { ...@@ -919,7 +914,7 @@ export default {
}, },
findFilter(value) { findFilter(value) {
// 子组件触发父组件事件,返回过滤条件数据 // 子组件触发父组件事件,返回过滤条件数据
// log(value); log(value);
this.ruleForm.crowdJson = value; this.ruleForm.crowdJson = value;
this.searchParams = value; this.searchParams = value;
if (this.ruleForm.crowdJson) { if (this.ruleForm.crowdJson) {
...@@ -955,11 +950,32 @@ export default { ...@@ -955,11 +950,32 @@ export default {
// 筛选器 弹框的确认按钮 // 筛选器 弹框的确认按钮
let that = this; let that = this;
that.$refs.peopleFilter.confirmSet(); that.$refs.peopleFilter.confirmSet();
setTimeout(function() { setTimeout(_ => {
if (that.searchParams) { if (that.searchParams) {
that.dialogVisiblePeople = false; that.lsSaveBtn(that.searchParams);
} }
}, 500); }, 500);
},
// 人群筛选器弹框的确定按钮 临时保存
lsSaveBtn(searchParams) {
postRequest('/api-admin/get-screen-detail-param', {
requestProject: this.repProjectName,
tempBusinessId: this.tempBusinessId ? this.tempBusinessId : '',
detailParams: searchParams
})
.then(res => {
if (res.data.errorCode == 0) {
this.tempBusinessId = res.data.result;
this.useId = res.data.result;
this.dialogVisiblePeople = false;
this.searchParams = '';
} else {
this.$message.error(res.data.message);
}
})
.catch(err => {
log(err);
});
} }
/* end */ /* end */
}, },
......
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
...@@ -805,6 +805,7 @@ export default { ...@@ -805,6 +805,7 @@ export default {
this.tempBusinessId = res.data.result; this.tempBusinessId = res.data.result;
this.useId = res.data.result; this.useId = res.data.result;
this.dialogVisiblePeople = false; this.dialogVisiblePeople = false;
this.searchParams = '';
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
...@@ -1082,17 +1082,39 @@ export default { ...@@ -1082,17 +1082,39 @@ export default {
}, },
getPeopleData() { getPeopleData() {
// 筛选器 弹框的确认按钮 // 筛选器 弹框的确认按钮
this.$refs.peopleFilter.confirmSet().then(res => { let that = this;
that.$refs.peopleFilter.confirmSet().then(res => {
if (!res) { if (!res) {
return; return;
} else { } else {
setTimeout(_ => { setTimeout(_ => {
if (this.searchParams) { if (that.searchParams) {
this.dialogVisiblePeople = false; that.lsSaveBtn(that.searchParams);
} }
}, 500); }, 500);
} }
}); });
},
// 人群筛选器弹框的确定按钮 临时保存
lsSaveBtn(searchParams) {
postRequest('/api-admin/get-screen-detail-param', {
requestProject: this.repProjectName,
tempBusinessId: this.tempBusinessId ? this.tempBusinessId : '',
detailParams: searchParams
})
.then(res => {
if (res.data.errorCode == 0) {
this.tempBusinessId = res.data.result;
this.useId = res.data.result;
this.dialogVisiblePeople = false;
this.searchParams = '';
} else {
this.$message.error(res.data.message);
}
})
.catch(err => {
log(err);
});
} }
/* end */ /* end */
}, },
......
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