fix bug

src/components/cdssManage/dept/DeptManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1096px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -314,7 +314,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportDeptRecord().then(res => {
+          api.exportDeptRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '科室关联数据.xls');

src/components/cdssManage/disease/Disease.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1096px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>

src/components/cdssManage/drug/DrugManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1096px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -310,7 +310,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportDrugRecord().then(res => {
+          api.exportDrugRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '药品关联数据.xls');

src/components/cdssManage/fusion/Fusion.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width:1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width:1096px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -309,7 +309,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportFusionRecord().then(res => {
+          api.exportFusionRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '输血关联数据.xls');

src/components/cdssManage/hospital/AddHospital.vue

@@ -16,9 +16,9 @@
             <el-form-item label="医院名称拼音" prop="spell">
               <el-input v-model="form.spell" placeholder="请输入医院名称拼音"></el-input>
             </el-form-item>
-            <el-form-item label="医院编码" prop="hospitalCode">
+            <!-- <el-form-item label="医院编码" prop="hospitalCode">
               <el-input v-model="form.hospitalCode" placeholder="4-15位,可输入字母、数字和下划线"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="医院地址" prop="address">
               <el-input type="textarea" :rows="2" v-model="form.address" placeholder="请输入医院地址"></el-input>
             </el-form-item>
@@ -59,7 +59,7 @@ export default {
       form: {
         hospitalName: '',
         spell: '',
-        hospitalCode: '',
+        // hospitalCode: '',
         address: ''
       },
       rules: {
@@ -68,11 +68,11 @@ export default {
           { min: 2, max: 30, message: '长度2-30位', trigger: 'blur' },
           { required: true, validator: validatePass, trigger: 'blur' }
         ],
-        hospitalCode: [
-          { required: true, message: '医院编码不能为空', trigger: 'change' },
-          { min: 4, max: 15, message: '长度4-15位', trigger: 'blur' },
-          { required: true, validator: validatePass1, trigger: 'blur' }
-        ],
+        // hospitalCode: [
+        //   { required: true, message: '医院编码不能为空', trigger: 'change' },
+        //   { min: 4, max: 15, message: '长度4-15位', trigger: 'blur' },
+        //   { required: true, validator: validatePass1, trigger: 'blur' }
+        // ],
         address:[
           {  max: 200, message: '长度最多200字', trigger: 'change' },
         ],
@@ -91,7 +91,7 @@ export default {
     if (isEdit) {
       this.form.hospitalName = data.name;
       this.form.spell = data.spell;
-      this.form.hospitalCode = data.code;
+      // this.form.hospitalCode = data.code;
       this.form.address = data.address;
       this.hospitalId = data.id;
     }
@@ -107,7 +107,7 @@ export default {
             address: this.form.address,
             name: this.form.hospitalName,
             spell: this.form.spell,
-            code: this.form.hospitalCode
+            // code: this.form.hospitalCode
           };
           if (this.isEdit) {
             params = Object.assign({}, params, {

src/components/cdssManage/hospital/Hospital.vue

@@ -22,7 +22,7 @@
     <div class="contents">
       <el-table :data="list" border style="width: 100%">
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
-        <el-table-column :resizable="false" prop="code" label="医院编码" width="180"></el-table-column>
+        <!-- <el-table-column :resizable="false" prop="code" label="医院编码" width="180"></el-table-column> -->
         <el-table-column :resizable="false" prop="name" label="医院名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="spell" label="医院名称拼音" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="address" label="医院地址" show-overflow-tooltip></el-table-column>
@@ -143,7 +143,7 @@ export default {
         msg = `确定要启用${row.name}吗？`;
         status = 1;
       } else {
-        msg = `确定要禁用用${row.name}吗？`;
+        msg = `确定要禁用${row.name}吗？`;
         status = 0;
       }
 

src/components/cdssManage/lis/Lis.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1240px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -316,7 +316,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportLisRecord().then(res => {
+          api.exportLisRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '检验数据.xls');

src/components/cdssManage/operation/Operation.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1180px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -314,7 +314,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportOperationRecord().then(res => {
+          api.exportOperationRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '手术/操作关联数据.xls');

src/components/cdssManage/pacs/Pacs.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1300px">
+    <crumbs :title="title + hospitaiName" linkTo="MedicalTermCDSS" style="min-width: 1096px">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item>
           <el-button type="text" class="downTemplate" @click="exportModule">导入模板下载</el-button>
@@ -309,7 +309,7 @@ export default {
         // }
       })
         .then(() => {
-          api.exportPacsRecord().then(res => {
+          api.exportPacsRecord({ hospitalId: this.hospitalId }).then(res => {
             if (res.status === 200) {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(res.data, '检查关联数据.xls');

src/components/cdssManage/plan/Plan.vue

@@ -25,7 +25,7 @@
       <el-table :data="list" border style="width: 100%">
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column :resizable="false" prop="hospitalName" label="医院名称" show-overflow-tooltip></el-table-column>
-        <el-table-column :resizable="false" prop="hospitalId" label="医院编码"></el-table-column>
+        <!-- <el-table-column :resizable="false" prop="hospitalId" label="医院编码"></el-table-column> -->
         <el-table-column :resizable="false" prop="planName" label="方案名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="planCode" label="方案编码" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="planDetail" label="模块配置" show-overflow-tooltip></el-table-column>

src/components/common/Crumbs.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container clearfix" :style="{'minWidth':minWidth?minWidth:'980px'}">
         <img v-if="linkTo" class="return-btn fl" src="../../images/return.png" alt="返回按钮" @click="goBack">
-        <h4 class="fl">{{title}}</h4>
+        <h4 class="fl" :title="isShowEllipsis ? title : ''" ref="title">{{title}}</h4>
         <div class="contents fr">
             <slot></slot>
         </div>
@@ -13,7 +13,15 @@
     name: 'crumbs',
     props: ['title','linkTo','minWidth','param'],//minWidth-有些头部选项比较多，最小宽度需要调整
     data: function () {
-      return {}
+      return {
+        isShowEllipsis: false  // 是否显示文字省略号
+      }
+    },
+    mounted(){
+      let titleText = this.$refs.title.innerHTML
+      if(titleText.length > 28) {
+        this.isShowEllipsis = true
+      }
     },
     methods:{
       goBack(){
@@ -48,5 +56,10 @@
 
     h4 {
         font-size: 15px;
+         width: 280px;
+        overflow: hidden;/*超出部分隐藏*/
+        white-space: nowrap;/*不换行*/
+        text-overflow:ellipsis;/*超出部分文字以...显示*/
     }
+
 </style>

src/components/common/Menu.vue

@@ -1,6 +1,6 @@
 <template>
     <el-menu :router="true"
-            :default-active="defaultMItem"
+            :default-active="defaultActive"
             class="el-menu-vertical-demo">
         <template v-for="(item,index) in data">
             <el-menu-item :index="'/'+role+'/'+item.code" v-if="item.subMenuList.length==0">
@@ -27,7 +27,8 @@
     props: ['data', 'role'],
     data: function () {
       return {
-        icons: config.menuIconList
+        icons: config.menuIconList,
+        defaultActive: ''
       }
     },
     computed:{
@@ -36,6 +37,10 @@
             return route;
         }
     },
+    created() {
+    // console.log(this.$route,'this.$route');
+    this.defaultActive = this.$route.fullPath;
+  },
     methods: {
     }
   }