Merge branch 'dev2/luolei' into ChronicMag2

src/components/icss/PubTagPartDetail.vue

@@ -559,15 +559,20 @@ export default {
                     }
                   }
                 }else{
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
-                    this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
+                      this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                   }
                 }
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -576,13 +581,18 @@ export default {
               }else{
                 ++num;
                 if(num == 6){
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
                     for(let i = 2;i < this.poolDetailList.length;i++){
                       let ids = [];

src/components/icss/TemplateMaintenanceWrap.vue

@@ -81,7 +81,6 @@ export default {
       //仍需验证标签明细是否选择
       let type = this.dataPub.region1,name=this.dataPub.region2;
       let detailLis = utils.orderTemplateData(this.sendIds)
-      // console.log(detailLis)
       if (JSON.stringify(this.sendIds) == '[]' || !detailLis) {
         this.$message({
           message: '模板至少包含一个标签池标签',

src/components/icss/VersionDesc.vue

@@ -15,6 +15,10 @@
                 label="建立时间"
                 :show-overflow-tooltip="true">
         </el-table-column>
+        <el-table-column
+                prop="title"
+                label="标题">
+        </el-table-column>
         <el-table-column
                 prop="modifierid"
                 label="操作人">