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

src/components/tag/tag-config-options.vue

@@ -1740,8 +1740,11 @@ export default {
             for (let i = 0; i < this.templateData.length; i++) {
               if (this.templateData[i].templateCode === 'tag008') {
                 // 这里有多个value
+                console.log(this.templateData[i].addSelectTags);
                 value = tagValue.val[0].data.value.split(' ');
                 selectVal = tagParams.selectedVal[1].split(',');
+                console.log(tagValue.val[0].data.value);
+                console.log(selectVal);
                 selectVal.forEach((el, inx) => {
                   let item = this.templateData[i].addSelectTags.find(val => val.value === el);
                   if (!item) {

src/components/tagDetail/mixin/index.js

@@ -930,7 +930,7 @@ export default {
             if (['mainClerkId','clerkId','openClerkId'].includes(this.currentKey)&&tagValue.val[0].data.compute==='isEmpty') {
               tagValue.val[0].data.value = '';
             }else{
-              tagValue.val[0].data.value = ele.addSelectTags.map(item => item.key).join(' ');
+              tagValue.val[0].data.value = ele.addSelectTags.map(item => item.key||item.id).join(' ');
               that.postTemplateData.selectedVal.push(ele.addSelectTags.map(item => item.value).join(','));
             }
           }