Merge branch 'test' into ChronicMag_zxc

src/components/icss/AddMedicalName.vue

@@ -55,7 +55,7 @@
                 <!-- 使用原生input，输入限制 -->
                 <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
                 <!-- <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @input="handleInput(2,index)"> -->
-                <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index,99)">
+                <input type="text" v-model="item.name" :title="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index,99)" :disabled="!item.isEdit">
               </td>
               <td>
                 {{data.type}}
@@ -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,8 @@ import api from '@api/icss.js';
             tmpAllwords[i].isConcept = 0
           }
         }
+        this.tmpSynonymous = tmpAllwords
+        this.synonymous = tmpAllwords
       },
       toggleShow(num){
         let tmpShow = this.show
@@ -302,7 +305,8 @@ import api from '@api/icss.js';
         let singleSpan = {
           name:'',
           remark:'',
-          isConcept:0
+          isConcept:0,
+          isEdit:true
         }
         if(type == 55){
           this.allwords.push(singleSpan);
@@ -345,10 +349,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.synonymous.filter((item)=>{
+            return item.name;
+          })
           let tmpArr = []
           for(let k = 0;k < realData.length;k++){
             if(realData[k].isConcept == 1){
@@ -360,7 +365,12 @@ import api from '@api/icss.js';
               this.data = tmpArr[0]
             }
           }
+        }else{
+          realData = this.synonymous.filter((item)=>{
+            return item.name;
+          })
         }
+        console.log(realData,787887)
         let detailList = [];
         detailList[0] = this.data;
         for(let i=0; i<realData.length; i++){

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/DiagnosisList.vue

@@ -144,6 +144,7 @@ export default {
             const param = this.getFilterItems();
             api.getTagList(param).then((res) => {
                 const list = res.data.data.records
+                console.log(res,1111111111)
                 for (var i = 0; i < list.length; i++) {
                     for (var j =  0; j < this.tagTypes.length; j++) {
                         if(list[i].tagType == this.tagTypes[j].val) {

src/components/icss/MedicalName.vue

@@ -216,8 +216,8 @@
           conceptId:item.conceptId,
           isDeleted:item.isDeleted === 'N'?'Y':'N'
         }
-        
-        this.showConfirmDialog('删除该标准术语，需要将所关联的医学属性、术语关系、医学静态知识等信息全部解除关联才可正常删除该信息，是否删除？',()=>{
+        let waringTxt = (item.isDeleted === 'N'?'是否删除该标准术语？':'是否重新启用该条数据？')
+        this.showConfirmDialog(waringTxt,()=>{
           api.deletMedicalName(param).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');

src/components/icss/MedicalRelation.vue

@@ -165,6 +165,7 @@
           "relationId": this.type,
           "size": this.pageSize,
           "startName": this.startName,
+          "isDeleted":this.isState
         }
         const params = this.type?param1:param;
         api.knowledgeRelation(params).then((res) => {
@@ -243,7 +244,8 @@
           id:item.id,
           isDeleted:item.isDeleted === 'N'?'Y':'N'
         }
-        this.showConfirmDialog('是否删除该关系？可能对现有系统造成影响',()=>{
+        let warningTxt = item.isDeleted === 'N'?'是否删除该关系？可能对现有系统造成影响':'是否重新启用该条数据？'
+        this.showConfirmDialog(warningTxt,()=>{
           api.delKnowledgeRelation(params).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
@@ -276,6 +278,7 @@
               message: '上传成功',
               type: 'success',
             });
+            this.getDataList()
           }else{
             this.$message({
               dangerouslyUseHTMLString: true,

src/components/icss/TemplateMaintenance.vue

@@ -9,7 +9,13 @@
                 </el-form-item>
                 <el-form-item label="归属：">
                     <el-select size="mini" v-model="filter.tagAdscription" placeholder="归属" clearable>
-                        <el-option v-for="item in Adscriptions" :label="item.name" :value="item.val" :key="item.val" ></el-option>
+                        <el-option 
+                          v-for="item in Adscriptions" 
+                          :label="item.name" 
+                          :value="item.val" 
+                          :key="item.val" 
+                          v-if="!((filter.templateType === 0 || filter.templateType === 1) && (item.val == 4 || item.val == 5 || item.val == 6))"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="属于：">
@@ -132,6 +138,7 @@
     },
     watch: {
       tmpType(newVal, preVal){
+        this.filter.tagAdscription = ''
         if(newVal != preVal){
           if(newVal == 1){
             this.AdscriptionsOwnTo = this.deptAndDisInfo.deptDTOS

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'