Commit 07a77660 by huaying

fix: 特殊积分策略门店商品人群可编辑

parent bec62c9e
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-form-item> </el-form-item>
<el-form-item label="适用对象" prop class="margin-20"> <el-form-item label="适用对象" prop class="margin-20">
<el-select :disabled="true" @change="changePeople" v-model="ruleForm.useCrowd" placeholder="请选择"> <el-select @change="changePeople" v-model="ruleForm.useCrowd" placeholder="请选择">
<el-option <el-option
v-for="item in applyObjOption" v-for="item in applyObjOption"
:key="item.value" :key="item.value"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人群定向" v-if="ruleForm.useCrowd == 2" prop class="padding-0"> <el-form-item label="人群定向" v-if="ruleForm.useCrowd == 2" prop class="padding-0">
<el-button :disabled="true" @click="showPeople">已设置{{ selectCount }}项筛选</el-button> <el-button @click="showPeople">已设置{{ selectCount }}项筛选</el-button>
</el-form-item> </el-form-item>
<el-form-item label="适用条件" class="padding-0"> <el-form-item label="适用条件" class="padding-0">
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
<el-form-item label="适用商品" class="margin-20"> <el-form-item label="适用商品" class="margin-20">
<el-select <el-select
:disabled="opendisabled1"
class="fl w240" class="fl w240"
style="margin-right: 10px;" style="margin-right: 10px;"
v-model="item.channelRelationProType" v-model="item.channelRelationProType"
...@@ -83,7 +82,6 @@ ...@@ -83,7 +82,6 @@
<!-- 商品品牌 --> <!-- 商品品牌 -->
<el-select <el-select
:disabled="opendisabled1"
size="small" size="small"
class="fl w240 valueWx" class="fl w240 valueWx"
@change="selectGoodsStoreWx" @change="selectGoodsStoreWx"
...@@ -103,7 +101,6 @@ ...@@ -103,7 +101,6 @@
<!-- 商品品类 --> <!-- 商品品类 -->
<div v-if="item.channelRelationProType == 3" class="fl goods-cate cateDataWx"> <div v-if="item.channelRelationProType == 3" class="fl goods-cate cateDataWx">
<goodsCate <goodsCate
:disabled="opendisabled1"
ref="selectGoodsCate" ref="selectGoodsCate"
:selectCateType="selectCateTypeWx" :selectCateType="selectCateTypeWx"
:selectCateData="selectCateDataWx" :selectCateData="selectCateDataWx"
...@@ -112,7 +109,6 @@ ...@@ -112,7 +109,6 @@
</div> </div>
<el-button <el-button
:disabled="opendisabled1"
style="width:202px" style="width:202px"
class="fl goodsListWx" class="fl goodsListWx"
v-if="item.channelRelationProType == 4" v-if="item.channelRelationProType == 4"
...@@ -168,10 +164,10 @@ ...@@ -168,10 +164,10 @@
<el-select v-model="storeValue" v-if="!isJinHua" class="w240"> <el-select v-model="storeValue" v-if="!isJinHua" class="w240">
<el-option label="所有门店" value=""></el-option> <el-option label="所有门店" value=""></el-option>
</el-select> </el-select>
<vue-gic-store-new :disabled="opendisabled9" v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new> <vue-gic-store-new v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>
</el-form-item> </el-form-item>
<el-form-item label="微盟商品" class="margin-20"> <el-form-item label="微盟商品" class="margin-20">
<el-select :disabled="opendisabled9" v-model="item.channelRelationProType" placeholder="请选择" class="w240"> <el-select v-model="item.channelRelationProType" placeholder="请选择" class="w240">
<el-option v-for="item in wMGoodOption" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in wMGoodOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -289,9 +285,9 @@ export default { ...@@ -289,9 +285,9 @@ export default {
data() { data() {
return { return {
scrollToError, scrollToError,
opendisabled3: false, // opendisabled3: false,
opendisabled1: false, // opendisabled1: false,
opendisabled9: false, // opendisabled9: false,
repProjectName: 'gic-clique', repProjectName: 'gic-clique',
navpath: [ navpath: [
{ {
...@@ -811,15 +807,15 @@ export default { ...@@ -811,15 +807,15 @@ export default {
if (item.channelList) { if (item.channelList) {
item.channelList.forEach(item => { item.channelList.forEach(item => {
if(item.openStatus == true) { // if(item.openStatus == true) {
if(item.channelType==3) { // if(item.channelType==3) {
this.opendisabled3 = true; // this.opendisabled3 = true;
}else if(item.channelType==1) { // }else if(item.channelType==1) {
this.opendisabled1 = true; // this.opendisabled1 = true;
}else if(item.channelType==9) { // }else if(item.channelType==9) {
this.opendisabled9 = true; // this.opendisabled9 = true;
} // }
} // }
if(item.openStatus == false) { if(item.openStatus == false) {
item.integralUseDiscountControl == 1 item.integralUseDiscountControl == 1
} }
......
...@@ -34,12 +34,10 @@ ...@@ -34,12 +34,10 @@
:uuid.sync="uuid" :uuid.sync="uuid"
:isClique="true" :isClique="true"
ref="storeGroup" ref="storeGroup"
:readonly="opendisabled3"
></dm-store-selector> ></dm-store-selector>
</el-form-item> </el-form-item>
<el-form-item label="适用商品:" prop="name" class="margin-20"> <el-form-item label="适用商品:" prop="name" class="margin-20">
<el-select <el-select
:disabled="opendisabled3"
class=" w215" class=" w215"
v-model="item.channelRelationProType" v-model="item.channelRelationProType"
placeholder="请选择" placeholder="请选择"
...@@ -54,7 +52,6 @@ ...@@ -54,7 +52,6 @@
</el-select> </el-select>
<!-- 二级 --> <!-- 二级 -->
<span <span
:disabled="opendisabled3"
class="span-txt" class="span-txt"
ref="treeinput" ref="treeinput"
v-if="item.channelRelationProType == 2" v-if="item.channelRelationProType == 2"
...@@ -67,7 +64,6 @@ ...@@ -67,7 +64,6 @@
@click="toggle('brand')" @click="toggle('brand')"
>已选择 {{ item.strategyGoodsRelationIdArr ? item.strategyGoodsRelationIdArr.length : 0 }} 个品类</span> >已选择 {{ item.strategyGoodsRelationIdArr ? item.strategyGoodsRelationIdArr.length : 0 }} 个品类</span>
<treeselect <treeselect
:disabled="opendisabled3"
v-if="item.channelRelationProType == 2 || item.channelRelationProType == 3" v-if="item.channelRelationProType == 2 || item.channelRelationProType == 3"
placeholder placeholder
noOptionsText="暂无数据" noOptionsText="暂无数据"
...@@ -84,7 +80,6 @@ ...@@ -84,7 +80,6 @@
/> />
<!--:default-expand-level="1":load-options="loadOptions" :normalizer="normalizer" :always-open="goodsOpen" --> <!--:default-expand-level="1":load-options="loadOptions" :normalizer="normalizer" :always-open="goodsOpen" -->
<el-button <el-button
:disabled="opendisabled3"
v-if="item.channelRelationProType == 4" v-if="item.channelRelationProType == 4"
@click="showGoodsDialog" @click="showGoodsDialog"
>已选0件商品</el-button> >已选0件商品</el-button>
...@@ -149,7 +144,6 @@ ...@@ -149,7 +144,6 @@
<el-form-item label="适用商品:" class="margin-20"> <el-form-item label="适用商品:" class="margin-20">
<el-select <el-select
:disabled="opendisabled1"
class="w215" class="w215"
v-model="item.channelRelationProType" v-model="item.channelRelationProType"
placeholder="请选择" placeholder="请选择"
...@@ -164,21 +158,18 @@ ...@@ -164,21 +158,18 @@
</el-select> </el-select>
<!-- 二级 --> <!-- 二级 -->
<span <span
:disabled="opendisabled1"
class="span-txt" class="span-txt"
ref="treeinput" ref="treeinput"
v-if="item.channelRelationProType == 2" v-if="item.channelRelationProType == 2"
@click="toggle('wx')" @click="toggle('wx')"
>已选择 {{ item.goodsRelationIds ? item.goodsRelationIds.length : 0 }} 个品牌</span> >已选择 {{ item.goodsRelationIds ? item.goodsRelationIds.length : 0 }} 个品牌</span>
<span <span
:disabled="opendisabled1"
class="span-txt" class="span-txt"
ref="treeinput" ref="treeinput"
v-if="item.channelRelationProType == 3" v-if="item.channelRelationProType == 3"
@click="toggle('wx')" @click="toggle('wx')"
>已选择 {{ item.goodsRelationIds ? item.goodsRelationIds.length : 0 }} 个品类</span> >已选择 {{ item.goodsRelationIds ? item.goodsRelationIds.length : 0 }} 个品类</span>
<treeselect <treeselect
:disabled="opendisabled1"
v-if="item.channelRelationProType == 2 || item.channelRelationProType == 3" v-if="item.channelRelationProType == 2 || item.channelRelationProType == 3"
placeholder placeholder
noOptionsText="暂无数据" noOptionsText="暂无数据"
...@@ -194,7 +185,6 @@ ...@@ -194,7 +185,6 @@
/> />
<!--model=item.strategyGoodsRelationIds和上一个相同会有问题 --> <!--model=item.strategyGoodsRelationIds和上一个相同会有问题 -->
<el-button <el-button
:disabled="opendisabled1"
v-if="item.channelRelationProType == 4" v-if="item.channelRelationProType == 4"
@click="showGoodsDialog" @click="showGoodsDialog"
>已选0件商品</el-button> >已选0件商品</el-button>
...@@ -295,10 +285,10 @@ ...@@ -295,10 +285,10 @@
<el-select v-model="storeValue" v-if="!isJinHua" class="w215"> <el-select v-model="storeValue" v-if="!isJinHua" class="w215">
<el-option label="所有门店" value=""></el-option> <el-option label="所有门店" value=""></el-option>
</el-select> </el-select>
<vue-gic-store-new :disabled="opendisabled9" v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new> <vue-gic-store-new v-else :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="wmuuid" ref="wmstoreGroup"></vue-gic-store-new>
</el-form-item> </el-form-item>
<el-form-item label="微盟商品:" class="margin-20"> <el-form-item label="微盟商品:" class="margin-20">
<el-select :disabled="opendisabled9" v-model="item.channelRelationProType" placeholder="请选择" class="w215"> <el-select v-model="item.channelRelationProType" placeholder="请选择" class="w215">
<el-option v-for="item in wMGoodOption" :key="item.value" :label="item.label" :value="item.value"> </el-option> <el-option v-for="item in wMGoodOption" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -403,11 +393,11 @@ ...@@ -403,11 +393,11 @@
<dm-sub-title text="规则配置" type="fill" style="margin: 40px 0 20px"></dm-sub-title> <dm-sub-title text="规则配置" type="fill" style="margin: 40px 0 20px"></dm-sub-title>
<el-form-item label="适用对象:" prop="useCrowd" class="margin-20"> <el-form-item label="适用对象:" prop="useCrowd" class="margin-20">
<el-radio-group v-model="ruleForm.useCrowd"> <el-radio-group v-model="ruleForm.useCrowd">
<el-radio :disabled="true" v-for="item in applyObjOption" :key="item.value" :label="item.value">{{ item.label }}</el-radio> <el-radio v-for="item in applyObjOption" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="人群定向" v-if="ruleForm.useCrowd == 2" prop="" class="padding-0"> <el-form-item label="人群定向" v-if="ruleForm.useCrowd == 2" prop="" class="padding-0">
<el-button :disabled="true" style="width: 214px;" @click="showPeople">已设置{{ selectCount }}项筛选</el-button> <el-button style="width: 214px;" @click="showPeople">已设置{{ selectCount }}项筛选</el-button>
</el-form-item> </el-form-item>
<el-form-item label="获取规则:" prop="integralGetStatus"> <el-form-item label="获取规则:" prop="integralGetStatus">
<div> <div>
...@@ -591,8 +581,8 @@ ...@@ -591,8 +581,8 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-row> <el-row>
<el-button :disabled="true" @click="dialogVisiblePeople = false">取 消</el-button> <el-button @click="dialogVisiblePeople = false">取 消</el-button>
<el-button :disabled="true" type="primary" @click="getPeopleData">确 定</el-button> <el-button type="primary" @click="getPeopleData">确 定</el-button>
</el-row> </el-row>
</span> </span>
</el-dialog> </el-dialog>
...@@ -650,9 +640,9 @@ export default { ...@@ -650,9 +640,9 @@ export default {
} }
return { return {
scrollToError, scrollToError,
opendisabled3: false, // opendisabled3: false,
opendisabled1: false, // opendisabled1: false,
opendisabled9: false, // opendisabled9: false,
yearYT: '', //按年失效 年 yearYT: '', //按年失效 年
yearMT: '', //按年失效 月 yearMT: '', //按年失效 月
yearDT: '', //按年失效 日 yearDT: '', //按年失效 日
...@@ -1507,15 +1497,15 @@ export default { ...@@ -1507,15 +1497,15 @@ export default {
channelList = channelList.concat(item.channelList.filter(el => !channelListSort.some(item => el.channelType == item))); channelList = channelList.concat(item.channelList.filter(el => !channelListSort.some(item => el.channelType == item)));
item.channelList = channelList; item.channelList = channelList;
item.channelList.forEach(item => { item.channelList.forEach(item => {
if(item.openStatus == true) { // if(item.openStatus == true) {
if(item.channelType==3) { // if(item.channelType==3) {
this.opendisabled3 = true; // this.opendisabled3 = true;
}else if(item.channelType==1) { // }else if(item.channelType==1) {
this.opendisabled1 = true; // this.opendisabled1 = true;
}else if(item.channelType==9) { // }else if(item.channelType==9) {
this.opendisabled9 = true; // this.opendisabled9 = true;
} // }
} // }
if(item.openStatus == false) { if(item.openStatus == false) {
item.integralUseDiscountControl == 1 item.integralUseDiscountControl == 1
} }
......
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