Browse Source

模板bug修改

Luolei 6 years ago
parent
commit
5355c53799

+ 13 - 12
src/components/icss/CommonTemplate.vue

@@ -38,7 +38,8 @@
     </div>
     <div class="bottomPartRight bottomPartRightTemplate">
       <p class="poolTitle poolTitleTmp">模板内容:
-        <span style="color:#22ccc8;fontSize:12px" v-if="type == 1 || type == 2 || type == 3">主诉中的主/伴症状,引用到现病史中显示的位置和现病史中添加其他症状显示的位置</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 1">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常;</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 3 || type == 2">特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常;</span>
         <span style="color:#22ccc8;fontSize:12px" v-if="type == 5">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常;特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常;</span>
       </p>
         <div v-if="type == 5">
@@ -279,17 +280,17 @@ export default {
       }
       for(let i = 0;i < tmpLis.length;i++){//循环右侧所有标签,点击的这个有标记,去掉标记,点击的没有标记,去掉其他标记,标记当前项
         let tmpLi = tmpLis[i];
-        if(tmpLi.flag == idx){
-          console.log(idx,787878)
-          tmpLi.flag = null
-          idx == 1?(this.flagLisFst = -1):(idx == 4?this.flagLisSec = -1:null)
-          // if(idx == 1){//点的是1
-          //   if(this.flagLisFst == -1){//第一个未被选中
-          //     this.flagLisFst = 1
-          //   }else{
-
-          //   }
-          // }
+        if(tmpLi.flag == idx){   //有标记
+          if(tmpSelectRightTagsList.length == 0){//没选中
+            return
+          }else if(tmpSelectRightTagsList.length > 0){//有选中
+            if(tmpSelectRightTagsList[0].flag == idx){//选中的有标记
+              tmpLi.flag = null
+              idx == 1?(this.flagLisFst = -1):(idx == 4?this.flagLisSec = -1:null)
+            }else{//选中的没标记
+              return
+            }
+          }
         }else{//没有标记,判断是否有选中,选中就加上标记,没有不做处理
           ++m
           if((m == tmpLis.length)&& tmpSelectRightTagsList && tmpSelectRightTagsList.length>0){

+ 1 - 1
src/components/icss/PubTemplateGroup.vue

@@ -114,7 +114,7 @@ export default {
     let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
     let guisu = localStorage.getItem('guisu') ? JSON.parse(localStorage.getItem('guisu')) : []
     for(let k = 0;k < guisu.length;k++){
-      templateOwn = templateOwn.filter(item => item.key != guisu[k])
+      // templateOwn = templateOwn.filter(item => item.key != guisu[k])
     }
     this.Adscriptions = templateOwn;
   },

+ 1 - 1
src/components/icss/TemplateMaintenance.vue

@@ -52,7 +52,7 @@
                         label="操作">
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <!-- <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>