7389、7386/7320

src/components/basicKnow/AddTerm.vue

@@ -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)"
@@ -80,7 +80,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>
@@ -102,7 +102,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 +122,7 @@
               <td>
                 <input
                   type="text"
-                  v-model="item.spell"
+                  v-model.trim="item.spell"
                   placeholder="请输入拼音"
                   maxlength="50"
                   @input="handlePinyin($event,2,index)"
@@ -151,7 +151,7 @@
                 <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 v-if="id">
@@ -198,7 +198,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 +213,7 @@
             <td>
               <input
                 type="text"
-                v-model="item.spell"
+                v-model.trim="item.spell"
                 placeholder="请输入拼音"
                 maxlength="50"
                 @input="handlePinyin($event,3,index)"
@@ -221,7 +221,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>

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>

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -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"
+            :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-button size="mini" type="warning" @click="addMedicalName" style="margin:0 10px">新增术语</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
@@ -55,7 +60,7 @@
             <span :class="scope.row.isDeleted == 'Y'?'deletes':'reviews'">{{scope.row.isDeleted == 'N'?'启用中':'禁用中'}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="modifier" label="操作人"></el-table-column>
+        <el-table-column prop="modifierName" label="操作人"></el-table-column>
         <el-table-column prop="gmtModified" label="操作时间" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">
@@ -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/DiseaseTree.vue

@@ -285,7 +285,8 @@ export default {
           this.excludedConceptIds = this.IteraNodeList(this.list[0].nodeList,excludedConceptIds, 2)
         }
         const {libType} = this.operaList
-        this.excludedConceptIds.push(this.list[0].conceptId)
+
+        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>