Luolei 6 سال پیش
والد
کامیت
50de039e32

+ 1 - 1
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]},    //化验组合

+ 7 - 5
src/components/icss/CommonTemplate.vue

@@ -66,9 +66,9 @@
               <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" @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>
@@ -211,8 +211,9 @@ export default {
       this.$emit('changeActionData', this.rightTagsList, false);
     },
     addFlg(idx){
-      let selectTagFlg = this.selectRightTagsListIndex
-      if(selectTagFlg.length == 0){
+      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()
@@ -375,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') {

+ 1 - 3
src/components/icss/PubTagPartDetail.vue

@@ -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: '添加的数据有误',

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