合并depart分支

src/components/icss/AddMedicalName.vue

@@ -8,8 +8,8 @@
         <table class="deptbox">
           <tr>
             <td class="ind">序号</td>
-            <td>标准词</td>
-            <td>类型</td>
+            <td>标准词<span class="necess">*</span></td>
+            <td>类型<span class="necess">*</span></td>
             <td class="desc">说明</td>
           </tr>
           <tr>
@@ -284,4 +284,10 @@ import api from '@api/icss.js';
     text-align: right;
     margin-top: 20px;
   }
+  .necess{
+    display: inline-block;
+    vertical-align: middle;
+    color: red;
+    margin-left: 2px;
+  }
 </style>

src/components/icss/MedicalType.vue

@@ -3,11 +3,11 @@
         <crumbs title="医学术语类型维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="医学类型：">
-                    <el-input size="mini" v-model="name" placeholder="输入类型"></el-input>
+                    <el-input size="mini" v-model="name" placeholder="输入医学类型"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
-                    <el-button size="mini" type="warning" @click="addType">添加类型</el-button>
+                    <el-button size="mini" type="warning" @click="addType">添加医学类型</el-button>
                 </el-form-item>
             </el-form>
         </crumbs>
@@ -108,9 +108,13 @@
           confirmButtonText: '确定',
           showCancelButton: false,
           inputPattern:/^[\u4e00-\u9fa5]+$/,
-          inputErrorMessage: '术语类型只能输入汉字'
+          inputErrorMessage: '医学类型只能输入汉字',
+          inputValidator:(value)=>{
+            if(value.trim().length>30){
+              return '最多可输入30个字'
+            }
+          }
         }).then(({value})=>{
-          console.log("添加的类型是：",value);
           if(value.trim()){
             api.addType({name:value.trim()}).then((res)=>{
               if(res.data.code==0){
@@ -119,6 +123,11 @@
                   type:'success'
                 })
                 this.getDataList();
+              }else{
+                this.$message({
+                  message:res.data.msg || '添加失败',
+                  type:'warning'
+                })
               }
             }).catch((error)=>{
               console.log(error);

src/components/icss/VersionDesc.vue

@@ -45,6 +45,7 @@
         <el-form ref="form" :model="form" :rules="showDesc?{}:rules" label-width="65px" class="add-desc-form">
           <p class="top">
             {{minTitle}}
+            <span class="tip">(&lt;br /&gt;代表换行符，如果需要可在需要处输入或者点击回车键)</span>
             <img src="../../images/close.png" height="12" width="12" @click="cancel">
           </p>
           <el-form-item label="标题：" prop="title">
@@ -53,7 +54,7 @@
           </el-form-item>
           <el-form-item label="内容：" prop="description" class="discDesc">
             <p v-if="showDesc" v-html="form.description" class="cont">{{form.description}}</p>
-            <el-input v-else type="textarea" :rows="3" placeholder="请输入内容" v-model="form.description" maxlength="120"></el-input>
+            <el-input v-else type="textarea" :rows="3" placeholder="请输入内容" v-model="form.description" maxlength="120" @keydown.native="contentInp"></el-input>
           </el-form-item>
           <el-button class="disclButn1" size="small" type="primary" @click="comfirn('form')">确定</el-button>
           <!-- <el-button class="disclButn can" size="small" type="primary" @click="cancel">取消</el-button> -->
@@ -126,6 +127,12 @@
     },
     props:['detail','versionId','isFirst','isCopy'],
     methods:{
+      // 按回车添加换行<br />
+      contentInp(e){
+        if(e.keyCode==13){
+          this.form.description += '<br />'
+        }
+      },
       //用于修改时及时更新明细信息，若用本地信息，建立时间和操作人无法及时更新。
       getList(){
         api.getVersionDetlInfo({id:this.versionId}).then((res)=>{
@@ -376,4 +383,8 @@
   .version-desc .el-table th{
     padding: 0px;
   }
+  .tip{
+    font-weight: normal;
+    font-size: 13px;
+  }
 </style>