Merge branch 'dev' into dev2/zhangxc

src/api/config.js

@@ -177,7 +177,7 @@ export default {
   },
   groupParams:[
     {controlType:[1,2],tagType:[1],notTagType:[8]},     //多列多选（杂音/初为）     notTagType为文字标签剔除
-    {controlType:[0,1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签（血压）
+    {controlType:[1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //多项统一横铺标签（血压）
     {controlType:[0,1,2,5,6,7,11],tagType:[1,2],notTagType:[8]},  //症状详细（症状尾巴）
     {controlType:[0,1,2],tagType:[1,2,3,4],notTagType:[2,8]}, //组合项标签（既往史）
     {controlType:[1,6],tagType:[],notTagType:[8]},    //化验组合

src/api/utils.js

@@ -232,6 +232,7 @@ export default {
       }else{    //这个是标签
         obj.questionId = data[i].id
       }
+      obj.flag = data[i].flag || ''
       tmpArr.push(obj)
     }
     return tmpArr;

src/components/icss/AddDeptInfo.vue

@@ -9,7 +9,7 @@
                     <el-input v-model="form.name" placeholder="请输入科室名称" maxlength="30"></el-input>
                 </el-form-item>
                 <el-form-item label="描述：" prop="remark">
-                    <el-input type="textarea" :rows="3" placeholder="请输入科室描述" v-model="form.remark" maxlength="1024"></el-input>
+                    <el-input type="textarea" :rows="3" placeholder="请输入科室描述" v-model="form.remark" maxlength="100"></el-input>
                 </el-form-item>
                 <el-button size="small" type="primary" @click="addOrga">{{text}}</el-button>
             </el-form>
@@ -69,6 +69,13 @@
       addOrga() {
         this.$refs.form.validate((valid)=> {
           if (valid) {
+            if(!this.form.name.trim()){
+              this.$message({
+                message: '科室名称不能为空',
+                type: 'warning'
+              });
+              return
+            }
             // 有id是修改，没有id是添加
             if(this.id){
               let param = {

src/components/icss/AddIndeptLabel.vue

@@ -13,7 +13,7 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2"> <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 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

src/components/icss/AddMedicalName.vue

@@ -136,11 +136,14 @@ import api from '@api/icss.js';
           type:this.data.type
         }
         api.getMedicalDetail(params).then((res)=>{
-          const result = res.data;console.log(999,result);
+          const result = res.data;
           if(result.code == 0){
             this.synonymous = result.data.medicalInfo;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -154,7 +157,10 @@ import api from '@api/icss.js';
           if(data.code==0){
             this.typeList = data.data.records;
           }else{
-            console.log(res.msg);
+            this.$message({
+              message:data.msg,
+              type:'warning'
+            });
           }
         }).catch((error) => {
           console.log(error);

src/components/icss/AddVersion.vue

@@ -77,7 +77,10 @@
           if(result.code==0){
             this.list = result.data;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -92,7 +95,10 @@
               })
               this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }else{//添加
@@ -104,7 +110,10 @@
               })
               this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }

src/components/icss/CommonTemplate.vue

@@ -37,7 +37,7 @@
         ></span></p>
     </div>
     <div class="bottomPartRight bottomPartRightTemplate">
-      <p class="poolTitle">模板内容：</p>
+      <p class="poolTitle poolTitleTmp">模板内容：</p>
       <div class="arrowWrap" style="float:right;marginRight:10px" v-if="type != 1 && type != 2 && type != 3">
         <i class="el-icon-arrow-left arrowWrapPub" @click="moveTag(0)"></i>
         <i class="el-icon-arrow-right arrowWrapPub" @click="moveTag(1)"></i>
@@ -66,12 +66,16 @@
               <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>
+              <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 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>
+        
       </div>
       <ul class="tagList operationPool templateTagLists">
         <li
@@ -88,17 +92,18 @@
                 @change="updataData"
               >
               </el-input>
+              <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i>
           </div>
           <p
             v-if="item.type === 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}}</p>
+          >{{item.tagName}} <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i></p>
           <p
             v-if="item.type !== 'input' && item.type !== 'sub'"
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
-          >{{item.tagName}} </p>
+          >{{item.tagName}} <i class="tagFlag">{{item.flag?(item.flag == 3?2:item.flag == 4?3:1):''}}</i></p>
         </li>
       </ul>
     </div>
@@ -205,6 +210,18 @@ export default {
     updataData(){
       this.$emit('changeActionData', this.rightTagsList, false);
     },
+    addFlg(idx){
+      let selectTagFlg = this.selectRightTagsListIndex;
+      let tmpSelectRightTagsList = this.selectRightTagsList;
+      if(selectTagFlg.length == 0 || (tmpSelectRightTagsList && tmpSelectRightTagsList.length>0 && tmpSelectRightTagsList[0].type == 'input')){
+        return;
+      }
+      let tmpLis = this.rightTagsList.slice()
+      let tmpObj = tmpLis[selectTagFlg[0]];
+      tmpObj.flag = idx
+      this.rightTagsList = [...tmpLis]
+
+    },
     addDomTemplate(sign,dom){
       let tmpArr1 = this.rightTagsList.slice(0);
       let tmpArr2 = this.selectRightTagsListIndex.slice(0);
@@ -359,6 +376,7 @@ 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') {
@@ -395,6 +413,9 @@ export default {
     margin-bottom: 20px;
     display: inline-block;
   }
+  .poolTitleTmp {
+    margin-bottom: 8px;
+  }
   .inputBox {
     width: 100px;
   }
@@ -422,6 +443,18 @@ export default {
   .tagName {
     line-height: 30px;
   }
+  .tagFlag {
+    position: absolute;
+    right: -3px;
+    top: 0;
+    width: 16px;
+    height: 16px;
+    border-radius: 8px;
+    line-height: 16px;
+    text-align: center;
+    // background-color: #ccc;
+    color: red;
+  }
   .tagName:before {
     content: "[";
   }
@@ -463,15 +496,21 @@ export default {
           background: #fff;
           line-height: 23px;
           border-radius: 3px;
-          margin-left: 10px;
+          margin:0 7px 10px 5px;
         }
       }
     .formWrap {
       position: relative;
       height: 30px;
       .subTemplate {
-        width: 470px;
+        width: 100%;
         float: left;
+        .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+          margin-bottom: 0;
+        }
+        .el-button+.el-button{
+          margin: 0 0 10px 10px;
+        }
       }
     }
   }
@@ -492,6 +531,7 @@ export default {
     text-align: center;
     float: left;
     height: 40px;
+    position: relative;
     p {
       padding: 5px 0;
     }

src/components/icss/DeptInfo.vue

@@ -24,7 +24,7 @@
                         width="60">
                 </el-table-column>
                 <el-table-column
-                        prop="gmtCreate"
+                        prop="gmtModified"
                         label="操作时间"
                         :show-overflow-tooltip="true">
                 </el-table-column>

src/components/icss/MedicalInfo.vue

@@ -222,7 +222,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();

src/components/icss/MedicalName.vue

@@ -227,7 +227,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();

src/components/icss/MedicalRelation.vue

@@ -239,7 +239,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();*/

src/components/icss/PubTagGroup.vue

@@ -371,7 +371,7 @@ export default {
       if(this.form.region3.trim() == ''){ return }
       let param = {
         "existName": this.form.region3,     
-        "type": this.form.region1,
+        "type": this.form.region1,  
         "notTagType":[8,10],        //去掉文字标签查重
       }
       api.validateSystomName(param).then((res) => {

src/components/icss/PubTagPartDetail.vue

@@ -37,7 +37,7 @@
           v-if="choose == 'single'"
         >
           <template v-for="item in poolDetailList[0]">
-            <!-- <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span> -->
+            <span class="hzx ellipsis" v-for="part in item.questionDetailList" :title="'[ '+item.name+' ]'" :key="part.id">{{part.name}}</span>
           </template>
         </div>
         <div
@@ -46,7 +46,7 @@
           @click="selectPart(0)"
           v-else
         >
-          <!-- <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span> -->
+          <span class="hzx ellipsis" v-for="item in poolDetailList[0][0].questionDetailList" :title="'[ '+item.name+' ]'" v-show="choose == 'multiple'" :key="item.id">{{item.name}}</span>
         </div>
         <div class="onlyBottom pubList">
           <ul class="clearfix">
@@ -545,9 +545,7 @@ export default {
                         });
                         return;
                       }else if(tmpArr[0].questionDetailList && tmpArr[0].questionDetailList.length > 0){
-                        if(tmpArr[0].questionDetailList[0].code == 0){
-                          this.poolDetailList[idx] = tmpArr;
-                        }else if(!tmpArr[0].questionDetailList[0].code){
+                        if(!tmpArr[0].questionDetailList[0].code){
                           this.$message({
                             showClose: true,
                             message: '添加的数据有误',

src/components/icss/PubTemplateGroup.vue

@@ -11,7 +11,7 @@
         label="选择归属："
         prop="region1"
       >
-        <span class="changeTips">改变归属后，模板明细将会恢复到默认状态</span>
+        <span class="changeTips">改变归属后，模板内容将会恢复到默认状态</span>
         <el-select
           :disabled="!!editData.id"
           v-model="form.region1"

src/components/icss/SimilarName.vue

@@ -212,7 +212,6 @@
         e.preventDefault();
         let formData = new FormData();
         formData.append('uploadfile', fileInfo);
-        // console.log(123,fileInfo,formData);
         const header = {
           headers:{
             'Content-Type': 'multipart/form-data'
@@ -225,7 +224,6 @@
               type: 'success',
             });
           }else{
-            // this.$message.error(res.data.msg);
             this.$message({
               dangerouslyUseHTMLString: true,
               message:res.data.msg,

src/components/icss/SingleSelect.vue

@@ -6,10 +6,10 @@
                     <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 2 || type == 11) " :label="i" :disabled="hasNone==i||hasBan==i|| hasError==i || (hasDefault!=-1&&hasDefault!=i)||focusOn==-1">默认选中</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="2+i" v-model="rows[i].isNone" @change="emitValues(i,'hasNone',rows[i].isNone)">
-                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasBan==i || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
+                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isBan || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="3+i" v-model="rows[i].isBan" @change="emitValues(i,'hasBan',rows[i].isBan)">
-                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasNone==i || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
+                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isNone || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <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>

src/components/icss/VersionDesc.vue

@@ -108,7 +108,10 @@
           if(result.code==0){
             this.list = result.data;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -143,7 +146,10 @@
               })
               this.getList();
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }else if(this.showDesc){//明细
@@ -166,7 +172,10 @@
               })
               this.getList();
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }

vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:88';
+const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.115:5050';