Merge remote-tracking branch 'origin/independentTag' into dev

src/api/config.js

@@ -131,7 +131,9 @@ export default {
     'getPhysicalExamTempByDepId':'api/icssman/deptVital/getModuleByDeptId', //通过科室id获取查体模板
     'savePhysicalExamTemp':'api/icssman/deptVital/saveDeptVitals',//保存查体模板
     'delPhysicalExamTemp':'api/icssman/deptVital/delAllDeptVitalList',//删除查体模板
-    'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
+    'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge', //  术语静态知识列表
+    'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
+    'saveConceptInfo':'/api/knowledgeman/concept/getConceptInfo',   //保存术语静态知识
 	},
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',

src/api/icss.js

@@ -26,7 +26,13 @@ export default {
       return axios.post(urls.PromptInfoDetail,param);
     },
     getTremList(param){
-      return axios.post(urls.getAllConcept,param);
+      return axios.post(urls.getConceptKnowledge,param);
+    },
+    getConceptInfo(param){
+      return axios.post(urls.getConceptInfo,param);
+    },
+    saveTermPrompts(param){
+      return axios.post(urls.saveConceptInfo,param);
     },
     getTagList(param) {
         return axios.post(urls.getTagList, param)

src/components/icss/AddMedicinePrompt.vue

@@ -9,14 +9,24 @@
                      :model="form"
                      label-width="130px"
                      ref="groups">
-                <el-form-item label="选择术语标签：" prop="name">
-                    <el-select v-model="form.selectedTerm" :disabled="isEdit">
-                        <el-option v-for="term in terms" v-key="term.id" :value="term.id">{{term.name}}</el-option>
+                <el-form-item label="选择术语标签：" prop="selectedTerm">
+                    <el-select v-model="form.selectedTerm"
+                               :disabled="isEdit"
+                               filterable
+                               remote
+                               clearable
+                               value-key="libId"
+                               ref="termName"
+                               placeholder="搜索术语"
+                               :remote-method="searchTerms">
+                        <el-option v-for="term in terms" :key="term.libId" :label="term.name" :value="term" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="已选择术语标签：">
                     {{form.selectedTermName}}
                 </el-form-item>
+                <el-form-item label="添加静态知识">
+                </el-form-item>
                 <InfoParagraph v-for="(f,i) in form.prags"
                                :data="f"
                                :index="i"
@@ -39,15 +49,11 @@
    *
    */
   import api from '@api/icss.js';
-  import utils from '@api/utils.js';
-  import TagPool from './PromptTagPool';
-  import schema from 'async-validator';
   import InfoParagraph from './InfoParagraph';
 
   export default {
-    name: 'AddPromptInfo',
+    name: 'AddMedicinePrompt',
     components: {
-      TagPool,
       InfoParagraph
     },
     data() {
@@ -59,7 +65,6 @@
           prags:[]
         },
         form:{
-          name:'',
           selectedTerm:'',            //术语标签
           selectedTermName:'',
           prags:[{              //单个段落相关
@@ -71,30 +76,36 @@
             text:''}]
         },
         rules: {
-          name: [
+          selectedTerm: [
             { required: true, message: '请选择术语标签', trigger: 'change' }
           ]
         }
       }
     },
+    watch:{
+      'form.selectedTerm':function(newVal){
+        const name = newVal.name;
+        this.form.selectedTermName = name;
+      }
+    },
     created:function(){
       const {isEdit,data} = this.$route.params;
       if(isEdit){
         this.isEdit = isEdit;
       }
     },
-    searchTerms(){
-      //搜索术语列表
-      api.getTremList().then((res) =>{
-        if(res.data.code === '0') {
-          this.terms = res.data.data;
-        }else{
-          this.warning("数据获取失败");
-        }
-      })
-    },
     methods: {
       back() { this.$router.go(-1) },
+      searchTerms(query){
+        //搜索术语列表
+        api.getConceptInfo({term:query,type:''}).then((res) =>{
+          if(res.data.code === '0') {
+            this.terms = res.data.data;
+          }else{
+            this.warning("数据获取失败");
+          }
+        })
+      },
       mapStringToNum(str){
         return str.split(",").map((it)=>{
           return +it;
@@ -157,28 +168,18 @@
         }
         //通过必填验证，提交保存
         const param = {
-          name:this.form.name,
-          detailVOList:Object.assign(this.form.prags),
-          mapVOList:Object.assign(this.form.selectedTags)
+          name:this.form.selectedTerm.libId,
+          detailVOList:Object.assign(this.form.prags)
         };
-        //console.log(param);
+        console.log(param);
         this.showSaveDialog(param);
       },
-      parseTagsForSubmit(data){
-        return data.map((it)=>{
-          return {questionId:it.id,introduceId:'',type:it.type};
-        });
-      },
-      changeActionData(selectedTags){
-        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
-        //console.log(selectedTags)
-      },
       showSaveDialog(param) {
         this.showConfirmDialog('是否保存该静态知识？', () => {
-          api.savePrompts(param).then((res) => {
+          api.saveTermPrompts(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
-              this.$router.push("/admin/LT-YXSJWH-TSXXWH");
+              this.$router.push("/admin/LT-YXSYKWH-YXSYJTZSWH");
             } else {
               this.warning(res.data.msg)
             }
@@ -224,6 +225,13 @@
     .line{
         border-top:1px #dcdfe6 solid;
         margin-bottom: 25px;
+
+    }
+    .NoiseTemplateWrapper .info-container .el-input__inner{
+       width: 250px;
+    }
+    .NoiseTemplateWrapper .el-select .el-input .el-icon-circle-close{
+        display: inherit!important;
     }
 </style>
 

src/components/icss/IndeptLabel.vue

@@ -242,7 +242,7 @@
     .delete:hover {
         color: red;
     }
-    .el-select .el-input .el-select__caret{
+    .el-select .el-input .el-icon-arrow-up{
         display: inline-block!important;
     }
     .el-select .el-input .el-icon-circle-close{

src/components/icss/MedicinePrompt.vue

@@ -109,7 +109,7 @@
         // const param = {
         //   'name':''
         // };
-        api.getPromptList(param).then((res) => {
+        api.getTremList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/routes.js

@@ -159,9 +159,7 @@ export default [
       {path:'LT-YXSJWH-DLLXBQWH',component:IndeptLabel,name:'IndeptLabel'},     //独立标签维护--详情
       {path:'LT-YXSJWH-TJDLBQ',component:AddIndeptLabel,name:'AddIndeptLabel'},     //独立标签维护--添加
       {path:'LT-YXSJWH-TSXXWH',component:PromptInfo,name:'PromptInfo'},         //提示信息维护
-      {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护
 	    {path:'LT-YXSJWH-BMWH',component:SimilarName,name:'SimilarName'},     //别名维护
-      {path:'LT-YXSJWH-TJBM',component:AddSimilarName,name:'AddSimilarName'},     //别名维护-详情
       {path:'LT-YXSJWH-CJZZWH',component:CommonSymptom,name:'CommonSymptom'},  //常见症状维护
       {path:'LT-YXSJWH-TJCJZZ',component:AddCommonSymptom,name:'AddCommonSymptom'},  //常见症状维护--添加
       {path:'LT-YXSJWH-TJBM',component:AddSimilarName,name:'AddSimilarName'},     //别名维护-添加/修改