Merge remote-tracking branch 'origin/testedMerge' into dev5.3.4+

src/api/config.js

@@ -1,6 +1,7 @@
 export default {
   host:'http://192.168.2.241:5050',
-  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
+  delayTime: 500,
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',

src/components/diagBase/DisFeatureItem.vue

@@ -117,6 +117,7 @@
                 </tr>
 </template>
 <script>
+import config from '@api/config.js';
 export default {
     props:['item', 'index','featureTypeList','showDiagList','searchIndex',
             'searchFiled', 'searchResultList'],
@@ -144,7 +145,7 @@ export default {
             let timer = setTimeout(()=>{
                 clearTimeout(this.timer);
                 this.$emit('handleInp',{index,e,type,itemType})
-            }, 100)
+            }, config.delayTime)
             this.timer = timer
         },
         clickItem(index, type) {

src/components/diagBase/DisFormulaItem.vue

@@ -28,6 +28,7 @@
                 </tr>
 </template>
 <script>
+import config from '@api/config.js';
 export default {
     props:['item', 'index','formulaTypeList'],
     data() {
@@ -54,7 +55,7 @@ export default {
             let timer = setTimeout(()=>{
                 clearTimeout(this.timer);
                 this.$emit('handleInp',{index,e,type,itemType})
-            }, 100)
+            }, config.delayTime)
             this.timer = timer
         },
         clickItem(index, type) {

src/components/icss/AddMedicalMultRelation.vue

@@ -161,7 +161,7 @@ import api from '@api/icss.js';
     },
     methods:{
        allowDrop(draggingNode, dropNode, type) {
-        if(draggingNode.data.parentConceptName !== dropNode.data.parentConceptName){
+        if(draggingNode.parent.data.conceptName !== dropNode.parent.data.conceptName){
           return false
         }else{
           return type !== 'inner'

src/components/icss/AddMedicalName.vue

@@ -27,6 +27,7 @@
                 :searchType='searchType'
                 :similarList = 'similarList'
                 isShow = "true"
+                @closeTable = "closeTable"
              >
              </SimilarListDrag>
             </td>
@@ -84,6 +85,7 @@
                     :searchType='searchType'
                     :similarList = 'similarList'
                     :isShow = "index ===searchIndex"
+                    @closeTable = "closeTable"
                 >
                 </SimilarListDrag>
               </td>
@@ -160,6 +162,7 @@
                 :searchType='searchType'
                 :similarList = 'similarList'
                 :isShow = "index ===searchIndex"
+                @closeTable = "closeTable"
               >
               </SimilarListDrag>
             </td>
@@ -311,6 +314,7 @@ import SimilarListDrag from './SimilarListDrag'
           utils.dragBox('dragModalWrap','dragModalTitle','del')
       },
       closeTable(){
+        this.searchType = ''
         this.similarList = []
       
       },
@@ -522,6 +526,7 @@ import SimilarListDrag from './SimilarListDrag'
       },
       getSimilarList(name){
         if(!name){
+          this.closeTable()
           return
         }
         const param = {

src/components/icss/AddMedicinePrompt.vue

@@ -257,6 +257,7 @@
             }
             this.saveDisable = false
           }).catch((err) => {
+            this.saveDisable = false
             this.warning(err);
           })
         });

src/components/icss/SimilarListDrag.vue

@@ -47,7 +47,7 @@ export default {
             utils.dragBox('dragModalWrap','dragModalTitle','del')
         },
         closeTable(){
-            this.similarList = []
+            this.$emit("closeTable")
         },
     }
 }

src/components/medicalTerm/AddAssistCheckMultRelation.vue

@@ -75,6 +75,7 @@
 <script type="text/javascript">
 import api from '@api/icss.js';
 import apis from '@api/medicalTerm.js';
+import config from '@api/config.js';
   export default {
     name:'AddAssistCheckMultRelation',
     data(){
@@ -135,7 +136,8 @@ import apis from '@api/medicalTerm.js';
         level: 0, //层级（修改时只能显示三级）
         saveDisable: false,  //保存按钮禁止点击
         showSearch: false,
-        defaultExpandedArr: []
+        defaultExpandedArr: [],
+        timer: undefined
       }
     },
     created(){
@@ -157,13 +159,20 @@ import apis from '@api/medicalTerm.js';
           this.conceptList = []
         }
         if(nextVal.trim() &&nextVal != prevVal) {
-          this.searchConcept()
+          clearTimeout(this.timer)
+          let timer = setTimeout(()=>{
+                clearTimeout(this.timer);
+                this.searchConcept()
+            }, config.delayTime)
+            this.timer = timer
+
+          
         }
       }
     },
     methods:{
        allowDrop(draggingNode, dropNode, type) {
-        if(draggingNode.level !== dropNode.level){
+        if(draggingNode.parent.data.conceptName !== dropNode.parent.data.conceptName){
           return false
         }else{
           return type !== 'inner'
@@ -241,12 +250,14 @@ import apis from '@api/medicalTerm.js';
         return nodeListResult
       },
       searchConcept() {
+        if(!this.conceptText.trim()) {
+          return
+        }
         let  excludedConceptIds = [];
         if(this.list[0]) {
           excludedConceptIds.push(this.list[0].conceptId)
           this.excludedConceptIds = this.IteraNodeList(this.list[0].nodeList,excludedConceptIds, 2)
         }
-        
         const param = {
           "name": this.conceptText,
           "excludedConceptIds": this.excludedConceptIds,
@@ -256,15 +267,18 @@ import apis from '@api/medicalTerm.js';
         }
         if(this.addLevel === 0) {
           param.relationTypeId = 16
-        }
+        } 
         if(this.addLevel > 0) {
           param.relationPosition = 0
+          param.relationTypeIdSupplement = [16,71]
         }
         
         api.getConceptInfoAssay(param).then((res) => {
           const { data } = res
           if(data.code == '0') {
-            this.conceptList = data.data
+            if(this.conceptText.trim()) {
+              this.conceptList = data.data
+            }
           }
         })
       },
@@ -294,6 +308,11 @@ import apis from '@api/medicalTerm.js';
         this.showSearch = false
       },
       append(data, e) {
+          e.stopPropagation()
+          if(!data.isExpanded) {
+            data.isExpanded = true
+            this.defaultExpandedArr.push(data.conceptId)
+          }
           this.addLevel = data.level+1;
           this.relationConceptId = data.conceptId
           this.operaList = data;

src/components/medicalTerm/AddAssistCheckSon.vue

@@ -113,7 +113,7 @@
             const param = {
               "name": this.searchConcept,
               "relationId": 18,
-              "relationPosition": 1,
+              "relationPosition": 0,
               "relationTypeId": 16,
               "typeId": 16
             }

src/components/medicalTerm/AssistCheckMultRelation.vue

@@ -214,12 +214,12 @@
         const param = {
           conceptId:item.conceptId,
           // isDeleted:item.isDeleted === 'N'?'Y':'N',
-          relationIds: [17,17],
-          typeIds: [3,1]
+          relationIds: [17,17,17],
+          typeIds: [16,16,16]
         }
         let waringTxt = '是否删除该关系，可能对现有系统造成影响'
         this.showConfirmDialog(waringTxt,()=>{
-          api.removeRelationContact(param).then((res)=>{
+          api.assistCheckRemoveMultRelation(param).then((res)=>{
             if(res.data.code=='0'){
               if(!this.searched){
                 //未点确认时清空搜索条件

src/components/preTreat/QuestionTagGroup.vue

@@ -21,13 +21,13 @@
             <li v-for="(item, index) in leftTagsList"
                 class = "tagItem"
                 :key='item.id'
-                :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+(item.specFlag?'、跟主':'')+')'"
+                :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+')'"
                 :style="getStyle(item)?styles:null"
                 @click='selectLeftTag(item, index, $event)'
             >
                 <p class="ellipsis" >
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
                 </p>
             </li>
         </ul>
@@ -46,9 +46,9 @@
                 :style="getStyle2(item)?styles:null"
                 @click='selectRightTag(item)'
             >
-                <p class="ellipsis" :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+(item.specFlag?'、跟主':'')+')'">
+                <p class="ellipsis" :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+')'">
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
                 </p>
                 <el-tag class="exclu" v-if="item.exclusionType==1" type="info" size="mini">互斥项</el-tag>
             </li>