Merge branch 'dragTerm1025-zsw'

# Conflicts:
#	src/components/cdssManage/hemp/Hemp.vue
#	vue.config.js

src/components/cdssManage/MedicalTerm.vue

@@ -54,6 +54,14 @@
             >{{scope.row.drugNum}}</span>
           </template>
         </el-table-column>
+        <el-table-column :resizable="false" prop="anesthesiaNum" label="麻醉关联">
+          <template slot-scope="scope">
+            <span
+              class="relation"
+              @click="goRelationPage('Hemp',scope.row)"
+            >{{scope.row.anesthesiaNum}}</span>
+          </template>
+        </el-table-column>
         <el-table-column :resizable="false" prop="scaleNum" label="量表关联">
           <template slot-scope="scope">
             <span
@@ -216,6 +224,7 @@ export default {
 		console.log(res)
         if (res.data.code === '0') {
           this.list = res.data.data && res.data.data.records;
+          console.log('术语关联维护：  ', this.list);
         }
         this.total = res.data.data && res.data.data.total;
         if (this.inCurrentPage !== undefined) {

src/routes.js

@@ -159,6 +159,8 @@ import Pacs from '@components/cdssManage/pacs/Pacs.vue'; //检查关联维护
 import AddPacs from '@components/cdssManage/pacs/AddPacs.vue'; //检查关联维护--添加关联
 import DrugManage from '@components/cdssManage/drug/DrugManage.vue'; //药品关联维护
 import AddDrug from '@components/cdssManage/drug/AddDrug.vue'; //药品关联维护--添加关联
+import Hemp from '@components/cdssManage/hemp/Hemp.vue'; //麻醉关联维护
+import AddHemp from '@components/cdssManage/hemp/AddHemp.vue'; //麻醉关联维护--添加关联
 import ScaleManage from '@components/cdssManage/scale/ScaleManage.vue'; //量表关联维护
 import AddScale from '@components/cdssManage/scale/AddScale.vue'; //量表关联维护--添加关联
 import Operation from '@components/cdssManage/operation/Operation.vue'; //手术/操作关联维护
@@ -505,6 +507,8 @@ export default [
             { path: 'LT-JCGLWH-TJHYDXXYGBXDY', component: AddPacs, name: 'AddPacs' }, //检查关联维护--添加关联
             { path: 'YXSYK-YPGLWH', component: DrugManage, name: 'DrugManage' }, //药品关联维护
             { path: 'LT-YPGLWH-TJHYDXXYGBXDY', component: AddDrug, name: 'AddDrug' }, //药品关联维护--添加关联
+            { path: 'YXSYK-HEMP', component: Hemp, name: 'Hemp' }, //麻醉关联维护
+            { path: 'LT-HEMP-TJHYDXXYGBXDY', component: AddHemp, name: 'AddHemp' }, //麻醉关联维护--添加关联
             { path: 'YXSYK-LBGLWH', component: ScaleManage, name: 'ScaleManage' }, //量表关联维护
             { path: 'LT-LBGLWH-TJHYDXXYGBXDY', component: AddScale, name: 'AddScale' }, //量表关联维护--添加关联
             { path: 'YXSYK-SSCZGLWH', component: Operation, name: 'Operation' }, //手术/操作关联维护