Merge branch 'knowledgeExtra_0521' into test

src/components/basicKnow/AddTerm.vue

@@ -391,16 +391,16 @@
               <div-editable v-model="klSymptomVO.enName" :Maincontent="'enNamekl'"></div-editable>
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="就诊科室：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klSymptomVO.deptList" :type="115"></searchTerm>
+              <searchTerm :refbool.sync="klSymptomVO.deptList" :id="id" :type="115"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="发病部位：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klSymptomVO.partList" :type="122"></searchTerm>
+              <searchTerm :refbool.sync="klSymptomVO.partList" :id="id" :type="122"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="常见伴随症状：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klSymptomVO.conSymptomList" :type="103"></searchTerm>
+              <searchTerm :refbool.sync="klSymptomVO.conSymptomList" :id="id" :type="103"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="性质：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klSymptomVO.natureList" :type="126"></searchTerm>
+              <searchTerm :refbool.sync="klSymptomVO.natureList" :id="id" :type="126"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='症状'" label="缓解因素：" prop="description" class="marT">
               <div-editable v-model="klSymptomVO.mitigatingFac" :Maincontent="'mitigatingFac'"></div-editable>
@@ -492,13 +492,13 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="疾病就诊科室：" v-if="data.type=='疾病'" class="marT">
-              <searchTerm :refbool.sync="klDiseaseVO.deptList" :type="115"></searchTerm>
+              <searchTerm :refbool.sync="klDiseaseVO.deptList" :id="id" :type="115"></searchTerm>
             </el-form-item>
             <el-form-item label="疾病发病部位：" v-if="data.type=='疾病'" class="marT">
-              <searchTerm :refbool.sync="klDiseaseVO.partList" :type="122"></searchTerm>
+              <searchTerm :refbool.sync="klDiseaseVO.partList" :id="id" :type="122"></searchTerm>
             </el-form-item>
             <el-form-item label="疾病系统分类：" v-if="data.type=='疾病'" class="marT">
-              <searchTerm :refbool.sync="klDiseaseVO.systemTypeList" :type="307"></searchTerm>
+              <searchTerm :refbool.sync="klDiseaseVO.systemTypeList" :id="id" :type="307"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='疾病'" label="肿瘤/细胞类型：" prop="description" class="marT">
               <div-editable v-model="klDiseaseVO.tumorCellType" :Maincontent="'tumorCellType'"></div-editable>
@@ -654,10 +654,10 @@
               ></el-input>
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="科室：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klVitalResultVO.deptList" :type="115"></searchTerm>
+              <searchTerm :refbool.sync="klVitalResultVO.deptList" :id="id" :type="115"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="部位：" prop="description" class="marT">
-              <searchTerm :refbool.sync="klVitalResultVO.partList" :type="122"></searchTerm>
+              <searchTerm :refbool.sync="klVitalResultVO.partList" :id="id" :type="122"></searchTerm>
             </el-form-item>
             <el-form-item v-if="data.type=='体格检查结果'" label="不适宜人群：" prop="description" class="marT">
               <div-editable v-model="klVitalResultVO.suitablePopNo" :Maincontent="'Maincontent1'"></div-editable>

src/components/basicKnow/DivEditable.vue

@@ -1,15 +1,16 @@
 <template>
   <div>
-    <span class="address-placeholder" v-show="onshow">请输入</span>
+    <span class="address-placeholder" v-show="onshow" @click="getfouce">请输入</span>
     <div
       class="test_box"
       contenteditable="true"
       v-html="innerText"
       :ref="Maincontent"
       @input="handleInput"
+      @blur="unblur"
+      @focus="changeColor"
       @compositionstart="handleStart"
       @compositionend="handleEnd"
-      @focus="isChange = false"
     ></div>
   </div>
 </template>
@@ -40,6 +41,16 @@ export default {
     this.onshow = len > 0 ? false : true;
   },
   methods: {
+    changeColor(){
+      this.isChange = false
+      this.$refs[this.Maincontent].style.border = '1px solid #48C5D7'
+    },
+    unblur() {
+      this.$refs[this.Maincontent].style.border = '1px solid #dcdfe6'
+    },
+    getfouce() {
+       this.$refs[this.Maincontent].focus()
+    },
     handleInput(event) {
       let text = event.target.innerText;
       let len = text.length;

src/components/basicKnow/searchTerm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="address-placeholder" v-show="!onshow && items.length == 0" @click="getfouce">请输入要选择的内容</div>
-    <div class="source" @click="getfouce">
+    <div class="address-placeholder" v-show="!onshow && items.length == 0" @click="getfouce">请搜索</div>
+    <div class="source" @click="getfouce" ref="source">
       <div class="select">
         <transition-group name="flip-list">
           <span
@@ -23,10 +23,10 @@
           ref="inputVal"
           v-html="innerText"
           @blur="unblur"
+          @focus="changeColor"
           v-model="value"
           @input="handleInput"
         />
-        <i class="el-icon-arrow-down"></i>
       </div>
       <ul class="list" v-if="conceptList.length>0 && onshow">
         <li
@@ -48,7 +48,7 @@
 import api from '@api/knowledgeTree.js';
 export default {
   name: 'searchTerm',
-  props: ['type', 'refbool'],
+  props: ['type', 'refbool', 'id'],
   data() {
     return {
       innerText: '',
@@ -74,6 +74,9 @@ export default {
     }
   },
   methods: {
+    changeColor() {
+      this.$refs.source.style.border = '1px solid #48C5D7';
+    },
     handleInput(event) {
       let text = event.data ? event.data : '';
       let len = text.length;
@@ -95,6 +98,9 @@ export default {
                 it => it.conceptId !== item.conceptId
               );
             });
+            this.conceptList = this.conceptList.filter(
+              it => it.conceptId !== this.id
+            );
           }
         })
         .catch(error => {
@@ -122,6 +128,7 @@ export default {
       this.onshow = false;
       this.conceptList = [];
       this.value = '';
+      this.$refs.source.style.border = '1px solid #dcdfe6';
     },
     shuffle() {
       this.items = _.shuffle(this.items);
@@ -193,11 +200,7 @@ export default {
     background: #f5f7fa;
   }
 }
-.el-icon-arrow-down {
-  position: absolute;
-  top: 21px;
-  right: 15px;
-}
+
 .source {
   min-height: 40px;
   outline: 0;
@@ -226,6 +229,9 @@ export default {
       height: 30px;
       border: none;
     }
+    .source:target {
+      border: 1px solid #51c9ff;
+    }
   }
 }
 </style>

src/components/knowledgeExtra/AddZskRegisteredDrug.vue

@@ -12,46 +12,46 @@
           label-width="100px"
         >
           <el-form-item label="药品代码:" prop="drugCode">
-            <el-input v-model="formInline.drugCode" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.drugCode" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="最小包装单位:">
-            <el-input v-model="formInline.minPackUnit" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.minPackUnit" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="注册名称:" prop="name">
-            <el-input v-model="formInline.name" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.name" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="药品企业:">
-            <el-input v-model="formInline.company" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.company" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="英文名称:">
-            <el-input v-model="formInline.enName" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.enName" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="批准文号:">
-            <el-input v-model="formInline.approval" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.approval" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="商品名称:">
-            <el-input v-model="formInline.tradeName" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.tradeName" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="药品本位码:">
-            <el-input v-model="formInline.standardCode" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.standardCode" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="药品剂型:">
-            <el-input v-model="formInline.form" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.form" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="医保类型:">
-            <el-input v-model="formInline.insuranceType" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.insuranceType" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="注册规格:">
-            <el-input v-model="formInline.specification" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.specification" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="医保备注:">
-            <el-input v-model="formInline.insuranceRemrk" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.insuranceRemrk" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="最小包装数量:">
-            <el-input v-model="formInline.minPackQuantity" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.minPackQuantity" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="药品类别:">
-            <el-input v-model="formInline.drugType" maxlength="200" placeholder="请输入"></el-input>
+            <el-input v-model.trim="formInline.drugType" maxlength="200" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="关联通用名:">
             <el-select
@@ -107,11 +107,9 @@ export default {
       },
       rules: {
         drugCode: [
-          { required: true, message: '请输入药品代码', trigger: 'blur' },
+          { required: true, message: '请输入药品代码', trigger: 'blur' }
         ],
-        name: [
-          { required: true, message: '请输入注册名称', trigger: 'change' }
-        ]
+        name: [{ required: true, message: '请输入注册名称', trigger: 'change' }]
       },
       conceptList: [],
       value: '',
@@ -156,12 +154,14 @@ export default {
   },
   methods: {
     searchConcept(val) {
+      if (val == '') {
+        return;
+      }
       api
         .getsearchDrug({ name: val })
         .then(res => {
           if (res.data.code == '0') {
             const data = res.data.data;
-
             this.$nextTick(() => {
               // dom元素更新后执行，因此这里能正确打印更改之后的值
               this.conceptList = data; // 改变了的值
@@ -200,8 +200,8 @@ export default {
         }
       });
     },
-    getfocus(){
-      this.conceptList = []
+    getfocus() {
+      this.conceptList = [];
     },
     confirm() {
       let _this = this;

src/components/knowledgeExtra/RegisteredDrug.vue

@@ -5,8 +5,8 @@
         <el-form-item label="通用名：">
           <el-input size="mini" v-model="filter.commonName" placeholder="输入通用名" clearable></el-input>
         </el-form-item>
-        <el-form-item label="注册名：">
-          <el-input size="mini" v-model="filter.name" placeholder="输入注册名" clearable></el-input>
+        <el-form-item label="注册/商品名称：">
+          <el-input size="mini" v-model="filter.name" placeholder="输入注册/商品名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="企业：">
           <el-input size="mini" v-model="filter.company" placeholder="输入企业名称" clearable></el-input>
@@ -225,7 +225,7 @@ export default {
       const params = {
         id: row.id
       };
-      const warningTxt = '是否删除该诊断依据？可能对现有系统造成影响';
+      const warningTxt = '是否删除该注册药品？可能对现有系统造成影响';
       this.showConfirmDialog(warningTxt, () => {
         api.paramDelete(params)
           .then(res => {
@@ -263,6 +263,9 @@ export default {
   height: 40px;
   min-width: 970px !important;
 }
+/deep/.demo-form-inline .el-input--mini .el-input__inner {
+    width: 115px;
+}
 .demo-form-inline {
   margin: 0 20px 0 0;
 }