فهرست منبع

Merge branch 'dev' into dev2/zhangxc

zhangxc 6 سال پیش
والد
کامیت
2d9d17892d

+ 3 - 1
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',
@@ -143,6 +144,7 @@ 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',   //删除术语静态知识

+ 6 - 2
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'});

+ 4 - 1
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

+ 16 - 9
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) {

+ 3 - 3
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">

+ 131 - 25
src/components/icss/CommonTemplate.vue

@@ -37,8 +37,25 @@
         ></span></p>
     </div>
     <div class="bottomPartRight bottomPartRightTemplate">
-      <p class="poolTitle poolTitleTmp">模板内容:</p>
+      <p class="poolTitle poolTitleTmp">模板内容:
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 1">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 2 || type == 3">特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常</span>
+        <span style="color:#22ccc8;fontSize:12px" v-if="type == 5">特殊标记1-只可放入主诉模块中,放入其他模块数据会显示异常;特殊标记4-只可放入现病史模块中,放入其他模块数据会显示异常;</span>
+      </p>
+        <div v-if="type == 5">
+          <span style="marginLeft:10px;">
+            <el-button v-if="flagLisFst == 1" type="primary" class="flagStyle" size="mini" @click="addFlg(1)" :disabled="flagLisSec == 4">1、标示主诉中添加症状展示位置</el-button>
+            <el-button v-else class="flagStyle" size="mini" @click="addFlg(1)" :disabled="flagLisSec == 4">1、标示主诉中添加症状展示位置</el-button>
+          </span>
+          <span style="marginLeft:10px;">
+            <el-button style="marginTop:3px;" v-if="flagLisSec == 4" type="primary" class="flagStyle" size="mini" @click="addFlg(4)" :disabled="flagLisFst == 1">4、标示在主诉中症状引用到现病史中展示位置
+  和添加症状位置</el-button>
+            <el-button style="marginTop:3px;" v-else class="flagStyle" size="mini" @click="addFlg(4)" :disabled="flagLisFst == 1">4、标示在主诉中症状引用到现病史中展示位置
+  和添加症状位置</el-button>
+          </span>
+        </div>
       <div class="arrowWrap" style="float:right;marginRight:10px" v-if="type != 1 && type != 2 && type != 3">
+        <el-button size="mini" @click="addDomTemplate(1)">插入输入栏</el-button>
         <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
         <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
       </div>
@@ -63,19 +80,25 @@
                   :key="item.id"
                 ></el-option>
               </el-select>
-              <el-button size="mini" @click="addDomTemplate(0,'submitForm')">添加</el-button>
-              <el-button size="mini" @click="delSubTemplate">删除子模板</el-button>
-              <el-button size="mini" @click="addDomTemplate(1)">插入输入栏</el-button>
-              <el-button size="mini" @click="addFlg(1)">1.插入选择症状模块</el-button>
-              <el-button size="mini" @click="addFlg(3)">2.插入病程变化模块</el-button>
-              <el-button size="mini" @click="addFlg(4)">3.插入从主诉中获取的伴/无症状模块</el-button>
+              <el-button size="mini" class="normal" @click="addDomTemplate(0,'submitForm')">添加</el-button>
+              <el-button size="mini" class="normal" @click="delSubTemplate">删除子模板</el-button>
+              <el-button size="mini" class="normal" @click="addDomTemplate(1)">插入输入栏</el-button>
+              <span v-if="type == 1" style="marginLeft:10px;">
+                <el-button v-if="flagLisFst == 1" type="primary" class="flagStyle" size="mini" @click="addFlg(1)">1、标示主诉中添加症状展示位置</el-button>
+                <el-button v-else class="flagStyle" size="mini" @click="addFlg(1)">1、标示主诉中添加症状展示位置</el-button>
+              </span>
+              <span v-if="type == 2 || type == 3" style="marginLeft:10px;">
+                <el-button v-if="flagLisSec == 4" type="primary" class="flagStyle" size="mini" @click="addFlg(4)">4、标示在主诉中症状引用到现病史中展示位置
+和添加症状位置</el-button>
+                <el-button v-else class="flagStyle" size="mini" @click="addFlg(4)">4、标示在主诉中症状引用到现病史中展示位置
+和添加症状位置</el-button>
+              </span>
               <div class="arrowWrap">
                 <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
                 <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
               </div>
             </el-form-item>
           </el-form>
-        
       </div>
       <ul class="tagList operationPool templateTagLists">
         <li
@@ -92,18 +115,20 @@
                 @change="updataData"
               >
               </el-input>
-              <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i>
+              <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
           </div>
           <p
             v-if="item.type === 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}} <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i></p>
+          >{{item.tagName}} 
+            <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
+            </p>
           <p
             v-if="item.type !== 'input' && item.type !== 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}} <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i></p>
+          >{{item.tagName}} <i class="tagFlag" v-if="item.flag">{{item.flag}}</i></p>
         </li>
       </ul>
     </div>
@@ -123,6 +148,10 @@ export default {
       default: '',
       type: String
     },
+    sign: {
+      default: '',
+      type: String
+    },
     options: {
       default: () => {},
       type: Object
@@ -147,6 +176,8 @@ export default {
       styles: {
         background: '#eae7e7'
       },
+      flagLisFst:-1,
+      flagLisSec:-1
     }
   },
   destroyed: function () {
@@ -170,10 +201,14 @@ 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
             }
           }
           this.rightTagsList = reviewList
+          this.getFlagList()
         }
         this.$emit('changeActionData', this.rightTagsList, false);
         this.getSubTemplate()
@@ -185,7 +220,6 @@ export default {
   },
   watch: {
     type(newVal, preVal) {
-      this.searchTagList()       //重新获取标签池数据
       if(newVal != preVal){
         this.form = {region: ''}  
         this.subTmpList = []     //子模板的id用于去重
@@ -195,8 +229,26 @@ export default {
         this.selectRightTagsList = []
         this.selectRightTagsListIndex = []
         this.searchVal = ''
+        this.flagLisFst = -1
+        this.flagLisSec = -1
         this.getSubTemplate()      //重新获取子模板
       }
+      this.searchTagList()       //重新获取标签池数据
+    },
+    sign(newVal, preVal) {
+      if(newVal != preVal){
+        this.form = {region: ''}  
+        this.subTmpList = []     //子模板的id用于去重
+        this.leftTagsList = []
+        this.selectLeftTagsList = []
+        this.rightTagsList = []
+        this.selectRightTagsList = []
+        this.selectRightTagsListIndex = []
+        this.searchVal = ''
+        this.flagLisFst = -1
+        this.flagLisSec = -1
+      }
+      this.searchTagList()       //重新获取标签池数据
     },
     searchVal(newVal, preVal) {
       if (newVal.trim() == '') {
@@ -210,17 +262,48 @@ export default {
     updataData(){
       this.$emit('changeActionData', this.rightTagsList, false);
     },
-    addFlg(idx){
+    getFlagList(){
+      let lis =  this.rightTagsList;
+      for(let i = 0;i < lis.length;i++){
+        let tmpLi = lis[i];
+        if(tmpLi.flag == 1){
+          this.flagLisFst = 1
+        }else if(tmpLi.flag == 4){
+          this.flagLisSec = 4
+        }
+      }
+    },
+    addFlg(idx){//添加标记,已经有标记了先去掉标记,再点击才能加上,没有标记的加上标记
       let selectTagFlg = this.selectRightTagsListIndex;
       let tmpSelectRightTagsList = this.selectRightTagsList;
-      if(selectTagFlg.length == 0 || (tmpSelectRightTagsList && tmpSelectRightTagsList.length>0 && tmpSelectRightTagsList[0].type == 'input')){
+      let tmpLis = this.rightTagsList;
+      let tmpObj = tmpLis[selectTagFlg[0]],m = 0;
+      if(tmpSelectRightTagsList && tmpSelectRightTagsList.length>0 && (tmpSelectRightTagsList[0].type == 'input' || tmpSelectRightTagsList[0].type == 'sub')){
         return;
       }
-      let tmpLis = this.rightTagsList.slice()
-      let tmpObj = tmpLis[selectTagFlg[0]];
-      tmpObj.flag = idx
-      this.rightTagsList = [...tmpLis]
+      for(let i = 0;i < tmpLis.length;i++){//循环右侧所有标签,点击的这个有标记,去掉标记,点击的没有标记,去掉其他标记,标记当前项
+        let tmpLi = tmpLis[i];
+        if(tmpLi.flag == idx){
+          console.log(idx,787878)
+          tmpLi.flag = null
+          idx == 1?(this.flagLisFst = -1):(idx == 4?this.flagLisSec = -1:null)
+          // if(idx == 1){//点的是1
+          //   if(this.flagLisFst == -1){//第一个未被选中
+          //     this.flagLisFst = 1
+          //   }else{
 
+          //   }
+          // }
+        }else{//没有标记,判断是否有选中,选中就加上标记,没有不做处理
+          ++m
+          if((m == tmpLis.length)&& tmpSelectRightTagsList && tmpSelectRightTagsList.length>0){
+            tmpObj.flag = idx
+            idx == 1?(this.flagLisFst = 1):(idx == 4?this.flagLisSec = 4:null)
+          }
+        }
+      }
+      this.rightTagsList = [...tmpLis]
+      this.getFlagList()
     },
     addDomTemplate(sign,dom){
       let tmpArr1 = this.rightTagsList.slice(0);
@@ -229,6 +312,13 @@ export default {
       let tmpArr4 = this.Adscriptions.filter(item => item.id == tmpRegion);
       let tmpTag = Object.assign({},this.addTag);     //深度复制obj
       if(sign == 0){         //添加子模板
+        if(tmpArr3.length > 0){
+          this.$message({
+            message:'模板中只能添加一个子模板',
+            type:'warning'
+          })
+          return
+        }
         if(tmpArr4.length == 0){
           this.$message({
             message:'请选择子模板',
@@ -237,6 +327,7 @@ export default {
           return false;
         }
         tmpTag.type = 'sub'
+        tmpTag.flag = '3'
         tmpArr3.push(tmpRegion)
         tmpTag.tagName = tmpArr4[0].name
         tmpTag.id = tmpArr4[0].id + 'sub'
@@ -254,6 +345,7 @@ export default {
       }
       this.rightTagsList = tmpArr1;
       this.$emit('changeActionData', this.rightTagsList, false);
+      this.getFlagList()
     },
     moveTag(dir){
       let tmpArr1 = this.rightTagsList.slice(0);
@@ -292,18 +384,20 @@ export default {
         this.selectRightTagsListIndex = tmpArr2
         this.rightTagsList = tmpArr
       }
+      this.getFlagList()
       this.$emit('changeActionData', this.rightTagsList, false);
     },
     delSubTemplate(){   //删除子模板
       if (this.selectRightTagsList.length>0 && this.selectRightTagsList[0].type === 'sub') {    //删除子模板,输入框或者标签就不变
-        this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[0].id)
-        this.subTmpList = this.subTmpList.filter(item => item.id !== this.selectRightTagsList[0].id)  //选中的子模板id去掉
+        this.rightTagsList = this.rightTagsList.filter(item => item.id != this.selectRightTagsList[0].id)
+        this.subTmpList = this.subTmpList.filter(item => item != parseInt(this.selectRightTagsList[0].id))  //选中的子模板id去掉
       }
       this.selectLeftTagsList = []
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
       this.$emit('changeActionData', this.rightTagsList, false);
       this.getSubTemplate()
+      this.getFlagList()
     },
     selectLeftTag(tag, index, e) {
       const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
@@ -353,6 +447,7 @@ export default {
       this.selectLeftTagsList = []
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
+      this.getFlagList()
     },
     toRightList() {
       this.rightTagsList.push(...this.selectLeftTagsList);
@@ -363,10 +458,12 @@ export default {
       this.selectRightTagsList = []
       this.selectRightTagsListIndex = []
       this.$emit('changeActionData', this.rightTagsList, false);
+      this.getFlagList()
     },
     searchTagList() {
       let notIds = []
       let tmpArr = this.rightTagsList.slice();
+      console.log(tmpArr)
       for (let i = 0; i < tmpArr.length; i++) {
         if(tmpArr[i].type != 'sub' && tmpArr[i].type != 'input'){
           notIds.push(tmpArr[i].id)
@@ -376,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') {
@@ -557,23 +653,33 @@ export default {
     .el-button--mini, .el-button--mini.is-round {
       padding: 5px 8px 4px;
     }
-    .el-button:hover {
+    .normal.el-button:hover {
         color: @adminBase;
         border-color: @adminBase;
         outline: 0;
         opacity: 1;
         background-color: #fff;
     }
-    .el-button:active {
-        color: @adminBase;
+    .normal.el-button:active {
+      color: @adminBase;
         border-color: @adminBase;
         outline: 0;
     }
-    .el-button:focus {
+    .normal.el-button:focus {
       background-color: #fff;
       color: @adminBase;
       opacity: 1;
     }
+    .flagStyle.el-button:hover {
+        outline: 0;
+        opacity: 1;
+    }
+    .flagStyle.el-button:active {
+        outline: 0;
+    }
+    .flagStyle.el-button:focus {
+      opacity: 1;
+    }
   }
 }
   

+ 28 - 22
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>

+ 3 - 3
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 {

+ 61 - 0
src/components/icss/PubTemplateGroup.vue

@@ -26,6 +26,26 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <!-- <el-form-item
+        label="选择子模板归属:"
+        prop="region3"
+        v-if="form.region1 == 5"
+      >
+        <span class="changeTips">改变子模板归属后,模板内容将会恢复到默认状态</span>
+        <el-select
+          :disabled="!!editData.id"
+          v-model="form.region3"
+          placeholder="请选择子模板"
+          @change="sendData"
+        >
+          <el-option
+            v-for="item in sonLis"
+            :label="item.name"
+            :value="item.key+''"
+            :key="item.key"
+          ></el-option>
+        </el-select>
+      </el-form-item> -->
       <el-form-item
         label="模板名称:"
         prop="region2"
@@ -54,10 +74,25 @@ export default {
   props:['editData'],
   data() {
     return {
+      numWord:0,
       Adscriptions:[],
+      sonLis:[{
+        name:'空',
+        key:'-1',
+      },{
+        name:'主诉模板',
+        key:'1'
+      },{
+        name:'现病史模板',
+        key:'2'
+      },{
+        name:'现病史空模板',
+        key:'3'
+      }],
       form: {
         region1: '',    //归属
         region2: '',     //模板名称
+        region3: '-1',     //子模板
         tagPool:[],      //标签池
       },
       rules: {
@@ -68,18 +103,28 @@ export default {
           { required: true, message: '请输入模板名称', trigger: 'change' },
           // { validator: validatePass2, trigger: 'blur' },
         ],
+        region3: [
+          { required: true, message: '请选择子模板归属', trigger: 'change' },
+          // { validator: validatePass2, trigger: 'blur' },
+        ],
       },
     }
   },
   beforeMount:function(){
     let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
+    let guisu = localStorage.getItem('guisu') ? JSON.parse(localStorage.getItem('guisu')) : []
+    for(let k = 0;k < guisu.length;k++){
+      templateOwn = templateOwn.filter(item => item.key != guisu[k])
+    }
     this.Adscriptions = templateOwn;
   },
   mounted() {
     const editData = this.$props.editData;
+    let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
     if(editData.id){      //修改
       // const trans = utils.transformKeys(editData,2);
       this.form = Object.assign({},this.form,editData);
+      this.Adscriptions = templateOwn
       this.form.region1 = (editData.type+'')
       this.form.region2 = editData.name
     }
@@ -87,6 +132,22 @@ export default {
     // this.searchTagList()
   },
   methods:{
+    changes(){
+      let nameVal = this.form.region2
+      console.log(nameVal.length)
+      if(nameVal.length == 10){
+        this.$message({
+          message: '最多输入120个字',
+          type: 'warning',
+          showClose: true,
+        });
+      }
+      if(nameVal.length == 10){
+        this.numWord = 10
+      }else{
+        this.numWord = 0
+      }
+    },
     sendData(val){
       this.$emit('changeVal', this.form, false)
     },

+ 1 - 1
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>

+ 37 - 2
src/components/icss/TemplateMaintenance.vue

@@ -52,7 +52,7 @@
                         label="操作">
                     <template slot-scope="scope">
                         <el-button  @click="modifyIndeptTag(scope.row)" type="text" size="small">修改</el-button>
-                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                        <!-- <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
@@ -97,9 +97,44 @@
       this.getDropList().then(() => {
         this.getDataList()
       })
-
+      this.getSubTemplate()
     },
     methods: {
+      getSubTemplate() {
+        let param = {
+          noIds:this.subTmpList,
+        }
+        api.getModuleInfoSub(param).then((res) => {
+          if (res.data.code === '0') {
+            let result = res.data.data
+            let arr = [],main = '',now = '',nowEmpt = '',other = '';
+            for(let i = 0;i < result.length;i++){
+              if(result[i].name == '主诉模板'){
+                if(!main){
+                  main = 1
+                  arr.push(main)
+                }
+              }else if(result[i].name == '现病史模板'){
+                if(!now){
+                  now = 2
+                  arr.push(now)
+                }
+              }else if(result[i].name == '现病史空模板'){
+                if(!nowEmpt){
+                  nowEmpt = 3
+                  arr.push(nowEmpt)
+                }
+              }else if(result[i].name == '其他史模板'){
+                if(!other){
+                  other = 4
+                  arr.push(other)
+                }
+              }
+            }
+            localStorage.setItem('guisu',JSON.stringify(arr))
+          }
+        })
+      },
       getDropList() {
         let templateOwn = localStorage.getItem('icssEnumsData') ? JSON.parse(localStorage.getItem('icssEnumsData')).moduleTypeEnum : []
         this.Adscriptions = templateOwn;

+ 2 - 0
src/components/icss/TemplateMaintenanceWrap.vue

@@ -15,6 +15,7 @@
         v-if="dataPub.region1"
         :pool="dataPub.tagPool"
         :type="dataPub.region1"
+        :sign="dataPub.region3"
         :options="editData"
          @changeActionData="changeActionData"
       >
@@ -82,6 +83,7 @@ export default {
         "modelDetils": detailLis,
         "name": name,
         "type": type,
+        "flag": type == 5?3:'',
         "textType": type,
         "id":this.editData.id || ''
       }