Commit 875e01a4 by chenyu

Merge branch 'feature/10月迭代' of http://git.gicdev.com/memberTag/memberTag-web

parents 8a50af3d 07f45c74
......@@ -856,7 +856,7 @@ export default {
// 属于/不属于
if (ele.templateCode === 'tag002') {
tagValue.val[0].data.compute = ele.computeRadio;
tagValue.val[0].data.value = ele.computeRadio=='isEmpty'?'':tagValue.val[0].data.value;
if(ele.computeRadio=='isEmpty')tagValue.val[0].data.value = ''
if (ele.computeRadio == 'in') {
that.postTemplateData.selectedVal.unshift('属于');
} else if (ele.computeRadio == 'notIn'){
......@@ -925,14 +925,12 @@ export default {
// 下拉搜索添加值
if (ele.templateCode === 'tag008') {
if (!ele.addSelectTags.length) {
console.log(tagValue.val[0].data.compute);
returnFlag = ['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='isEmpty'?true:false;
}
if (['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='isEmpty') {
tagValue.val[0].data.value = '';
}else{
console.log(ele.addSelectTags);
tagValue.val[0].data.value = ele.addSelectTags.map(item => item.value).join(' ');
tagValue.val[0].data.value = ele.addSelectTags.map(item => item.key).join(' ');
that.postTemplateData.selectedVal.push(ele.addSelectTags.map(item => item.value).join(','));
}
}
......
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