Merge branch 'dev' into test

src/components/icss/AddMedicalName.vue

@@ -155,7 +155,8 @@ import api from '@api/icss.js';
         colspans:5,
         currentPage:1,
         pageSize:10,
-        show:false
+        show:false,
+        tmpSynonymous:[]
       }
     },
     created(){
@@ -177,7 +178,7 @@ import api from '@api/icss.js';
     },
     methods:{
       changeState(val){
-        let tmpAllwords = this.synonymous.slice(0);
+        let tmpAllwords = JSON.parse(JSON.stringify(this.synonymous));
         for(let i = 0;i < tmpAllwords.length;i++){
           if(i+1 == val){
             tmpAllwords[i].isConcept = 1
@@ -186,6 +187,7 @@ import api from '@api/icss.js';
             tmpAllwords[i].isConcept = 0
           }
         }
+        this.tmpSynonymous = tmpAllwords
       },
       toggleShow(num){
         let tmpShow = this.show
@@ -346,10 +348,11 @@ import api from '@api/icss.js';
           return
         }
         // 过滤同义词空数据
-        let realData = this.synonymous.filter((item)=>{
-          return item.name;
-        })
-        if(this.id){
+        let realData=[];
+        if(this.id){//修改用暂存的列表
+          realData = this.tmpSynonymous.filter((item)=>{
+            return item.name;
+          })
           let tmpArr = []
           for(let k = 0;k < realData.length;k++){
             if(realData[k].isConcept == 1){
@@ -361,6 +364,10 @@ import api from '@api/icss.js';
               this.data = tmpArr[0]
             }
           }
+        }else{
+          realData = this.synonymous.filter((item)=>{
+            return item.name;
+          })
         }
         let detailList = [];
         detailList[0] = this.data;

src/components/icss/CommonTemplate.vue

@@ -490,9 +490,15 @@ export default {
       return this.isHasTag(item, this.selectRightTagsList)
     },
     toLeftList() {
-      if (this.selectRightTagsList.length>0 && this.selectRightTagsList[0].type !== 'sub') {    //往左的是子模板不变或者输入框，是输入框或者标签就删除
-        for (let i = 0; i < this.selectRightTagsList.length; i++) {
-          this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[0].id)
+      let tmpRightLis = this.selectRightTagsList;
+      if (tmpRightLis.length>0 && tmpRightLis[0].type !== 'sub') {    //往左的是子模板不变或者输入框，是输入框或者标签就删除
+        for (let i = 0; i < tmpRightLis.length; i++) {
+          this.rightTagsList = this.rightTagsList.filter(item => item.id !== tmpRightLis[0].id)
+        }
+        if(tmpRightLis[0].flag == 1){
+          this.flagLisFst = -1
+        }else if(tmpRightLis[0].flag == 4){
+          this.flagLisSec = -1
         }
         this.searchTagList()
         this.$emit('changeActionData', this.rightTagsList, false);

src/components/icss/TemplateMaintenanceWrap.vue

@@ -90,7 +90,7 @@ export default {
           type: 'warning'
         });
         return;
-      }else if(detailLis[0].questionId == '' && detailLis.length == 1){
+      }else if(detailLis[0].questionId == '' && detailLis.length == 1 && detailLis[0].flag != 3){
         this.$message({
           message: '保存模版时，无法保存单独的输入栏',
           type: 'warning'