Merge branch 'lcq' into byll

src/components/basicKnow/BasicRelationship.vue

@@ -15,11 +15,6 @@
         <el-form-item label="数字编码：">
           <el-input size="mini" v-model="filter.uniqueName" placeholder="请输入" clearable></el-input>
         </el-form-item>
-        <el-form-item label="状态：" class="selectMedicine">
-          <el-select size="mini" v-model="filter.status" placeholder="请选择" clearable>
-            <el-option v-for="item in stateList" :label="item.name" :value="item.id" :key="item.id"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item class="dododo">
           <el-button size="mini" @click="filterDatas">搜索</el-button>
         </el-form-item>
@@ -30,7 +25,6 @@
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="关系名称" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="hisName" label="数字编码" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="uniqueName" label="状态" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="操作人" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="操作时间" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
@@ -70,12 +64,7 @@ export default {
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称
-        status: ''
       },
-      stateList: [
-        { id: 1, name: '启用' },
-        { id: 0, name: '禁用' }
-      ],
       currentPage: 1,
       pageSize: config.pageSize,
       pageSizeArr: config.pageSizeArr,

src/components/basicKnow/BasicTermsMaintenance.vue

@@ -18,16 +18,6 @@
         <el-form-item label="同义词：">
           <el-input size="mini" v-model="filter.libName" placeholder="输入同义词"></el-input>
         </el-form-item>
-        <el-form-item label="状态：">
-          <el-select v-model="filter.isState" clearable placeholder="请选择" size="mini">
-            <el-option
-              v-for="item in stateSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item>
           <el-button size="mini" @click="filterDatas">搜索</el-button>
         </el-form-item>
@@ -50,13 +40,6 @@
         <el-table-column prop="libName" label="医学标准术语" show-overflow-tooltip></el-table-column>
         <el-table-column prop="libType" label="术语类型"></el-table-column>
         <el-table-column prop="otherNames" label="同义词" show-overflow-tooltip></el-table-column>
-        <el-table-column label="状态">
-          <template slot-scope="scope">
-            <span
-              :class="scope.row.isDeleted == 'N'?'':'delete'"
-            >{{scope.row.isDeleted == 'N'?'启用中':'已删除'}}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="operName" label="操作人"></el-table-column>
         <el-table-column prop="operTime" label="操作时间" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="操作" width="160">
@@ -108,10 +91,6 @@ export default {
   data: function() {
     return {
       list: [],
-      stateSelect: [
-        { id: 'N', name: '启用中' },
-        { id: 'Y', name: '已删除' }
-      ],
       // isState:'',
       cacheData: {}, //因为删除和恢复要及时更新，所以不做缓存
       currentPage: 1,
@@ -124,7 +103,6 @@ export default {
         term: '',
         type: '',
         libName: '',
-        isState: ''
       },
       typeList: [],
       reloadFlag: true

src/components/developKnow/StaticInfo.vue

@@ -2,7 +2,7 @@
   <div>
     <crumbs title="医学术语静态知识维护" style="min-width: 1088px">
       <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="术语分类：" class="selectMedicine">
+        <el-form-item label="标准术语归类：" class="selectMedicine">
           <el-select size="mini" v-model="filter.libType" placeholder="请选择" clearable>
             <el-option
               v-for="item in typeList"
@@ -22,11 +22,11 @@
         </el-form-item>
         <el-form-item class="dododo">
           <el-button size="mini" @click="filterDatas">检索</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="warning"
             @click="reIdentification"
-          >{{!reLoading?'更新图谱标识':'正在更新中...'}}</el-button>
+          >{{!reLoading?'更新图谱标识':'正在更新中...'}}</el-button> -->
           <el-button size="mini" type="warning" @click="addMedicalPrompt">添加静态知识</el-button>
         </el-form-item>
       </el-form>
@@ -34,16 +34,17 @@
     <div class="contents">
       <el-table :data="list" border style="width: 100%">
         <el-table-column type="index" :index="indexMethod" label="编号" width="80"></el-table-column>
-        <el-table-column prop="gmtModified" label="操作时间" width="180"></el-table-column>
-        <el-table-column prop="name" label="标准术语" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="typeName" label="术语分类" width="120"></el-table-column>
-        <el-table-column prop="title" label="内容概览" width="240" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="状态" width="160">
+        <el-table-column prop="gmtModified" label="医学标准术语"></el-table-column>
+        <el-table-column prop="name" label="标准术语归类" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="typeName" label="关联标题"></el-table-column>
+        <el-table-column label="状态" >
           <template slot-scope="scope">
             <span v-if="scope.row.status===1">启用</span>
             <span v-if="scope.row.status===0">禁用</span>
           </template>
         </el-table-column>
+        <el-table-column prop="title" label="操作人"  :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="title" label="操作时间"  :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="操作" width="140">
           <template slot-scope="scope">
             <el-button v-if="scope.row.status===0" type="text" size="small" class="is-disabled">修改</el-button>
@@ -117,7 +118,7 @@ export default {
         status: '',
         libType: ''
       },
-      reLoading: false //更新图谱标识
+      // reLoading: false //更新图谱标识
     };
   },
   created() {
@@ -150,19 +151,19 @@ export default {
   },
   methods: {
     //更新图谱标识
-    reIdentification() {
-      this.reLoading = true;
-      api.BatchUpdateHasInfoStatus().then(res => {
-        this.reLoading = false;
-        if (res.data.code === '0' && res.data.data === true) {
-          // 更新成功
-          this.warning('更新成功', 'success');
-        } else {
-          // 更新失败
-          this.warning('更新失败');
-        }
-      });
-    },
+    // reIdentification() {
+    //   this.reLoading = true;
+    //   api.BatchUpdateHasInfoStatus().then(res => {
+    //     this.reLoading = false;
+    //     if (res.data.code === '0' && res.data.data === true) {
+    //       // 更新成功
+    //       this.warning('更新成功', 'success');
+    //     } else {
+    //       // 更新失败
+    //       this.warning('更新失败');
+    //     }
+    //   });
+    // },
 
     getListDicCDSS() {
       api.getListDicCDSS().then(res => {