Merge branch 'dev2/luolei' into test

src/components/icss/PubTagPartDetail.vue

@@ -401,6 +401,14 @@ export default {
             tmpArr.push(res.data.data[idStr]);
             this.selectArr.map((flg,idx)=>{         //判断右侧有没有选中
               if(flg){    //有选中
+                if(idx == 0 && res.data.data[idStr].questionDetailList && res.data.data[idStr].questionDetailList.length > 1){
+                  this.$message({
+                    showClose: true,
+                    message: '添加的数据有误',
+                    type: 'error'
+                  });
+                  return;
+                }
                 let ids = [];
                 this.poolDetailList[idx] = tmpArr;
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -416,7 +424,7 @@ export default {
                       this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);
                       this.searchTagList();
                       this.getPoolDetailListTips();
-                      return
+                      return;
                     }
                   }
                 }