既往史条件限制

src/components/icss/PubTagGroup.vue

@@ -169,8 +169,8 @@
       </el-form-item>
       <el-form-item class="verticalMiddle" label="选择子项时是否复制主项标签：" prop="region10" v-if="form.region2 == 6">
         <el-select v-model="form.region10" :disabled="!form.region1 || form.region2 == 11">
-          <el-option label="不可以" value="1"></el-option>
-          <el-option label="可以" value="0"></el-option>
+          <el-option label="不可以" value="0"></el-option>
+          <el-option label="可以" value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否显示加号：" prop="region11" v-if="form.region2 == 2 || form.region2 == 3">
@@ -229,7 +229,7 @@ export default {
         region7: '3',       //性别
         region8: '0',          //最小年龄
         region9: '200',         //最大年龄
-        region10: '0',        //是否复制主标签
+        region10: '1',        //是否复制主标签
         region11: '0',       //是否复制当前模块
         region12:'1',        //是否为症状
         tagPool:[],          //标签池数据
@@ -457,7 +457,7 @@ export default {
     },
     initForm() {
       this.form.region12 = '1'
-      this.form.region10 = '0'
+      this.form.region10 = '1'
       this.form.region11 = '0'
 
     }

src/components/icss/PubTagPartDetail.vue

@@ -37,7 +37,7 @@
           v-if="choose == 'single'"
         >
           <template v-for="item in poolDetailList[0]">
-            <!-- <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span> -->
+            <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span>
           </template>
         </div>
         <div
@@ -46,14 +46,14 @@
           @click="selectPart(0)"
           v-else
         >
-          <!-- <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span> -->
+          <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span>
         </div>
         <div class="onlyBottom pubList">
           <ul class="clearfix">
             <li v-for="n in 5"
               :key="n + 'part'"
               class="onlyBottomPart "
-              :class="selectArr[n]?'activeBgc':(n==1 && sign == 6?'activeBgcF5':'')"
+              :class="selectArr[n]?'activeBgc':''"
               :style="{borderRight:n==5?'0':''}"
               @click="selectPart(n)"
             >
@@ -66,7 +66,7 @@
               </ul>
               <ul v-else>
                 <template v-if="n == 1">
-                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.name">
+                  <li class="partDetail ellipsis" v-for="item in poolDetailList[n][0].questionDetailList" :style="getStyleR(item.id)?styleR:null" :title="'[ '+item.name+' ]'" :key="item.id">
                     [ {{item.name}} ]
                   </li>
                 </template>
@@ -524,19 +524,43 @@ export default {
                     });
                     return;
                   }else{
-                    if((idx == 0 && (tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 1)) || (idx == 1 && (tmpArr[0].tagType != 1 && tmpArr[0].tagType != 2))){      //第一列
-                      this.$message({
-                        showClose: true,
-                        message: '添加的数据有误',
-                        type: 'warning'
-                      });
-                      return;
-                    }else{
-                      this.poolDetailList[idx] = tmpArr;
+                    if(idx == 0){//互斥
+                      if(tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 1){
+                        this.$message({
+                          showClose: true,
+                          message: '添加的数据有误',
+                          type: 'warning'
+                        });
+                        return;
+                      }else{
+                        this.poolDetailList[idx] = tmpArr;
+                      }
+                    }else{//第一列伴无
+                      if(tmpArr[0].controlType != 2){
+                        this.$message({
+                          showClose: true,
+                          message: '添加的数据有误',
+                          type: 'warning'
+                        });
+                        return;
+                      }else if(tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 0){
+                        if(tmpArr[0].questionDetailList[0].code == 0){
+                          this.poolDetailList[idx] = tmpArr;
+                        }else if(!tmpArr[0].questionDetailList[0].code){
+                          this.$message({
+                            showClose: true,
+                            message: '添加的数据有误',
+                            type: 'warning'
+                          });
+                          return;
+                        }else{
+                          this.poolDetailList[idx] = tmpArr;
+                        }
+                      }
                     }
                   }
                 }else{
-                  if(tmpArr[0].tagType == 1){
+                  if(tmpArr[0].tagType != 4){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',

src/components/icss/SimilarName.vue

@@ -229,7 +229,7 @@
             this.$message({
               dangerouslyUseHTMLString: true,
               message:res.data.msg,
-              type:'error'
+              type:'waring'
             });
           }
         })