Merge remote-tracking branch 'origin/dev2/luolei' into dev

# Conflicts:
#	src/api/config.js

src/api/config.js

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

src/api/utils.js

@@ -219,8 +219,6 @@ export default {
       }else if(data[i].type == 'input'){     //这个是输入框文字
         if(data[i].text){   //去掉空输入框
           obj.text = data[i].text
-        }else{
-          return;
         }
       }else{    //这个是标签
         obj.questionId = data[i].id

src/components/icss/CommonTemplate.vue

@@ -149,7 +149,6 @@ export default {
   },
   mounted() {
     this.$nextTick(()=>{
-      if(this.type){this.searchTagList()}
       if(this.options.id){
         if(this.options && this.options.data && this.options.data.length>0){
           let reviewList = this.options.data
@@ -170,17 +169,18 @@ export default {
             }
           }
           this.rightTagsList = reviewList
-          console.log(reviewList,'xiugai')
         }
         this.$emit('changeActionData', this.rightTagsList, false);
         this.getSubTemplate()
       }else{
         this.getSubTemplate()
       }
+      this.searchTagList()
     })
   },
   watch: {
     type(newVal, preVal) {
+      this.searchTagList()       //重新获取标签池数据
       if(newVal != preVal){
         this.form = {region: ''}  
         this.subTmpList = []     //子模板的id用于去重
@@ -191,7 +191,6 @@ export default {
         this.selectRightTagsListIndex = []
         this.searchVal = ''
         this.getSubTemplate()      //重新获取子模板
-        this.searchTagList()       //重新获取标签池数据
       }
     },
     searchVal(newVal, preVal) {
@@ -327,7 +326,7 @@ export default {
       return this.isHasTag(item, this.selectRightTagsList)
     },
     toLeftList() {
-      if (this.selectRightTagsList.length>0 && this.selectRightTagsList[0].type !== 'sub' && this.selectRightTagsList[0].type !== 'input') {    //往左的是子模板不变或者输入框，是输入框或者标签就删除
+      if (this.selectRightTagsList.length>0 && this.selectRightTagsList[0].type !== 'sub') {    //往左的是子模板不变或者输入框，是输入框或者标签就删除
         for (let i = 0; i < this.selectRightTagsList.length; i++) {
           this.rightTagsList = this.rightTagsList.filter(item => item.id !== this.selectRightTagsList[0].id)
         }
@@ -350,12 +349,15 @@ export default {
     },
     searchTagList() {
       let notIds = []
-      for (let i = 0; i < this.rightTagsList.length; i++) {
-          notIds.push(this.rightTagsList[i].id)
+      let tmpArr = this.rightTagsList.slice();
+      for (let i = 0; i < tmpArr.length; i++) {
+        if(tmpArr[i].type != 'sub' && tmpArr[i].type != 'input'){
+          notIds.push(tmpArr[i].id)
+        }
       }
       let param = {
         "tagName": this.searchVal,
-        "type": 1,
+        "type": this.type == 4?3:1,
         "noIds": notIds,
       }
       api.getQuestionInfos(param).then((res) => {
@@ -372,7 +374,6 @@ export default {
       }
       api.getModuleInfoSub(param).then((res) => {
         if (res.data.code === '0') {
-          console.log(res.data.data)
           this.Adscriptions = res.data.data
         }
       })

src/components/icss/PubTagPartDetail.vue

@@ -128,6 +128,10 @@ export default {
         type: Array
     }
   },
+
+  destroyed:function(){
+    this.searchVal = ''
+  },
   data() {
     return {
       poolDetailList: [[],[],[],[],[],[]],     //默认6个部分
@@ -417,9 +421,7 @@ export default {
     getRightListDes(){
       let idStr = this.currentLis.join(',');
       let param = {
-        // "age": 0,
         "ids": idStr,
-        // "sexType": 3
       }
       api.detailsTagList(param).then((res) => {        //右侧展开内容
         if (res.data.code === '0') {

src/components/icss/TemplateMaintenance.vue

@@ -43,7 +43,7 @@
                 </el-table-column>
                 <el-table-column
                         :resizable = "false"
-                        prop="modifier"
+                        prop="userName"
                         label="操作人">
                 </el-table-column>
                 <el-table-column

src/components/icss/TemplateMaintenanceWrap.vue

@@ -44,7 +44,7 @@ export default {
       txt:'模板维护--添加模板',
       dataPub: {},                    //公用组件传的值都在这
       editData:{},                    //编辑数据
-      sendIds: [[], [], [], [], [], []],           //标签明细右侧操作数据
+      sendIds: [],           //标签明细右侧操作数据
     }
   },
   beforeMount:function(){
@@ -69,21 +69,23 @@ export default {
     validatePass() {      //验证成功回调，调取接口
       //仍需验证标签明细是否选择
       let type = this.dataPub.region1,name=this.dataPub.region2;
-      if (JSON.stringify(this.sendIds) == '[]') {
+      let detailLis = utils.orderTemplateData(this.sendIds)
+      console.log(detailLis)
+      if (JSON.stringify(this.sendIds) == '[]' || !detailLis) {
         this.$message({
-          message: '请选择标签明细',
+          message: '请选择模板内容',
           type: 'warning'
         });
         return;
       }
-      let detailLis = utils.orderTemplateData(this.sendIds)
       let param = {
         "modelDetils": detailLis,
         "name": name,
         "type": type,
+        "textType": type,
         "id":this.editData.id || ''
       }
-      console.log(param,'保存模板的参数')
+      // console.log(param,'保存模板的参数')
       this.showDelDialog(param)
     },
     showDelDialog(param) {