Commit 49aa44d0 by crushh

update: 修复

parent 2edaff9e
<template> <template>
<el-dialog <el-dialog
title="" title=""
:key="updateDialog"
:visible.sync="dialogTableVisible" :visible.sync="dialogTableVisible"
:before-close="closePop"
width="1000px" width="1000px"
destroy-on-close
> >
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="上架规则" name="list"> <el-tab-pane label="上架规则" name="list">
...@@ -135,6 +136,7 @@ export default { ...@@ -135,6 +136,7 @@ export default {
}, },
dialogTableVisible: false, dialogTableVisible: false,
echoRuleId: '', echoRuleId: '',
updateDialog: false,
}; };
}, },
watch: { watch: {
...@@ -145,7 +147,6 @@ export default { ...@@ -145,7 +147,6 @@ export default {
}, },
}, },
mounted () { mounted () {
}, },
methods: { methods: {
onRowClick (row) { onRowClick (row) {
...@@ -185,6 +186,7 @@ export default { ...@@ -185,6 +186,7 @@ export default {
pageSize: 5, pageSize: 5,
currentPage: 1, currentPage: 1,
}; };
this.updateDialog = !this.updateDialog;
this.dialogTableVisible = false; this.dialogTableVisible = false;
this.btnLoading = false; this.btnLoading = false;
}, },
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="适用人群" prop="memberType"> <el-form-item label="适用人群" prop="memberType">
<span class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span></span> <span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#1890ff">{{ memberTypeTotal }}</span></span>
<div> <div>
<el-radio v-model="ruleForm.memberType" :label="1"> <el-radio v-model="ruleForm.memberType" :label="1">
全部客户 全部客户
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
v-model="ruleForm.memberType" v-model="ruleForm.memberType"
:label="3" :label="3"
:disabled="memberTypeTotal>=20&&isAdd" :disabled="memberTypeTotal>=20&&isAdd"
v-if="ruleMemberFilterClose==0" v-if="$store.state.product.ruleMemberFilterClose==0"
> >
人群筛选器 人群筛选器
</el-radio> </el-radio>
...@@ -121,7 +121,6 @@ export default { ...@@ -121,7 +121,6 @@ export default {
btnLoading: false, btnLoading: false,
uuid: '', uuid: '',
memberTypeTotal: 0, memberTypeTotal: 0,
ruleMemberFilterClose: 0, // 是否关闭人群筛选器
}; };
}, },
computed: { computed: {
...@@ -141,16 +140,8 @@ export default { ...@@ -141,16 +140,8 @@ export default {
copy: '复制上架规则', copy: '复制上架规则',
}; };
this.breadcrumbTitle = obj[this.$route.meta.type]; this.breadcrumbTitle = obj[this.$route.meta.type];
this.getRuleMemberFilterClose();
}, },
methods: { methods: {
// 检测是否开启 人群筛选器
getRuleMemberFilterClose () {
request.get('/api-integral-mall/get-config').then(res => {
const result = res.data.result || {};
this.ruleMemberFilterClose = result.ruleMemberFilterClose;
});
},
/** 门店筛选器 */ /** 门店筛选器 */
storeChange (storeId) { storeChange (storeId) {
this.uuid = storeId; this.uuid = storeId;
......
...@@ -5,6 +5,7 @@ const state = { ...@@ -5,6 +5,7 @@ const state = {
total: 0, total: 0,
canUseMenuUrl: [], canUseMenuUrl: [],
erpGoodsFlag: 0, erpGoodsFlag: 0,
ruleMemberFilterClose: 0,
}; };
// getters // getters
...@@ -64,6 +65,10 @@ const mutations = { ...@@ -64,6 +65,10 @@ const mutations = {
mutations_erpGoodsFlag (state, val) { mutations_erpGoodsFlag (state, val) {
state.erpGoodsFlag = val; state.erpGoodsFlag = val;
}, },
// 是否关闭人群筛选器
mutations_ruleMemberFilterClose (state, val) {
state.ruleMemberFilterClose = val;
},
}; };
export default { export default {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
</template> </template>
<script> <script>
import bus from '../assets/eventBus.js'; import bus from '../assets/eventBus.js';
import request from '@/service/request.js';
export default { export default {
components: {}, components: {},
data () { data () {
...@@ -51,8 +52,16 @@ export default { ...@@ -51,8 +52,16 @@ export default {
// 刷新左侧菜单 // 刷新左侧菜单
that.$refs.leftmenu.handleSelect(key); that.$refs.leftmenu.handleSelect(key);
}); });
this.getRuleMemberFilterClose();
}, },
methods: { methods: {
// 检测是否 关闭人群筛选器
getRuleMemberFilterClose () {
request.get('/api-integral-mall/get-config').then(res => {
const result = res.data.result || {};
this.$store.commit('mutations_ruleMemberFilterClose', result.ruleMemberFilterClose);
});
},
// 处理路由跳转 // 处理路由跳转
toRouterView (val) { toRouterView (val) {
const that = this; const that = this;
......
...@@ -448,7 +448,6 @@ export default { ...@@ -448,7 +448,6 @@ export default {
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf()); // let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.form.timeRangeList[0].timeRange = [currentTime, currentTime1]; // this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
// } // }
this.getErpGoodsFlag();
}, },
methods: { methods: {
// 添加时间段 // 添加时间段
...@@ -816,17 +815,6 @@ export default { ...@@ -816,17 +815,6 @@ export default {
name: 'deliverSet', name: 'deliverSet',
}); });
}, },
// 检测是否开启 erp商品兑换接口
getErpGoodsFlag () {
request.get('/api-integral-mall/get-config').then(res => {
if (res.data.errorCode === 0) {
const result = res.data.result || {};
this.$store.commit('mutations_erpGoodsFlag', result.goodsStockSync || 0);
} else {
this.$message.error(res.data.message);
}
});
},
}, },
}; };
</script> </script>
......
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