Merge remote-tracking branch 'origin/test' into test

src/components/basicKnow/AddTerm.vue

@@ -9,12 +9,12 @@
           <tr>
             <td class="ind">序号</td>
             <td>
-              标准词
+              医学标准术语
               <span class="necess">*</span>
             </td>
             <td>拼音</td>
             <td>
-              类型
+              术语类型
               <span class="necess">*</span>
             </td>
             <td class="desc">说明</td>
@@ -28,7 +28,7 @@
               <input
                 v-else
                 type="text"
-                v-model="data.name"
+                v-model.trim="data.name"
                 placeholder="请输入术语"
                 maxlength="50"
                 @blur="handleBlur(1)"
@@ -43,7 +43,7 @@
             <td>
               <input
                 type="text"
-                v-model="data.spell"
+                v-model.trim="data.spell"
                 placeholder="请输入拼音"
                 maxlength="50"
                 @input="handlePinyin($event,1)"
@@ -64,6 +64,7 @@
                   filterable
                   clearable
                   placeholder="请选择"
+                  @clear="clearDataCi"
                   size="small"
                   @change="selectType"
                 >
@@ -80,7 +81,7 @@
               <span v-else>{{data.type}}</span>
             </td>
             <td class="desc">
-              <input v-model="data.remark" placeholder="请输入术语说明" maxlength="120" />
+              <input v-model.trim="data.remark" placeholder="请输入术语说明" maxlength="120" />
             </td>
           </tr>
         </table>
@@ -88,9 +89,9 @@
           <table class="deptbox deptboxTable">
             <tr>
               <td class="ind">序号</td>
-              <td>术语</td>
+              <td class="desc">医学标准术语</td>
               <td>拼音</td>
-              <td>类型</td>
+              <td>术语类型</td>
               <td class="desc">说明</td>
               <td class="descs">术语性质</td>
               <td v-if="id">操作</td>
@@ -102,7 +103,7 @@
                 <!-- <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"
+                  v-model.trim="item.name"
                   :title="item.name"
                   placeholder="请输入术语"
                   maxlength="50"
@@ -122,7 +123,7 @@
               <td>
                 <input
                   type="text"
-                  v-model="item.spell"
+                  v-model.trim="item.spell"
                   placeholder="请输入拼音"
                   maxlength="50"
                   @input="handlePinyin($event,2,index)"
@@ -136,6 +137,7 @@
                     filterable
                     placeholder="请选择"
                     size="small"
+                    @clear="clearDataCi"
                     @change="selectType"
                   >
                     <el-option-group v-for="group in options" :key="group.label">
@@ -151,9 +153,9 @@
                 <span v-else>{{data.type}}</span>
               </td>
               <td class="desc">
-                <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" />
+                <input v-model.trim="item.remark" placeholder="请输入术语说明" maxlength="120" />
               </td>
-              <td class="desc">{{item.isConcept == 1?"标准词":"同义词"}}</td>
+              <td class="desc">{{item.isConcept == 1?"医学标准术语":"同义词"}}</td>
               <td v-if="id">
                 <span class="displayColor" v-if="item.isConcept == 1">删除</span>
                 <span @click="deleLine(index,55,item)" class="delete" v-else>删除</span>
@@ -185,9 +187,9 @@
         <table class="deptbox" v-if="id == ''">
           <tr>
             <td class="ind">序号</td>
-            <td>术语</td>
+            <td >医学标准术语</td>
             <td>拼音</td>
-            <td>类型</td>
+            <td>术语类型</td>
             <td class="desc">说明</td>
             <td v-if="id">操作</td>
           </tr>
@@ -198,7 +200,7 @@
               <!-- <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"
+                v-model.trim="item.name"
                 placeholder="请输入术语"
                 maxlength="50"
                 @blur="handleBlur(2,index)"
@@ -213,7 +215,7 @@
             <td>
               <input
                 type="text"
-                v-model="item.spell"
+                v-model.trim="item.spell"
                 placeholder="请输入拼音"
                 maxlength="50"
                 @input="handlePinyin($event,3,index)"
@@ -221,7 +223,7 @@
             </td>
             <td>{{data.type}}</td>
             <td class="desc">
-              <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" />
+              <input v-model.trim="item.remark" placeholder="请输入术语说明" maxlength="120" />
             </td>
             <td v-if="id">
               <span @click="deleLine(index,1,item)" class="delete">删除</span>
@@ -239,18 +241,18 @@
                 <el-option v-for="(it,i) in sex" :key="i" :label="it.name" :value="it.name"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="年龄：" class="ages">
+            <el-form-item label="年龄：" class="ages is-required">
               <el-input v-model.number="minAge" type="number" @input="inputAge"></el-input>
               <span class="ageLine">~</span>
               <el-input v-model.number="maxAge" type="number" @input="inputAge"></el-input>
             </el-form-item>
             <el-form-item
-              v-if="data.type=='实验室检查套餐'" label="最大值与最小值：" class="ages">
+              v-if="data.type=='实验室检查子项目'" label="最大值与最小值：" class="ages">
               <el-input v-model.number="minValue" type="number" @input="inputAge"></el-input>
               <span class="ageLine">~</span>
               <el-input v-model.number="maxValue" type="number" @input="inputAge"></el-input>
             </el-form-item>
-            <el-form-item v-if="data.type=='实验室检查套餐'" label="范围：" class="range">
+            <el-form-item v-if="data.type=='实验室检查子项目'" label="范围：" class="range">
               <el-select v-model="rangeSelect">
                 <el-option v-for="(it,i) in range" :key="i" :label="it.name" :value="it.name"></el-option>
               </el-select>
@@ -407,6 +409,9 @@ export default {
     }
   },
   methods: {
+    clearDataCi(){
+      this.data.code = ''
+    },
     dragAdd(ev) {
       utils.dragBox('dragModalWrap', 'dragModalTitle', 'add');
     },
@@ -762,7 +767,7 @@ export default {
         this.warning('请输入标准词');
         return;
       }
-      if (!this.data.code && !this.unfit) {
+      if (!this.data.code && !this.unfit && !this.data.type) {
         this.warning('请选择术语类型');
         return;
       }
@@ -771,9 +776,13 @@ export default {
         this.warning('请先选择标准词');
         return;
       }
+      if(this.data.type == '疾病' && !this.icdCode){
+        this.warning('请输入ICD10编码');
+        return;
+      }
       // 年龄为必填项--2019-6-5需求
       if (this.showMore == 1) {
-        if ((!this.minAge && this.minAge != 0) || !this.maxAge) {
+        if ((!this.minAge && this.minAge !== 0) || !this.maxAge) {
           this.warning('年龄不能为空，区间为0-200');
           return;
         }
@@ -786,8 +795,11 @@ export default {
           this.warning('年龄必须是0-200');
           return;
         }
+        if(this.minValue >= this.maxValue){
+          this.warning('最小值小于最大值');
+          return;
+        }
       }
-
       // 过滤同义词空数据
       let realData = [];
       if (this.id) {
@@ -1082,6 +1094,7 @@ td {
 }
 /deep/.ages {
   margin-top: 20px;
+  position: relative;
   .el-input {
     display: inline-block;
     width: auto;

src/components/basicKnow/BasicPartOfSpeech.vue

@@ -14,7 +14,7 @@
           </el-select>
         </el-form-item>
         <el-form-item class="dododo">
-          <el-button size="mini" @click="filterDatas">搜索</el-button>
+          <el-button size="mini" @click="filterDatas">确认</el-button>
         </el-form-item>
       </el-form>
     </crumbs>

src/components/basicKnow/BasicRelationship.vue

@@ -16,7 +16,7 @@
           <el-input size="mini" type="number" v-model="filter.term" placeholder="请输入编码"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" @click="filterDatas">搜索</el-button>
+          <el-button size="mini" @click="filterDatas">确认</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
@@ -25,7 +25,7 @@
         <el-table-column type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column prop="name" label="关系类型名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="code" label="数字编码" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="modifier" label="操作人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="operName" label="操作人" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gmtModified" label="操作时间" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -2,7 +2,7 @@
   <div>
     <crumbs title="基础术语维护" minWidth="995px" class="knowledgeTitle">
       <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="标准术语：">
+        <el-form-item label="医学标准术语：">
           <el-input size="mini" v-model="filter.term" placeholder="请输入术语"></el-input>
         </el-form-item>
         <el-form-item label="术语类型：">
@@ -29,18 +29,23 @@
                     </el-select>
                 </el-form-item>
         <el-form-item>
-          <el-button size="mini" @click="filterDatas">搜索</el-button>
+          <el-button size="mini" @click="filterDatas">确认</el-button>
         </el-form-item>
       </el-form>
       <el-form class="secLine">
         <el-form-item>
+          <el-button size="mini" type="warning" @click="addMedicalName" style="margin:0 10px">+ 新增术语</el-button>
           <el-button
             size="mini"
-            :type="reloadFlag?'danger':'info'"
             @click="reloadLib"
-            style="margin:0 10px"
-          >加载词库</el-button>
-          <el-button size="mini" type="warning" @click="addMedicalName" style="margin:0 10px">新增术语</el-button>
+            :style="{
+              'margin':'0 10px',
+              'background':reloadFlag?'#fff':'#aaa',
+              'color':reloadFlag?'#48C5D7':'#fff',
+              'border-color':reloadFlag?'#48C5D7':'#aaa',
+              'cursor':reloadFlag?'pointer':'not-allowed',
+            }"
+          >更新数据</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
@@ -166,6 +171,7 @@ export default {
     reloadLib() {
       if (this.reloadFlag) {
         this.reloadFlag = false;
+        return
         api.clearStandRuleDrug().then(res => {
           if (res.data.code == 0) {
             this.reloadFlag = true;

src/components/knowledgeExtra/AboutDisease.vue

@@ -27,7 +27,7 @@
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
-                        prop="modifier"
+                        prop="modifierName"
                         label="操作人">
                 </el-table-column>
                 <el-table-column

src/components/knowledgeExtra/DiseaseTree.vue

@@ -286,6 +286,7 @@ export default {
         }
         const {libType} = this.operaList
 
+        this.list.length>0&&this.excludedConceptIds.push(this.list[0].conceptId)
         const params = {
           "name": txt,
           "excludedConceptIds": this.excludedConceptIds||[],

src/components/knowledgeExtra/KnowledgeBaseType.vue

@@ -16,7 +16,7 @@
           <el-input size="mini" type="number" v-model="filter.term" placeholder="请输入编码"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button size="mini" @click="filterDatas">搜索</el-button>
+          <el-button size="mini" @click="filterDatas">确认</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
@@ -28,7 +28,7 @@
         <el-table-column prop="isHasCommonCn" label="是否支持通用扩展" show-overflow-tooltip></el-table-column>
         <el-table-column prop="canChangeCn" label="是否允许修改" show-overflow-tooltip></el-table-column>
         <el-table-column prop="onlyOneCn" label="是否只有单个词" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="modifier" label="操作人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="operName" label="操作人" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gmtModified" label="操作时间" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">

src/components/knowledgeExtra/StaticInfo.vue

@@ -54,7 +54,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        prop="modifier"
+                        prop="modifierName"
                         label="操作人"
                         width="80">
                 </el-table-column>