Browse Source

bug修改

Luolei 6 years ago
parent
commit
73d717b0f6
2 changed files with 11 additions and 13 deletions
  1. 4 3
      src/components/icss/CommonTemplate.vue
  2. 7 10
      src/components/icss/PubTagPartDetail.vue

+ 4 - 3
src/components/icss/CommonTemplate.vue

@@ -38,11 +38,11 @@
     </div>
     <div class="bottomPartRight bottomPartRightTemplate">
       <p class="poolTitle">模板内容:</p>
-      <div class="arrowWrap" style="float:right;marginRight:10px" v-if="type != 1 && type != 2">
+      <div class="arrowWrap" style="float:right;marginRight:10px" v-if="type != 1 && type != 2 && type != 3">
         <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
         <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
       </div>
-      <div class="formWrap" v-if="type == 1 || type == 2">
+      <div class="formWrap" v-if="type == 1 || type == 2 || type == 3">
           <el-form
             class="subTemplate"
             :model="form"
@@ -370,7 +370,8 @@ export default {
     },
     getSubTemplate() {
       let param = {
-        noIds:this.subTmpList
+        noIds:this.subTmpList,
+        type:5
       }
       api.getModuleInfoSub(param).then((res) => {
         if (res.data.code === '0') {

+ 7 - 10
src/components/icss/PubTagPartDetail.vue

@@ -303,17 +303,14 @@ export default {
     },
     toRightPool(){
       if(this.currentLis.length == 0){
-        this.$message({
-          showClose: true,
-          message: '请选择标签池标签',
-          type: 'warning'
-        });
+        // this.$message({
+        //   showClose: true,
+        //   message: '请选择标签池标签',
+        //   type: 'warning'
+        // });
         return;
       }
       this.getRightListDes();
-      if(this.choose == 'multiple'){
-        // this.getRightListDes();
-      }
     },
     toLeftPool(){      //往左返回数据
       if(this.choose == 'single' && utils.filterArr(this.selectArr,true,2) && this.poolDetailList[this.activePart].length > 0){
@@ -454,7 +451,7 @@ export default {
                 ++plus2
                 if(plus2 == 5){     //右侧数据填满了
                   // alert('请选择需要修改的模块')
-                  return;
+                  // return;
                 }
               }
             }
@@ -506,7 +503,7 @@ export default {
                 if(num == 6){
                   for(let i = 1;i < this.poolDetailList.length;i++){
                     let ids = [];
-                    if(this.poolDetailList[i].length == 0 || (this.poolDetailList[i].length > 0 && !this.poolDetailList[i].id)){      //判断part里面是不是有数据,没有直接添加
+                    if(this.poolDetailList[i].length == 0 || (this.poolDetailList[i].length > 0 && !this.poolDetailList[i][0].id)){      //判断part里面是不是有数据,没有直接添加
                       this.poolDetailList[i] = tmpArr;
                       this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);
                       this.searchTagList();