Commit 873d7a75 by liuchenxi

Merge branch 'feature/1月迭代-年前'

parents d57842f0 aa4e6d2f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</el-form-item> </el-form-item>
<div class="form-child" v-if="item.openStatus" :key="index"> <div class="form-child" v-if="item.openStatus" :key="index">
<el-form-item label="消费门店" prop="region"> <el-form-item label="消费门店" prop="region">
<vue-gic-store-group :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="uuid" ref="storeGroup"></vue-gic-store-group> <dm-store-selector :isClique="true" :scenesVal="scencs" :options="options" :isAdd="isAdd" :uuid.sync="uuid" ref="storeGroup"></dm-store-selector>
</el-form-item> </el-form-item>
<el-form-item label="适用商品" prop="name" class="padding-0"> <el-form-item label="适用商品" prop="name" class="padding-0">
<el-select v-model="item.channelRelationProType" placeholder="请选择" @change="changeGood($event)"> <el-select v-model="item.channelRelationProType" placeholder="请选择" @change="changeGood($event)">
......
...@@ -25,13 +25,14 @@ ...@@ -25,13 +25,14 @@
</el-form-item> </el-form-item>
<div class="form-child" v-if="item.openStatus" :key="index"> <div class="form-child" v-if="item.openStatus" :key="index">
<el-form-item label="消费门店" prop="region"> <el-form-item label="消费门店" prop="region">
<vue-gic-store-group <dm-store-selector
:scenesVal="scencs" :scenesVal="scencs"
:options="options" :options="options"
:isAdd="isAdd" :isAdd="isAdd"
:uuid.sync="uuid" :uuid.sync="uuid"
:isClique="true"
ref="storeGroup" ref="storeGroup"
></vue-gic-store-group> ></dm-store-selector>
</el-form-item> </el-form-item>
<el-form-item label="适用商品" prop="name" class="padding-0"> <el-form-item label="适用商品" prop="name" class="padding-0">
<el-select <el-select
......
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