Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/api/cdss.js

@@ -338,4 +338,7 @@ export default {
   changeStatusCDSS(param) {
     return axios.post(urls.changeStatusCDSS, param);
   },
+  getListDicCDSS(param) {
+    return axios.post(urls.getListDicCDSS, param);
+  },
 };

src/api/config.js

@@ -459,6 +459,8 @@ export default {
     'startDisclaimerInformationsCDSS': '/api/cdssman/disclaimerInfo/startDisclaimerInformations',   //启用免责申明详情
     'updateDisclaimerInformationsCDSS': '/api/cdssman/disclaimerInfo/updateDisclaimerInformations',   //修改免责申明详情
 
+    'getListDicCDSS': '/api/cdssman/sys/dictionaryInfo/getList',   //返回字典信息(界面返回)
+
     'getKlmEnumsDataCDSS': '/api/cdssman/getKlmEnumsData',   //枚举数据获取
 
 

src/components/cdssManage/MedicineInfoPg.vue

@@ -182,13 +182,13 @@ export default {
         this.showType == 3 ||
         this.showType == 4 ||
         this.showType == 5 ||
-        this.showType == 7
+        this.showType == 6
       ) {
         // 检验/检查
         this.positions = positions.filter(item => {
           return item.key <= 2;
         });
-      } else if (this.showType == 2 || this.showType == 6) {
+      } else if (this.showType == 2 || this.showType == 7) {
         // 药品/手术
         this.positions = positions.filter(item => item.key === 1);
       } else {

src/components/cdssManage/MedicinePrompt.vue

@@ -7,8 +7,8 @@
             <el-option
               v-for="item in typeList"
               :label="item.name"
-              :value="item.key"
-              :key="item.key"
+              :value="item.orderNo"
+              :key="item.orderNo"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -125,8 +125,9 @@ export default {
     //返回时避免参数未赋值就获取列表
     setTimeout(function() {
       that.getDataList();
+      that.getListDicCDSS()
     });
-    this.typeList = config.emData;
+    // this.typeList = config.emData;
     // 非首页 编辑页返回 设置 this.currentPage
     if (Object.keys(this.$route.params).length !== 0) {
       this.currentPage = this.$route.params.currentPage;
@@ -148,6 +149,14 @@ export default {
     });
   },
   methods: {
+     getListDicCDSS() {
+      api.getListDicCDSS().then(res => {
+        if (res.data.code === '0') {
+          this.typeList = res.data.data && res.data.data['10'];
+        }
+      });
+    },
+
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = utils.getCurrentPage(
@@ -212,7 +221,7 @@ export default {
           loading.close();
           if (res.data.code == '0') {
             const data = res.data.data;
-            // 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-手术和操作
+            // 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项  7-手术和操作
             let temp = [
               '',
               '诊断',

src/components/cdssManage/drug/AddDrug.vue

@@ -73,8 +73,8 @@
                   style="width:100%;minWidth: 240px"
                 >
                   <el-option
-                    v-for="item in drugForm"
-                    :key="item.value"
+                    v-for="item in drugList"
+                    :key="item.val"
                     :label="item.name"
                     :value="item.name"
                   ></el-option>
@@ -120,6 +120,7 @@ export default {
       saveDisable: false, //保存按钮禁止点击
       showDrop: false, //下拉框显示文字
       drugForm: config.drugForm,
+      drugList: [],
       hospitalId: ''
     };
   },
@@ -135,8 +136,25 @@ export default {
       this.form.searchText = data.uniqueName;
       this.form.form = data.form;
     }
+
+    this.getListDicCDSS()
   },
   methods: {
+    getListDicCDSS() {
+      api.getListDicCDSS().then(res => {
+        if (res.data.code === '0') {
+          let dragData = []
+          res.data.data && res.data.data['9'].forEach(item=>{
+            if(item.val !== '0'){
+              dragData.push(item)
+            }
+          })
+          this.drugList = dragData
+        }
+      });
+    },
+
+
     // 搜索列表
     searchTerms(query) {
       if (!query) {

src/components/common/Crumbs.vue

@@ -24,11 +24,13 @@ export default {
     };
   },
   mounted() {
-    let titleText = this.$refs.title.innerHTML;
-    // console.log(titleText.length,'titleText');
-    if (titleText.length > 19) {
-      this.isShowEllipsis = true;
-    }
+    setTimeout(() => {
+      let titleText = this.$refs.title.innerText;
+      if (titleText.length > 19) {
+        this.isShowEllipsis = true;
+      }
+    }, 200);
+    // console.log(this.isShowEllipsis,'isShowEllipsis');
   },
   methods: {
     goBack() {

src/components/common/Menu.vue

@@ -1,60 +1,77 @@
 <template>
-    <el-menu :router="true"
-            :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">
-                <!-- <i v-bind:class="icons[item.code]"></i> -->
-                <i class="el-icon-location"></i>
-                <span slot="title">{{item.name}}</span>
-            </el-menu-item>
-            <el-submenu v-if="item.subMenuList.length>0" :index="index+1+''">
-                <template slot="title">
-                    <i class="el-icon-location"></i>
-                    <span>{{item.name}}</span>
-                </template>
-                <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code"><p>{{sub.name}}</p></el-menu-item>
-            </el-submenu>
+  <el-menu
+    :router="true"
+    :default-active="defaultActive"
+    class="el-menu-vertical-demo"
+    @select="handleSelect"
+  >
+    <template v-for="(item,index) in data">
+      <el-menu-item :index="'/'+role+'/'+item.code" v-if="item.subMenuList.length==0">
+        <!-- <i v-bind:class="icons[item.code]"></i> -->
+        <i class="el-icon-location"></i>
+        <span slot="title">{{item.name}}</span>
+      </el-menu-item>
+      <el-submenu v-if="item.subMenuList.length>0" :index="index+1+''">
+        <template slot="title">
+          <i class="el-icon-location"></i>
+          <span>{{item.name}}</span>
         </template>
-    </el-menu>
+        <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code">
+          <p>{{sub.name}}</p>
+        </el-menu-item>
+      </el-submenu>
+    </template>
+  </el-menu>
 </template>
 
 <script>
-  import config from '@api/config.js';
+import config from '@api/config.js';
 
-  export default {
-    name: 'lt-menu',
-    props: ['data', 'role'],
-    data: function () {
-      return {
-        icons: config.menuIconList,
-        defaultActive: ''
-      }
-    },
-    computed:{
-        defaultMItem:function () {
-            let route = this.$route.path;
-            return route;
-        }
-    },
-    created() {
+export default {
+  name: 'lt-menu',
+  props: ['data', 'role'],
+  data: function() {
+    return {
+      icons: config.menuIconList,
+      defaultActive: ''
+    };
+  },
+  computed: {
+    defaultMItem: function() {
+      let route = this.$route.path;
+      return route;
+    }
+  },
+  created() {
     // console.log(this.$route,'this.$route');
+    // this.defaultActive = this.$route.fullPath;
+
+    let menupath = localStorage.getItem('menuPath');
     this.defaultActive = this.$route.fullPath;
+    if (this.$route.fullPath != menupath) {
+      this.defaultActive = menupath;
+      this.$router.push({ path: menupath });
+    } else {
+      this.defaultActive = this.$route.fullPath;
+    }
   },
-    methods: {
+  methods: {
+    handleSelect(key, keyPath) {
+      localStorage.setItem('menuPath', key);
     }
   }
+};
 </script>
 
 <style lang="less" scoped>
-    .el-menu-item p{
-        display: table-cell;
-        vertical-align: middle;
-        white-space: normal;
-        line-height: 20px;
-        height: 50px;
-    }
-  /*.el-menu-vertical-demo {
+.el-menu-item p {
+  display: table-cell;
+  vertical-align: middle;
+  white-space: normal;
+  line-height: 20px;
+  height: 50px;
+}
+/*.el-menu-vertical-demo {
     min-width: 300px;
   }*/
 </style>