Merge branch 'test' into ChronicMag_zxc

src/components/icss/AddMedicalName.vue

@@ -4,7 +4,7 @@
     <div class="contents">
       <div class="content">
         <h3>添加术语：</h3>
-        <p class="titl">标准术语：</p>
+        <p class="titl">医学标准术语：</p>
         <table class="deptbox">
           <tr>
             <td class="ind">序号</td>
@@ -16,7 +16,11 @@
             <td class="ind">1</td>
             <td :title="data.name&&data.name.length>9?data.name:''">
               <!-- <el-input v-model="data.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(1)"></el-input> -->
-              <input type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @input="handleInput(1)">
+              <!-- 修改时标准词不能修改，修改了会当做新增处理 4-17 -->
+              <p v-if="id">{{data.name}}</p>
+              <!-- <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @input="handleInput(1)"> -->
+              <!-- 4-18 需求变更 -->
+              <input v-else type="text" v-model="data.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(1)">
             </td>
             <td>
               <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small">
@@ -31,7 +35,7 @@
             </td>
             <td class="desc">
               <!-- <el-input v-model="data.remark" placeholder="请输入术语说明" maxlength="120" size="small" @input="handleRemark"></el-input> -->
-              <input v-model="data.remark" placeholder="请输入术语说明" maxlength="120" @input="handleRemark(1)"></input>
+              <input v-model="data.remark" placeholder="请输入术语说明" maxlength="120"></input>
             </td>
           </tr>
         </table>
@@ -49,7 +53,8 @@
             <td :title="item.name&&item.name.length>9?item.name:''">
               <!-- 使用原生input，输入限制 -->
               <!-- <el-input v-model="item.name" placeholder="请输入术语" maxlength="30" size="small" @input.native="handleInput(2,index)"></el-input> -->
-              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @input="handleInput(2,index)">
+              <!-- <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @input="handleInput(2,index)"> -->
+              <input type="text" v-model="item.name" placeholder="请输入术语" maxlength="30" @blur="handleBlur(2,index)">
             </td>
             <td>
               <!-- <el-select v-model="item.type" clearable placeholder="请选择">
@@ -64,7 +69,7 @@
             </td>
             <td class="desc">
               <!-- <el-input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" size="small" @input="handleRemark(index,item.name)"></el-input> -->
-              <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120" @input="handleRemark(2,index)"></input>
+              <input v-model="item.remark" placeholder="请输入术语说明" maxlength="120"></input>
             </td>
             <td v-if="id">
               <span @click="deleLine(index)" class="delete">删除</span>
@@ -165,7 +170,7 @@ import api from '@api/icss.js';
         });
       },
       // handleInput(index,name){
-      handleInput(type,index){
+     /* handleInput(type,index){
         // 可输入内容：字母、数字、汉字、特殊字符：%  ——  其余不可输入；
         // if(!name){//标准词输入
         if(type==1){//标准词输入
@@ -173,15 +178,54 @@ import api from '@api/icss.js';
         }else{
           this.synonymous[index].name = this.synonymous[index].name.replace(/[^%0-9a-zA-Z\u4e00-\u9fa5]/g,'');
         }
+      },*/
+      handleBlur(type,index){
+        // 不能为纯数字、纯字符、纯数字加字符 4-18
+        const pattern = /[^~@#$%^&*_\-+=,，.。:："“？?”；;、!！0-9]/g;
+        if(type==1){//标准词输入
+          if(!pattern.test(this.data.name)){
+            this.$message({
+              message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              type:'warning'
+            });
+            this.data.name = '';
+          }
+        }else{
+          if(!pattern.test(this.synonymous[index].name)){
+            this.$message({
+              message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              type:'warning'
+            });
+            this.synonymous[index].name = '';
+          }
+        }
       },
       // handleRemark(index,name){
       handleRemark(type,index){
       //说明只能输入中文
         // if(!name){//标准词输入
-        if(type==1){//标准词输入
+        /*if(type==1){//标准词输入
           this.data.remark = this.data.remark.replace(/[^\u4e00-\u9fa5]/g,'');
         }else{
           this.synonymous[index].remark = this.synonymous[index].remark.replace(/[^\u4e00-\u9fa5]/g,'');
+        }*/
+        const pattern = /[^~@#$%/^&*_\-+=,，.。:："“？?”；;、!！0-9]/g;
+        if(type==1){//标准词输入
+          if(!pattern.test(this.data.remark)){
+            this.$message({
+              message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              type:'warning'
+            });
+            this.data.remark = '';
+          }
+        }else{
+          if(!pattern.test(this.synonymous[index].remark)){
+            this.$message({
+              message:'无法输入纯数字或者纯字符，请输入正确数据！',
+              type:'warning'
+            });
+            this.synonymous[index].remark = '';
+          }
         }
       },
       addSpan(){

src/components/icss/AddMedicinePrompt.vue

@@ -5,16 +5,16 @@
                 @click="back"
         ></i> 医学静态知识--{{isEdit?'修改':'添加'}}</div> -->
         <crumbs
-          :title=" isEdit? '医学静态知识-修改':'医学静态知识-添加'"
+          :title=" isEdit? '医学术语静态知识维护-修改':'医学术语静态知识维护-添加'"
           class="topBack"
           linkTo="/admin/LT-YXSYKWH-YXSYJTZSWH"
         ></crumbs>
         <div class="info-container">
             <el-form :rules="rules"
                      :model="form"
-                     label-width="130px"
+                     label-width="160px"
                      ref="groups">
-                <el-form-item v-if="!isEdit" label="选择术语：" prop="selectedTerm">
+                <el-form-item v-if="!isEdit" label="选择医学标准术语：" prop="selectedTerm">
                     <el-select v-model="form.selectedTerm"
                                filterable
                                remote
@@ -23,10 +23,10 @@
                                ref="termName"
                                placeholder="搜索术语"
                                :remote-method="searchTerms">
-                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.libName+'-('+term.libType+')'" :value="term" ></el-option>
+                        <el-option v-for="term in terms" :key="term.conceptId" :label="term.nameAndType" :value="term" ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="已选择术语标签：">
+                <el-form-item label="已选择医学标准术语：" label-width="160px">
                     {{form.selectedTermName}}
                 </el-form-item>
                 <el-form-item label="术语类型：">
@@ -116,10 +116,10 @@
     },
     watch:{
       'form.selectedTerm':function(newVal){
-        const name = newVal.libName;
+        const name = newVal.name;
         //this.editData.selectedTermName = name;
         this.form.selectedTermName = name;
-        this.form.selectedTermType = newVal.libType;
+        this.form.selectedTermType = newVal.type;
         this.form.conceptId = newVal.conceptId;
       }
     },
@@ -164,9 +164,9 @@
       },
       searchTerms(query){
         //搜索术语列表
-        api.knowledgeName({term:query,type:''}).then((res) =>{
+        api.getAllConcept({name:query,isConcept:1}).then((res) =>{
           if(res.data.code === '0') {
-            this.terms = res.data.data.records;
+            this.terms = res.data.data;
           }else{
             this.warning("数据获取失败");
           }

src/components/icss/AddPromptInfo.vue

@@ -1,10 +1,9 @@
 <template>
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <div class="groupTitle"><i
-                class="el-icon-back"
-                @click="back"
-        ></i> 提示信息维护--{{isEdit?'修改':'添加'}}</div>
-        <div class="info-container">
+        <crumbs :title="isEdit?'提示信息维护-修改':'提示信息维护-添加'"
+                class="topBack"
+                linkTo="/admin/LT-YXSJWH-TSXXWH"></crumbs>
+        <div class="pinfo-container">
             <el-form :rules="rules"
                      :model="form"
                      label-width="130px"
@@ -16,7 +15,7 @@
                                :data="f"
                                :index="i"
                                :isEdit = "isEdit"
-                               @add="addParagraph"
+                               @add="addParagraph(i)"
                                @del="delParagraph" ref="subForm"></InfoParagraph>
                 <p class="line"></p>
                 <el-form-item label="关联标签：" prop="tags">
@@ -137,11 +136,11 @@
           prags:detail
         };
       },
-      addParagraph(){
+      addParagraph(i){
         this.form.prags.push({title:'',
           content:'',
           isReason:0,
-          orderNo:0,
+          orderNo:this.form.prags.length,
           position:[],
           text:''});
       },
@@ -249,10 +248,20 @@
 </script>
 <style lang="less">
     @import "../../less/common.less";
-    .info-container{
-        background: #fff;
-        padding: 20px;
-        margin: 20px 20px -20px 20px;
+    .NoiseTemplateWrapper .pinfo-container{
+        /*background: #fff;
+        padding: 20px;*/
+        margin: 70px 20px -20px 20px;
+        form{
+            padding: 20px;
+            background: #fff;
+        }
+        .btn{
+            padding: 10px 20px 20px 0;
+            margin-top: 0;
+            background: #fff;
+            margin-bottom: 20px;
+        }
         .el-input__inner{
             width: 200px;
         }

src/components/icss/AddSimilarName.vue

@@ -259,7 +259,7 @@
           const result = res.data;
           if(result.code==0){
             this.searchDatas = result.data;
-            if(result.data.length>0){
+            if(result.data&&result.data.length>0){
               this.showFlag = true;
             }
           }else{
@@ -323,16 +323,17 @@
   }
   .search{
     display: inline-block;
-    width: 56px;
+    width: 55px;
     height: 32px;
     border-left: 1px solid #ccc;
     position: relative;
     left: -57px;
     vertical-align: middle;
     line-height: 32px;
-    bottom: 2px;
+    bottom: 1px;
     text-align: center;
     cursor: default;
+    background: #fff;
   }
   h3{
     font-size: 16px;

src/components/icss/DiagnosisList.vue

@@ -117,10 +117,10 @@ export default {
         }
     },
     created() {
-        this.getDropList().then(() => {
+      // this.getDataList()
+      this.getDropList().then(() => {
             this.getDataList()
         })
-        
     },
     methods: {
         getValue(val) {
@@ -131,7 +131,7 @@ export default {
                 // console.log('dropList', res)
                 if(res.data.code === '0') {
                     this.Adscriptions = res.data.data[7];
-                    this.tagTypes =  res.data.data[3];
+                    this.tagTypes =  res.data.data[2];
                     for (var i = 0; i < this.tagTypes.length; i++) {
                         this.tagTypesList.push(this.tagTypes[i].val)
                     }

src/components/icss/InfoParagraph.vue

@@ -17,7 +17,7 @@
                 <el-input v-model="data.title"></el-input>
             </el-form-item>
             <el-form-item label="内容" prop="content" label-width="130px">
-                <quillEditor v-model="data.content" :options="editorOption"></quillEditor>
+                <quillEditor v-model="data.content" :options="editorOption"  class="ql-editor"></quillEditor>
             </el-form-item>
             <el-form-item label-width="130px">
                 <el-button @click="addEmit">添加段落</el-button>

src/components/icss/MedicalName.vue

@@ -2,7 +2,7 @@
     <div>
         <crumbs title="医学术语命名维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="术语：">
+                <el-form-item label="医学标准术语：">
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">
@@ -24,7 +24,7 @@
                     <el-button size="mini" @click="uploadClick">导入</el-button>
                     <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
                     <router-link to="/admin/LT-YXSYKWH-TJYXSY" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加术语</el-button>
+                        <el-button size="mini" type="warning">添加医学标准术语</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>

src/components/icss/MedicineInfoPg.vue

@@ -2,22 +2,22 @@
     <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-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
             <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-form-item label="显示位置：" prop="position" label-width="160px">
             <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"></el-input>
+        <el-form-item label="标题名称：" prop="title" label-width="160px">
+            <el-input v-model="data.title" :disabled="isEdit&&index<len"></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 label="内容" prop="content" label-width="160px">
+            <quillEditor v-model="data.content" :options="editorOption"  class="ql-editor"></quillEditor>
         </el-form-item>
         <!--<el-form-item label-width="130px">
             <el-button @click="addEmit">添加段落</el-button>

src/components/icss/PromptDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="NoiseTemplateWrapper TemplateWrapper">
-        <crumbs title="提示信息维护--详情" linkTo="/admin/LT-YXSJWH-TSXXWH">
+        <crumbs title="提示信息维护--详情" class="topBack" linkTo="/admin/LT-YXSJWH-TSXXWH">
         </crumbs>
         <div class="info-container">
             <el-form label-width="130px"

src/components/icss/PubTemplateGroup.vue

@@ -145,10 +145,10 @@ export default {
       if(newVal != preVal){
         if(newVal == 1){
           let tmpDeptDTOS = this.deptDis.deptDTOS
-          let obj = {id:-1,name:'通用'}
-          if(tmpDeptDTOS[0].id != 0){
-            tmpDeptDTOS.unshift(obj)
-          }
+          // let obj = {id:-1,name:'通用'}
+          // if(tmpDeptDTOS[0].id != 0){
+          //   tmpDeptDTOS.unshift(obj)
+          // }
           this.sonLis = tmpDeptDTOS
           if(!this.form.id){
             this.form.region4 = ''
@@ -156,10 +156,10 @@ export default {
           }
         }else if(newVal == 2){
           let tmpDisDTOS = this.deptDis.disDTOS
-          let obj = {id:-1,name:'通用'}
-          if(tmpDisDTOS[0].id != 0){
-            tmpDisDTOS.unshift(obj)
-          }
+          // let obj = {id:-1,name:'通用'}
+          // if(tmpDisDTOS[0].id != 0){
+          //   tmpDisDTOS.unshift(obj)
+          // }
           this.sonLis = tmpDisDTOS
           if(!this.form.id){
             this.form.region4 = ''

src/components/icss/VersionDesc.vue

@@ -45,7 +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>
+            <span v-if="tip" class="tip">(&lt;br /&gt;代表换行符，如果需要可在需要处输入)</span>
             <img src="../../images/close.png" height="12" width="12" @click="cancel">
           </p>
           <el-form-item label="标题：" prop="title">
@@ -114,7 +114,8 @@
         minTitle:'',
         showBox:false,
         modiId:null,
-        showDesc:false
+        showDesc:false,
+        tip:true
       }
     },
     created(){
@@ -261,12 +262,14 @@
         this.form.description = "";
         this.modiId = null;
         this.minTitle= "";
+        this.tip = true;
       },
       cancel(){
         this.reset();
       },
       getDetail(item){//明细
         this.minTitle='说明明细';
+        this.tip = false;
         this.showDesc = true;
         this.showBox = true;
         this.form.title = item.title;
@@ -386,5 +389,6 @@
   .tip{
     font-weight: normal;
     font-size: 13px;
+    color:#22ccc8;
   }
 </style>