Merge branch 'dev' into dev2/luolei

src/api/config.js

@@ -1,5 +1,6 @@
 export default {
-  host:'http://192.168.3.100:5050',
+  host:'http://192.168.2.241:5050',
+  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',
@@ -132,7 +133,7 @@ export default {
     'getPhysicalExamTempByDepId':'api/icssman/deptVital/getModuleByDeptId', //通过科室id获取查体模板
     'savePhysicalExamTemp':'api/icssman/deptVital/saveDeptVitals',//保存查体模板
     'delPhysicalExamTemp':'api/icssman/deptVital/delAllDeptVitalList',//删除查体模板
-    'getConceptKnowledgeList':'/api/knowledgeman/Knowledge/getAllKnowledge', //  术语静态知识列表
+    'getConceptKnowledgeList':'/api/knowledgeman/libraryDetail/getLibraryDetailList', //  术语静态知识列表
     'getConceptKnowledge':'/api/knowledgeman/Knowledge/getConceptKnowledge',//术语静态知识查询
     'getConceptInfo':'/api/knowledgeman/concept/getConceptInfo', //  搜索术语
     'getAllConcept':'/api/knowledgeman/concept/getAllConcept', //  术语列表
@@ -143,9 +144,10 @@ export default {
     'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
     'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
+    'promptServer':'/api/icssman/file/uploadImage',    //静态知识
     /**************医学术语维护****************/
-	'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
-    'delConceptInfo':'/api/knowledgeman/Knowledge/removeConceptKnowledge',   //删除术语静态知识
+	  'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
+    'delConceptInfo':'/api/knowledgeman/libraryDetail/removeLibraryDetail',   //删除术语静态知识
     // 'knowledgeName': 'api/knowledgeman/medical/getAllMedicalInfo', //医学术语--命名维护
     'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语--命名维护
     'knowledgeUpload': 'api/knowledgeman/concept/importTermExcel', //医学术语--命名维护-导入

src/components/icss/AddCommonSymptom.vue

@@ -87,7 +87,7 @@
         return{
             rules: {
                 department:[{required: true, message: '请选择科室', trigger: ['blur']}],
-                type:[{required: true, message: '请选择科室', trigger: ['blur']}]
+                type:[{required: true, message: '请选择类型', trigger: ['blur']}]
             },
             form: {
                 department: '',
@@ -250,7 +250,7 @@
                 })
                 return;
             }
-            this.$refs[formName].validate((valid) => {
+            const valided = this.$refs[formName].validate((valid, callback) => {
                 if (valid) {
                     return
                 } else {
@@ -258,9 +258,13 @@
                     return false;
                 }
             });
-             if(!this.form.department) {
+             if(!this.form.department || !this.form.type) {
                 return 
             }
+            if(this.rightTagsList.length === 0) {
+                this.warning('请选择症状标签')
+                return
+            }
             this.showDelDialog()
         },
         showDelDialog() {
@@ -270,10 +274,11 @@
             }
             const param ={
                 "deptId": this.form.department,
-                "questionId": questionId
+                "questionId": questionId,
+                "type": this.form.type,
    
             }
-            this.showConfirmDialog('是否保存该标签组？', () => {
+            this.showConfirmDialog('是否保存常见选项内容？', () => {
                 api.addCommonSymptom(param).then((res) => {
                 if (res.data.code  === '0') {
                     this.warning(res.data.msg || '保存成功', 'success','1000')

src/components/icss/AddDeptInfo.vue

@@ -80,7 +80,7 @@
             if(this.id){
               let param = {
                 id:this.id,
-                name:this.form.name,
+                name:this.form.name.trim(),
                 remark:this.form.remark
               }
               api.modifDeptInfo(param).then((res) => {
@@ -102,7 +102,11 @@
                 });
               })
             }else{
-              api.addDeptInfo(this.form).then((res) => {
+              let params = {
+                name:this.form.name.trim(),
+                remark:this.form.remark
+              }
+              api.addDeptInfo(params).then((res) => {
                 if (res.data.code == '0') {
                   this.$message({showClose: true,message: this.toast, type: 'success'});
                   this.$router.push({path: 'LT-YXSJWH-KSWH'});

src/components/icss/AddIndeptLabel.vue

@@ -13,7 +13,10 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11"> <i>*</i> 标签明细：<i style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i></p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11">
+                <i>*</i> 标签明细：
+                <i v-if='dataPub.region2==2' style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i>
+            </p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
                 <el-button
@@ -103,10 +106,7 @@
         }
         this.options = options2;
         if(this.itemsTypes.includes(+this.dataPub.region2)&&isNull) {
-            this.$message({
-              message: '至少填一个选项',
-              type: 'warning'
-            });
+            this.warning('至少填一个选项')
             return;
         }
         let flag=true;
@@ -120,17 +120,15 @@
           })==-1;
         }
         if(!flag){
-          this.$message({
-            message: '所有选项必须都有或者都没有同“伴”/“无”标记',
-            type: 'warning'
-          });
+          this.warning('所有选项必须都有或者都没有同“伴”/“无”标记')
           return;
         }
-        if(this.dataPub.region8 >= this.dataPub.region9) {
-          this.$message({
-            message: '最小年龄不能大于或等于最大年龄',
-            type: 'warning'
-          });
+        if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
+          this.warning('最小年龄不能大于或等于最大年龄')
+          return;
+        }
+        if(parseInt(this.dataPub.minNormalVal) >= parseInt(this.dataPub.maxNormalVal)) {
+          this.warning('最小正常值不能大于或等于最大正常值')
           return;
         }
         const {isEdit,data} = this.$route.params;

src/components/icss/AddMedicinePrompt.vue

@@ -41,14 +41,11 @@
                     <el-input v-if="!isEdit" v-model="form.source" placeholder="输入静态知识来源"></el-input>
                     {{isEdit?form.source:''}}
                 </el-form-item>
-                <InfoParagraph v-for="(f,i) in form.prags"
-                               :data="f"
-                               :index="i"
+                <InfoParagraph :data="form.prags[0]"
+                               :index="0"
                                :len="1"
                                :isEdit = "isEdit"
-                               @change="getPgValues"
-                               @add="addParagraph"
-                               @del="delParagraph" ref="subForm"></InfoParagraph>
+                               ref="subForm"></InfoParagraph>
             </el-form>
             <div class="btn">
                 <el-button
@@ -64,7 +61,7 @@
    *
    */
   import api from '@api/icss.js';
-  import InfoParagraph from './InfoParagraph';
+  import InfoParagraph from './MedicineInfoPg';
 
   export default {
     name: 'AddMedicinePrompt',
@@ -81,6 +78,8 @@
           prags:[]
         },
         form:{
+          conceptId:'',             //术语id
+          isTip:0,                 //是否要覆盖,0不覆盖，1覆盖
           selectedTerm:'',            //术语标签
           termType:'',
           source:'',
@@ -110,6 +109,7 @@
         //this.editData.selectedTermName = name;
         this.form.selectedTermName = name;
         this.form.selectedTermType = newVal.type;
+        this.form.conceptId = newVal.conceptId;
       }
     },
     created:function(){
@@ -128,10 +128,12 @@
         }).catch((error) => {
           console.log(error);
         });*/
-        this.form.selectedTermName = data.name;
-        this.form.selectedTermType = data.type;
+        this.form.selectedTermName = data.conceptName;
+        this.form.selectedTermType = data.conceptType;
         this.form.source = data.source;
+        this.form.conceptId = data.conceptId;
         this.form.prags[0].content = data.content;
+        this.form.prags[0].isReason = data.isReason;
         this.form.prags[0].position=this.mapStringToNum(data.position);
         this.form.prags[0].title = data.title;
       }
@@ -164,41 +166,6 @@
           return +it;
         })
       },
-      parseData(info){
-        let detail = [];
-        info.prags.forEach((it)=>{
-          detail.push(Object.assign({},it,{position:it.position,source:this.form.source}));
-        });
-        return {
-          oldterm:'',
-          concept:'',
-          oldtype:'',
-          newterm:info.selectedTermName,
-          newtype:info.selectedTermType,
-          information:detail
-        };
-      },
-      addParagraph(){
-        this.form.prags.push({title:'',
-          content:'',
-          isReason:0,
-          orderNo:0,
-          position:[],
-          text:''});
-      },
-      delParagraph(i){
-        if(this.form.prags.length==1){
-          this.warning('只剩一个段落，不能再删啦！');
-          return;
-        }
-        this.showConfirmDialog('确定要删除该段落？', () => {
-          this.form.prags.splice(i,1);
-        });
-      },
-      getPgValues(i,data){
-        this.form.prags[i] = data;
-        //console.log(data,this.form.prags);
-      },
       submitForm() {
         //验证外层表单
         let goOn=true,it=null;
@@ -209,33 +176,36 @@
           }
         });
         //验证段落表单
-        for(let i=0;i<this.$refs.subForm.length;i++){
-          it=this.$refs.subForm[i];
+        //for(let i=0;i<this.$refs.subForm.length;i++){
+          it=this.$refs.subForm;
           it.$refs.form.validate((valid) =>{
             if(!valid){
               goOn = false;
             }
           });
-        };
+        //};
 
         if(!goOn){
           return;
         }
         //通过必填验证，提交保存
-        const param = this.parseData(this.form);/*{
-          newterm:this.form.selectedTermName,
-          newtype:this.form.termType,
-          information:Object.assign(this.form.prags)
-        };*/
-        //console.log(param);
-        this.showSaveDialog(param);
+        const item=this.form.prags[0];
+        const param = Object.assign({},item,{
+                                                position:typeof item.position=='string'?item.position:item.position.join(","),
+                                                source:this.form.source,
+                                                conceptId:this.form.conceptId,isTip:1,
+                                              });
+        this.showSaveDialog(param,'是否保存该静态知识？');
       },
-      showSaveDialog(param) {
-        this.showConfirmDialog('是否保存该静态知识？', () => {
+      showSaveDialog(param,msg) {
+        this.showConfirmDialog(msg, () => {
           api.saveTermPrompts(param).then((res) => {
             if (res.data.code === '0') {
               this.warning(res.data.msg || '保存成功', 'success');
               this.$router.push("/admin/LT-YXSYKWH-YXSYJTZSWH");
+            } else if(res.data.code === '00000002'){
+              //已存在，选择是否覆盖
+              this.showSaveDialog(Object.assign({},param,{isTip:0}),res.data.msg);
             } else {
               this.warning(res.data.msg)
             }
@@ -245,8 +215,10 @@
         });
       },
       showConfirmDialog(msg, resolve) {
-        this.$alert(msg, '提示', {
+        this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          cancelButtonClass:'cancel',
           type: 'warning'
         }).then(() => {
           resolve();
@@ -278,6 +250,9 @@
         margin-bottom: 20px;
     }
     }
+    .cancel span{
+        color: #22ccc8;
+    }
     .line{
         border-top:1px #dcdfe6 solid;
         margin-bottom: 25px;

src/components/icss/AddPhysicalExamTemp.vue

@@ -251,8 +251,9 @@
         },
         showDelDialog() {
             let dvDetailVOList = []
+            const deptName = this.departList.filter(item => item.id == this.form.department)[0].name
             for (let i =0; i < this.rightTagsList.length; i++) {
-                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id })
+                dvDetailVOList.push({orderNo: i+1,vitalId:this.rightTagsList[i].id , remark: `${deptName}-${this.rightTagsList[i].tagName}`})
             }
             const param ={
                 "deptId": this.form.department,

src/components/icss/AddPromptInfo.vue

@@ -17,7 +17,6 @@
                                :index="i"
                                :len="len"
                                :isEdit = "isEdit"
-                               @change="getPgValues"
                                @add="addParagraph"
                                @del="delParagraph" ref="subForm"></InfoParagraph>
                 <p class="line"></p>
@@ -29,7 +28,7 @@
                     </el-form-item>
                     <TagPool :pool="tagPool"
                              :type="form.tagFor"
-                             :selected="editData.selectedTags"
+                             :selected="form.selectedTags"
                              @changeActionData="changeActionData"></TagPool>
                 </el-form-item>
                 </el-form>
@@ -72,6 +71,7 @@
         len:0,
         Adscriptions:[],            //归属列表
         editData:{
+          id:'',
           tagFor:'',
           selectedTags:[],
           prags:[]
@@ -128,6 +128,7 @@
           detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position)}));
         });
         return {
+          id:info.id,
           name:info.name,
           tagFor:info.questionList[0].type+'',
           selectedTags:info.questionList,
@@ -151,10 +152,10 @@
             this.form.prags.splice(i,1);
         });
       },
-      getPgValues(i,data){
+      /*getPgValues(i,data){
         this.form.prags[i] = data;
         //console.log(data,this.form.prags);
-      },
+      },*/
       getDropList() {
         return api.getDropList().then((res) =>{
           if(res.data.code === '0') {
@@ -186,12 +187,18 @@
         }
         //通过必填验证，提交保存
        const param = {
+          id:this.editData.id||undefined,
           name:this.form.name,
-          detailVOList:Object.assign(this.form.prags),
-          mapVOList:Object.assign(this.form.selectedTags)
+          detailVOList:this.parsePosition(this.form.prags),
+          mapVOList:this.parseTagsForSubmit(this.form.selectedTags)
         };
-        //console.log(param);
-         this.showSaveDialog(param);
+        this.showSaveDialog(param);
+      },
+      parsePosition(data){
+        const arr = data.map((it)=>{
+          return Object.assign({},it,{position:typeof it.position=='string'?it.position:it.position.join(",")});
+        });
+        return arr;
       },
       parseTagsForSubmit(data){
         return data.map((it)=>{
@@ -199,7 +206,7 @@
         });
       },
       changeActionData(selectedTags){
-        this.form.selectedTags = this.parseTagsForSubmit(selectedTags);
+        this.form.selectedTags = selectedTags;
         //console.log(selectedTags)
       },
       showSaveDialog(param) {

src/components/icss/AddSimilarName.vue

@@ -21,10 +21,10 @@
             <td>拼音</td>
           </tr>
           <tr v-if="flag" v-for="item in selfName">
-           <!-- 本体名字不能修改 3-15 -->
+           <!-- 本体名字不能修改 3-15  与标签名联动可修改 3-28-->
             <td>
-              <!-- <input type="text" name="" v-model="item.retrievalName" maxlength="30" @input="handleInput"> -->
-              <p>{{item.retrievalName}}</p>
+              <input type="text" name="" v-model="item.retrievalName" maxlength="30" @input="handleInput">
+              <!-- <p>{{item.retrievalName}}</p> -->
             </td>
             <td>
               <input type="text" name="" v-model="item.retrievalSpell" maxlength="30" @input="handlePinyin">

src/components/icss/CommonTemplate.vue

@@ -201,6 +201,9 @@ export default {
               reviewList[m].type = 'input'
               reviewList[m].text = reviewList[m].tagName
             }else{    //这个是标签
+              if(reviewList[m].flag == 1 || reviewList[m].flag == 4){
+                
+              }
               reviewList[m].id = reviewList[m].questionId
             }
           }
@@ -470,7 +473,6 @@ export default {
         "tagName": this.searchVal,
         "type": this.type == 4?3:1,
         "noIds": notIds,
-        "notTagType": [8]
       }
       api.getQuestionInfos(param).then((res) => {
         if (res.data.code === '0') {

src/components/icss/InfoParagraph.vue

@@ -1,20 +1,20 @@
 <template>
     <el-form :rules="rules" :model="data" ref="form" class="sub-form">
             <p class="line"></p>
-            <el-input v-model="data.orderNo" :value="index" type="hidden"></el-input>
-            <el-form-item label="是否属于诊断：" prop="isReason" @change="emitVal">
+            <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
+            <el-form-item label="是否属于诊断：" prop="isReason">
                 <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
                     <el-option label="否" :value="0"></el-option>
                     <el-option label="是" :value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="显示位置：" prop="position" label-width="130px">
-                <el-checkbox-group v-model="data.position" @change="emitVal" :disabled="isEdit&&index<len">
+                <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
                     <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
             <el-form-item label="标题" prop="title" label-width="130px">
-                <el-input v-model="data.title" @change="emitVal"></el-input>
+                <el-input v-model="data.title" maxlength="120"></el-input>
             </el-form-item>
             <el-form-item label="内容" prop="content" label-width="130px">
                 <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
@@ -31,6 +31,7 @@
   import 'quill/dist/quill.snow.css'
   import 'quill/dist/quill.bubble.css'
   import {quillEditor, Quill} from 'vue-quill-editor'
+  import config from '@api/config';
   import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
   Quill.register('modules/ImageExtend', ImageExtend);
   export default{
@@ -46,9 +47,9 @@
               ImageExtend: {
                 loading: true,
                 name: 'upfile',
-                action: 'http://192.168.2.236/api/icssman/file/uploadImage',
+                action: config.urls.promptServer,
                 response: (res) => {
-                  return 'http://192.168.2.236:82'+res.url;
+                  return config.imgHost+res.url;
                 }
               },
               toolbar: {
@@ -61,7 +62,10 @@
               }
             }
           },
-          form:{},
+          form:{
+            position:[],
+            orderNo:0
+          },
           positions:[],               //位置列表
           rules:{
             isReason: [
@@ -79,18 +83,10 @@
           }
         }
     },
-    watch:{
-      'data.content':{          //content改变时传值
-        handler(newVal,oldVal){
-          this.emitVal();
-        }
-      }
-    },
-    created(){
+    mounted(){
       //显示位置枚举列表
       const pos = localStorage.getItem("icssEnumsData");
       this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
-      this.form = this.data;
     },
     methods:{
       addEmit(){
@@ -99,13 +95,13 @@
       delEmit(){
         this.$emit("del",this.index);
       },
-      emitVal(){
-        let data = Object.assign({},this.data);
-        let pst=this.data.position;
+      /*emitVal(){
+        let data = this.form;
+        let pst=this.form.position;
         pst = typeof pst=='string'?pst:pst.join(',');
-        data =   Object.assign({},data,{position:this.data.position?pst:''});
+        data =   Object.assign({},data,{position:this.form.position?pst:'',orderNo:this.index,text:''});
         this.$emit("change",this.index,data);
-      }
+      }*/
     }
   }
 </script>
@@ -114,5 +110,15 @@
    .is-error .el-form-item__error{
         top:auto;
     }
-
+   /**富文本编辑器样式修改***/
+   .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,
+   .ql-snow .ql-picker.ql-header .ql-picker-item::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+   .ql-snow .ql-picker.ql-font .ql-picker-item::before,
+   .ql-snow .ql-color-picker .ql-picker-label svg,
+   .ql-snow .ql-icon-picker .ql-picker-label svg{
+       vertical-align: top;
+   }
 </style>

src/components/icss/MedicineInfoPg.vue

@@ -0,0 +1,124 @@
+<template>
+    <el-form :rules="rules" :model="data" ref="form" class="sub-form">
+        <p class="line"></p>
+        <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
+        <el-form-item label="是否属于诊断：" prop="isReason">
+            <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
+                <el-option label="否" :value="0"></el-option>
+                <el-option label="是" :value="1"></el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="显示位置：" prop="position" label-width="130px">
+            <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
+                <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
+            </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="标题" prop="title" label-width="130px">
+            <el-input v-model="data.title" maxlength="120"></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content" label-width="130px">
+            <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
+        </el-form-item>
+        <!--<el-form-item label-width="130px">
+            <el-button @click="addEmit">添加段落</el-button>
+            <el-button @click="delEmit" type="info">删除本段落</el-button>
+        </el-form-item>-->
+    </el-form>
+</template>
+
+<script>
+  import 'quill/dist/quill.core.css'
+  import 'quill/dist/quill.snow.css'
+  import 'quill/dist/quill.bubble.css'
+  import {quillEditor, Quill} from 'vue-quill-editor'
+  import config from '@api/config';
+  import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
+  Quill.register('modules/ImageExtend', ImageExtend);
+  export default{
+    props:['data','index','isEdit','len'],
+    name:'MedicineInfoParagraph',
+    components:{
+      quillEditor
+    },
+    data(){
+      return {
+        editorOption: {
+          modules: {
+            ImageExtend: {
+              loading: true,
+              name: 'upfile',
+              action: config.urls.promptServer,
+              response: (res) => {
+                return config.imgHost+res.url;
+              }
+            },
+            toolbar: {
+              container: container,
+              handlers: {
+                'image': function () {
+                  QuillWatch.emit(this.quill.id)
+                }
+              }
+            }
+          }
+        },
+        form:{
+          position:[],
+          orderNo:0
+        },
+        positions:[],               //位置列表
+        rules:{
+          isReason: [
+            { required: true, message: '请选择是否属于诊断', trigger: 'change' }
+          ],
+          position: [
+            { required: true, message: '请选择显示位置', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入段落标题', trigger: 'change' }
+          ],
+          content: [
+            { required: true, message: '请输入段落内容', trigger: 'change' }
+          ],
+        }
+      }
+    },
+    mounted(){
+      //显示位置枚举列表
+      const pos = localStorage.getItem("icssEnumsData");
+      this.positions = JSON.parse(pos)&&JSON.parse(pos).introducePositionEnum;
+    },
+    methods:{
+      /*addEmit(){
+        this.$emit("add");
+      },
+      delEmit(){
+        this.$emit("del",this.index);
+      },
+      emitVal(){
+        let data = this.form;
+        let pst=this.form.position;
+        pst = typeof pst=='string'?pst:pst.join(',');
+        data =   Object.assign({},data,{position:this.form.position?pst:'',orderNo:this.index,text:''});
+        this.$emit("change",this.index,data);
+      }*/
+    }
+  }
+</script>
+
+<style lang="less">
+    .is-error .el-form-item__error{
+        top:auto;
+    }
+    /**富文本编辑器样式修改***/
+    .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,
+    .ql-snow .ql-picker.ql-header .ql-picker-item::before,
+    .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+    .ql-snow .ql-picker.ql-font .ql-picker-item::before,
+    .ql-snow .ql-color-picker .ql-picker-label svg,
+    .ql-snow .ql-icon-picker .ql-picker-label svg{
+        vertical-align: top;
+    }
+</style>

src/components/icss/MedicinePrompt.vue

@@ -5,11 +5,14 @@
                 <el-form-item label="医学标准术语：">
                     <el-input size="mini" v-model="filter.term" placeholder="医学标准术语" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="术语类型：">
+                <el-form-item label="标题名称：">
+                    <el-input size="mini" v-model="filter.title" placeholder="标题名称" clearable></el-input>
+                </el-form-item>
+                <!--<el-form-item label="术语类型：">
                     <el-select size="mini" v-model="filter.type" placeholder="术语类型" clearable>
                         <el-option v-for="it in termTypes" :label="it.name" :value="it.name" :key="it.id"></el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item>-->
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <router-link to="/admin/LT-YXSYKWH-TJYXSYJTZS" style="margin:0 10px">
@@ -35,17 +38,21 @@
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="name"
+                        prop="conceptNameAndType"
                         label="医学标准术语">
                 </el-table-column>
                 <el-table-column
-                        prop="type"
+                        prop="source"
+                        label="静态知识来源">
+                </el-table-column>
+                <!--<el-table-column
+                        prop="conceptType"
                         label="术语类型"
                         width="140">
-                </el-table-column>
+                </el-table-column>-->
                 <el-table-column
                         prop="title"
-                        label="静态知识名称"
+                        label="标题名称"
                         width="240">
                 </el-table-column>
                 <el-table-column
@@ -94,7 +101,7 @@
         pays:[],
         filter: {
           term: '',
-          type:''
+          title:''
         }
       }
     },
@@ -152,8 +159,8 @@
       },
       getFilterItems() {
         const param = {
-          term:this.filter.term,
-          type:this.filter.type,
+          conceptName:this.filter.term,
+          title:this.filter.title,
           current: this.currentPage,
           size: this.pageSize
         };
@@ -178,8 +185,10 @@
         })
       },
       showConfirmDialog(msg,resolve){
-        this.$alert(msg, '提示', {
+        this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          cancelButtonClass:'cancel',
           type: 'warning'
         }).then(() => {
           resolve();

src/components/icss/NoiseTemplate.vue

@@ -175,7 +175,7 @@ export default {
         });
         return;
       }
-      if(this.dataPub.region8 >= this.dataPub.region9) {
+      if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
           this.$message({
             message: '最小年龄不能大于或等于最大年龄',
             type: 'warning'

src/components/icss/PhysicalExamTemplate.vue

@@ -139,7 +139,7 @@
       },
       getFilterItems() {
         const param = {
-          name: this.filter.proName,
+          deptName: this.filter.proName,
           current: this.currentPage,
           size: this.pageSize
         };

src/components/icss/PromptTagPool.vue

@@ -80,7 +80,7 @@
         }
       },
       selected(newVal, preVal) {
-        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {console.log(newVal)
+        if (JSON.stringify(newVal) != JSON.stringify(preVal)) {
           this.rightTagsList = newVal
         }
       },
@@ -199,11 +199,11 @@
       float: left;
     }
     .pool{
-      .el-input__inner {
+    .el-input .el-input__inner {
         width: 100%;
         border: 1px solid #c0c4cc;
         border-radius: 0;
-        height: 35px;
+        height: 42px;
         border-bottom: none;
       }
       .el-input__prefix {

src/components/icss/PubIndeptTag.vue

@@ -174,28 +174,43 @@
                 @input="sendData"
               ></el-input>
             </el-form-item>
+
+          <div>
             <el-form-item
                     label="正常值范围："
-                    class="fix-inp"
-                    prop="region13"
+                    prop="minNormalVal"
+                    class="ages"
                     v-if="form.region1==5 && form.region2==6 || form.region2==7"
             >
-                <el-col :span="7">
-                <el-input v-model="form.minNormalVal"
-                        :disabled="!form.region1"
-                        maxLength="30"
-                        @change="sendData"
-                ></el-input></el-col>
-                <el-col :span="8"> ~</el-col>
-                <el-col :span="7">
                 <el-input
-                    v-model="form.maxNormalVal"
-                    :disabled="!form.region1"
-                    maxLength="30"
-                    @change="sendData"
-                ></el-input></el-col>
+                        v-model.number="form.minNormalVal"
+                        :disabled="!form.region1"
+                         type="number"
+                         maxLength="4"
+                        ref="valage1"
+                        @input="sendData"
+                ></el-input>
             </el-form-item>
-            
+            <span
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > ~ 
+            </span>
+            <el-form-item
+              prop="maxNormalVal"
+              class="ages maxAges"
+              v-if="form.region1==5 && form.region2==6 || form.region2==7"
+            > 
+              <el-input
+                v-model.number="form.maxNormalVal"
+               :disabled="!form.region1"
+                type="number"
+                ref="valage2"
+                maxLength="4"
+                @input="sendData"
+              ></el-input>
+            </el-form-item>
+          </div>
+          
         </el-form>
     </div>
 </template>
@@ -279,9 +294,13 @@
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
           ],
-           region13: [
+           minNormalVal: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
+          ],
+          maxNormalVal: [
             { required: true, message: '请输入正常值范围', trigger: 'change' }
           ]
+          
         },
         tmpSex: '通用',
         tmpOwn: '',
@@ -442,6 +461,7 @@
         margin-bottom: 20px;
     }
     .el-form-item__error {
+        width: 200px;
         top: 28px;
     }
     .el-form-item__label {

src/components/icss/SingleSelect.vue

@@ -14,7 +14,7 @@
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
                     <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)||focusOn==-1">标记异常选项</el-checkbox-button>
                 </el-checkbox-group>
-                 <span v-if="type == 11" class="tip">可输入"()", 当作可输入内容的占位符</span>
+                 <span v-if="type == 11" class="tip">可输入中文全角括号"（）", 当作可输入内容的占位符</span>
                 <el-button type="danger" size="small" class="del" @click="delRow">删除</el-button>
                
             </div>