Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -149,9 +149,11 @@ export default {
             if (type == 1) {
                 param.tagName = this.mealText
                 param.tagType = [7]
+                param.type = 5
             } else if (type == 2) {
                 param.tagName = this.itemText
                 param.tagType = [1]
+                param.type = 5
             }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {

src/components/icss/AddMedicalMultRelation.vue

@@ -29,7 +29,7 @@
           <el-tree
             :data="list"
             :props="defaultProps"
-            node-key="id"
+            node-key="conceptId"
             default-expand-all
             :expand-on-click-node="false">
             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -154,8 +154,9 @@ import api from '@api/icss.js';
         this.openSearch(e);
       },
       confirm() { 
-        if(this.list[0].nodeList.length == 0) {
+        if(!this.list[0] || this.list[0].nodeList.length == 0) {
           this.message('请输入数据信息');
+          return
         }
         const param = {
           conceptId: this.list[0].conceptId,
@@ -261,7 +262,7 @@ import api from '@api/icss.js';
       remove(node, data) {
           const parent = node.parent;
           const nodeList = parent.data.nodeList || parent.data;
-          const index = nodeList.findIndex(d => d.id === data.id);
+          const index = nodeList.findIndex(d => d.conceptId === data.conceptId);
           nodeList.splice(index, 1);
       },
       message(msg,type){

src/components/icss/AddPhysicalExamTemp.vue

@@ -112,12 +112,12 @@
             } else {
                 this.titleText = '模板详情'
             }
-            const { id, name } = data
+            const { deptId, name } = data
             this.isEdit = isEdit
             this.isDetail = isDetail
             this.rightTagsList = data.vitals
-            this.departList.push({ deptId, name, val:deptId })
-            this.form.department = id
+            this.departList.push({ id:deptId, name, val:deptId })
+            this.form.department = deptId
             
         } else {
             this.getDepartmentList()

src/components/icss/PubIndeptTag.vue

@@ -1,5 +1,7 @@
 <template>
-    <div class="PubTagGroupWrapper">
+    <div class="PubTagGroupWrapper"
+         @click="closeNameLis(1)"
+    >
         <el-form
                 class="groups"
                 :rules="rules"
@@ -324,6 +326,7 @@
           prefix:'',            //前缀
           suffix:'',            //后缀
           tipLis:[],           //提示列表
+          isNeedSearch: false, //是否需要查询（系统名称）
         },
         labelTypesMaps: {       //// 归属和填写单类型限制
           '1':['1','2','5','6','7','11'], //联合推送暂时不用
@@ -415,7 +418,7 @@
         this.tmpSex = prevVal;
       },
       newName(nextVal, prevVal) {
-        if (nextVal != prevVal && (this.form.region12 == 0)) {
+        if (this.isNeedSearch && nextVal != prevVal && (this.form.region12 == 0)) {
           this.focusSystemName()
         }
       },
@@ -486,6 +489,7 @@
         });
       },
       focusSystemName() {
+        this.isNeedSearch = true
         if (this.form.region3.trim() == '') {
           this.systemNameShow = false
           this.systemNameLis = []
@@ -519,6 +523,7 @@
       pushSystemName(val) {
         this.form.region3 = val
         this.systemNameShow = false
+        this.isNeedSearch = false
       },
       closeNameLis(flg) {
         if (flg == 1) {

src/components/icss/SingleSelect.vue

@@ -12,7 +12,7 @@
                     <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isNone || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
-                    <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)||focusOn==-1">标记异常选项</el-checkbox-button>
+                    <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||focusOn==-1">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
                  <span v-if="type == 11" class="tip">可输入中文全角括号"（）", 当作可输入内容的占位符</span>
                 <el-button type="danger" size="small" class="del" @click="delRow">删除</el-button>