Merge branch 'independentTag' into dev2/luolei

src/api/config.js

@@ -131,9 +131,9 @@ export default {
     'getPhysicalExamTempByDepId':'api/icssman/deptVital/getModuleByDeptId', //通过科室id获取查体模板
     'savePhysicalExamTemp':'api/icssman/deptVital/saveDeptVitals',//保存查体模板
     'delPhysicalExamTemp':'api/icssman/deptVital/delAllDeptVitalList',//删除查体模板
-    'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge', //  术语静态知识列表
+    'getConceptKnowledgeList':'/api/knowledgeman/Knowledge/getAllKnowledge', //  术语静态知识列表
+    'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge',//术语静态知识查询
     'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
-    'saveConceptInfo':'/api/knowledgeman/concept/getConceptInfo',   //保存术语静态知识
     'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
     'versionInfo': 'api/icssman/versionInfo/getVersionInfoAlls', //版本信息
     'addVersInfo': 'api/icssman/versionInfo/saveVersionInfoAlls', //版本信息-添加
@@ -142,6 +142,8 @@ export default {
     'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
     'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
+    'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
+    'delConceptInfo':'/api/knowledgeman/Knowledge/removeConceptKnowledge',   //删除术语静态知识
 	},
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',

src/api/icss.js

@@ -31,6 +31,15 @@ export default {
     getConceptInfo(param){
       return axios.post(urls.getConceptInfo,param);
     },
+    getConceptKnowledgeList(param){
+      return axios.post(urls.getConceptKnowledgeList,param);
+    },
+    saveConceptInfo(param){
+      return axios.post(urls.saveConceptInfo,param);
+    },
+    delConceptInfo(param){
+      return axios.post(urls.delConceptInfo,param);
+    },
     saveTermPrompts(param){
       return axios.post(urls.saveConceptInfo,param);
     },

src/components/icss/AddMedicinePrompt.vue

@@ -9,9 +9,8 @@
                      :model="form"
                      label-width="130px"
                      ref="groups">
-                <el-form-item label="选择术语标签：" prop="selectedTerm">
+                <el-form-item v-if="!isEdit" label="选择术语标签：" prop="selectedTerm">
                     <el-select v-model="form.selectedTerm"
-                               :disabled="isEdit"
                                filterable
                                remote
                                clearable
@@ -85,13 +84,17 @@
     watch:{
       'form.selectedTerm':function(newVal){
         const name = newVal.name;
-        this.form.selectedTermName = name;
+        this.editData.selectedTermName = name;
       }
     },
     created:function(){
       const {isEdit,data} = this.$route.params;
       if(isEdit){
         this.isEdit = isEdit;
+        this.form.selectedTermName = data.name;
+        this.form.prags[0].content = data.content;
+        this.form.prags[0].position=this.mapStringToNum(data.position);
+        this.form.prags[0].title = data.title;
       }
     },
     methods: {

src/components/icss/IndeptLabel.vue

@@ -138,7 +138,7 @@
           const list = [...res.data.data.records];
           for (var i = 0; i < list.length; i++) {
             for (var j =  0; j < this.tagTypes.length; j++) {
-              if(list[i].tagType == this.tagTypes[j].val) {
+              if(list[i].controlType == this.tagTypes[j].val) {
                 list[i].tagTypeCn = this.tagTypes[j].name;
               }
             }

src/components/icss/MedicinePrompt.vue

@@ -6,7 +6,7 @@
                     <el-input size="mini" v-model="filter.name" placeholder="静态知识名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="标签系统名称：">
-                    <el-input size="mini" v-model="filter.tagName" placeholder="标签系统名称" clearable></el-input>
+                    <el-input size="mini" v-model="filter.term" placeholder="术语标签" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -27,22 +27,22 @@
                         width="60">
                 </el-table-column>
                 <el-table-column
-                        prop="gmtOperate"
+                        prop="gmtModified"
                         label="操作时间"
                         width="180"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
                         prop="name"
-                        label="静态知识名称">
+                        label="医学标准术语">
                 </el-table-column>
                 <el-table-column
-                        prop="tagName"
-                        label="关联标签"
+                        prop="title"
+                        label="静态知识名称"
                         width="240">
                 </el-table-column>
                 <el-table-column
-                        prop="operatorName"
+                        prop="modifier"
                         label="操作人"
                         width="80">
                 </el-table-column>
@@ -74,7 +74,7 @@
   import utils from '@api/utils.js';
 
   export default {
-    name: 'prompt-info',
+    name: 'MedicinePrompt',
     data: function () {
       return {
         list: [],
@@ -96,7 +96,7 @@
     methods: {
       toEditProduct(row){
         this.$router.push({
-          name:'AddPromptInfo',
+          name:'AddMedicinePrompt',
           params: {data:row,isEdit:true}
         })
       },
@@ -109,7 +109,7 @@
         // const param = {
         //   'name':''
         // };
-        api.getTremList(param).then((res) => {
+        api.getConceptKnowledgeList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;
@@ -126,8 +126,8 @@
       },
       getFilterItems() {
         const param = {
-          name:this.filter.name,
-          tagName:this.filter.tagName,
+          term:this.filter.name,
+          conecpt_name:this.filter.term,
           current: this.currentPage,
           size: this.pageSize
         };
@@ -161,7 +161,7 @@
       },
       showDelDialog(id){
         this.showConfirmDialog('是否删除该静态知识？',()=>{
-          api.delPromptInfo({id}).then((res)=>{
+          api.delConceptInfo({id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();