morphone1995 4 éve
szülő
commit
7357ef84c9

+ 3 - 1
src/api/config.js

@@ -90,6 +90,8 @@ export default {
     'getAccessdMenu': '/sys/user/getUserOrgMenu',  //获取左侧菜单项
     'delConceptInfo':'/graph/conceptInfo/changeStatus',   //删除术语静态知识
     'login': '/sys/user/getJwt',
+    'getDicList': '/sys/dictionaryInfo/getList',  //返回字典信息(界面返回)
+
   },
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',
@@ -162,7 +164,7 @@ export default {
     // { "name": "","val": "0"},
     { "name": "注射剂","val": "1"},
     { "name": "片剂","val": "2"},
-    { "name": "缓释","val": "3"},
+    { "name": "缓释","val": "3"},
     { "name": "胶囊剂","val": "4"},
     { "name": "滴丸剂","val": "5"},
   ]

+ 3 - 0
src/api/icss.js

@@ -255,5 +255,8 @@ export default {
   revStopPlans(param) {
     return axios.post(urls.revStopPlans, param);
   },
+  getDicList(param) {
+    return axios.post(urls.getDicList, param);
+  },
 
 };

+ 27 - 29
src/components/icss/MedicineInfoPg.vue

@@ -108,9 +108,7 @@ export default {
         orderNo: 0
       },
       positions: [], //位置列表
-      rules: {
-       
-      }
+      rules: {}
     };
   },
   watch: {
@@ -118,9 +116,9 @@ export default {
       if (this.data.content !== '') {
         this.$refs.editor && this.$refs.editor.clearValidate(); // 清除校验
       }
-      if (this.data.content === ''){
+      if (this.data.content === '') {
         // console.log('内容为空');
-        this.$refs['form'].validateField('content') // 手动校验
+        this.$refs['form'].validateField('content'); // 手动校验
       }
       this.data.text = this.$refs.quillEditor.quill.root.innerText;
     }
@@ -133,34 +131,32 @@ export default {
     this.renderPositions();
     if (this.isEdit) {
       setTimeout(() => {
-        this.rules = {         
+        this.rules = {
           position: [
             { required: true, message: '请选择内容类型', trigger: 'change' }
           ],
           title: [
             { required: true, message: '请输入段落标题', trigger: 'change' },
             { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
-           
           ],
           content: [
             { required: true, message: '请输入段落内容', trigger: 'change' }
           ]
         };
       }, 100);
-    }else{
-      this.rules = {         
-          position: [
-            { required: true, message: '请选择内容类型', trigger: 'change' }
-          ],
-          title: [
-            { required: true, message: '请输入段落标题', trigger: 'change' },
-            { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
-           
-          ],
-          content: [
-            { required: true, message: '请输入段落内容', trigger: 'change' }
-          ]
-        };
+    } else {
+      this.rules = {
+        position: [
+          { required: true, message: '请选择内容类型', trigger: 'change' }
+        ],
+        title: [
+          { required: true, message: '请输入段落标题', trigger: 'change' },
+          { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
+        ],
+        content: [
+          { required: true, message: '请输入段落内容', trigger: 'change' }
+        ]
+      };
     }
   },
   mounted() {},
@@ -178,6 +174,7 @@ export default {
     renderPositions() {
       //显示位置枚举列表
       const pos = localStorage.getItem('knowledgeEnumsData');
+      // console.log('this.showType,', this.showType);
       let positions = config.contentTypes;
       if (this.showType == 1) {
         // 诊断
@@ -185,7 +182,8 @@ export default {
       } else if (
         this.showType == 3 ||
         this.showType == 4 ||
-        this.showType == 5
+        this.showType == 5 ||
+        this.showType == 7
       ) {
         // 检验/检查
         this.positions = positions.filter(item => {
@@ -217,7 +215,6 @@ export default {
 </script>
 
 <style lang="less">
-
 .quill-editor.ql-editor {
   padding-left: 0 !important;
 }
@@ -250,19 +247,20 @@ export default {
 /**富文本编辑器样式修改***/
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before,
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,it
-.ql-editor,.quill-editor{
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+it .ql-editor,
+.quill-editor {
   padding-top: 0px !important;
   margin-top: -8px;
   min-height: 48px;
-  p{
+  p {
     padding-top: 8px;
   }
 }
-.ql-editor.ql-blank::before{
-  padding-top: 0px
+.ql-editor.ql-blank::before {
+  padding-top: 0px;
 }
-.btns{
+.btns {
   margin-top: 20px;
 }
 </style>

+ 21 - 7
src/components/icss/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>
@@ -34,7 +34,7 @@
     <div class="contents">
       <el-table :data="list" border style="width: 100%">
         <el-table-column type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
-        <el-table-column prop="gmtModified" label="操作时间" width="180" ></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>
@@ -124,10 +124,12 @@ export default {
     const that = this;
     //返回时避免参数未赋值就获取列表
     setTimeout(function() {
-      that.clearFilter()
+      that.clearFilter();
       that.getDataList();
+      that.getDicList();
     });
-    this.typeList = config.emData;
+    
+    // this.typeList = config.emData;
     // 非首页 编辑页返回 设置 this.currentPage
     if (Object.keys(this.$route.params).length !== 0) {
       this.currentPage = this.$route.params.currentPage;
@@ -149,6 +151,17 @@ export default {
     });
   },
   methods: {
+    // 获取字典类型
+    getDicList() {
+      api.getDicList().then(res => {
+        // console.log(res, '字典类型');
+        if (res.data.code === '0') {
+          this.typeList = res.data.data && res.data.data['10'];
+          // console.log(this.typeList,'this.typeList');
+        }
+      });
+    },
+
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = utils.getCurrentPage(
@@ -221,7 +234,8 @@ export default {
               '检验套餐',
               '检验细项',
               '检查',
-              '手术和操作'
+              '手术和操作',
+              '检查子项'
             ];
             this.list = data.records = data.records.filter(item => {
               item.typeName = temp[item.type];
@@ -406,7 +420,7 @@ export default {
 }
 
 body {
-  .el-tooltip__popper{
+  .el-tooltip__popper {
     max-width: 400px;
   }
 }

+ 1 - 0
src/components/icss/pacs/AddPacs.vue

@@ -131,6 +131,7 @@ export default {
         this.showDrop = false;
         if (res.data.code === '0') {
           this.uniqueNameList = res.data.data.pacsNames;
+          console.log(this.uniqueNameList,'this.uniqueNameList');
         }
       });
     },