|
@@ -79,7 +79,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="24" :sm="24" v-show="chooseDealerList && chooseDealerList.length>0">
|
|
|
<div class="buyerBox">
|
|
|
- <a-tag :closable="!isDisabled" v-for="con in chooseDealerList" id="promotionList-dealerSn" :key="con.dealerSn" @close="delBuyerName(con)">
|
|
|
+ <a-tag :closable="!isDisabled" v-for="con in chooseDealerList" id="promotionList-dealerSn" :key="con.dealerSn" @close.stop="delBuyerName(con)">
|
|
|
{{ con.dealerName }}
|
|
|
</a-tag>
|
|
|
</div>
|
|
@@ -164,7 +164,7 @@
|
|
|
style="padding: 0 60px;">保存</a-button>
|
|
|
</div>
|
|
|
<!-- 选择经销商 -->
|
|
|
- <chooseDealer :openModal="openDealerModal" ref="dealerChoose" :disabledList="chooseSnList" @close="closeDealerModal" @ok="addDealerOk"></chooseDealer>
|
|
|
+ <chooseDealer :openModal="openDealerModal" :chooseInfo="chooseSnList" @close="closeDealerModal" @ok="addDealerOk"></chooseDealer>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -228,13 +228,7 @@ export default {
|
|
|
methods: {
|
|
|
// 部分经销商 选择经销商成功
|
|
|
addDealerOk (list) {
|
|
|
- const dealerArr = list.map(item => {
|
|
|
- return {
|
|
|
- dealerName: item.dealerName,
|
|
|
- dealerSn: item.dealerSn
|
|
|
- }
|
|
|
- })
|
|
|
- this.chooseDealerList = dealerArr
|
|
|
+ this.chooseDealerList = list
|
|
|
this.openDealerModal = false
|
|
|
},
|
|
|
// 禁用日期时间
|
|
@@ -251,7 +245,6 @@ export default {
|
|
|
},
|
|
|
// 打开 选择经销商弹窗
|
|
|
handleDealerModal () {
|
|
|
- console.log('111111111111:', this.chooseDealerList)
|
|
|
this.chooseSnList = this.chooseDealerList.map(item => item.dealerSn)
|
|
|
this.openDealerModal = true
|
|
|
},
|
|
@@ -263,10 +256,9 @@ export default {
|
|
|
// 部分经销商 删除
|
|
|
delBuyerName (row) {
|
|
|
const pos = this.chooseDealerList.findIndex(item => item.dealerSn == row.dealerSn)
|
|
|
- if (pos > 0) {
|
|
|
+ if (pos >= 0) {
|
|
|
this.chooseDealerList.splice(pos, 1)
|
|
|
}
|
|
|
- console.log('222222:', pos, this.chooseDealerList)
|
|
|
},
|
|
|
// 参与经销商 change
|
|
|
changeDealerScope (val) {
|
|
@@ -355,6 +347,9 @@ export default {
|
|
|
// 文本编辑器
|
|
|
editorChange (html, text) {
|
|
|
this.form.content = html
|
|
|
+ if (html) {
|
|
|
+ this.$refs.ruleForm.clearValidate('content')
|
|
|
+ }
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|