Merge remote-tracking branch 'origin/bugfix' into test

src/api/config.js

@@ -1,5 +1,5 @@
-// const testUrl = 'http://223.93.170.82:23650'
-const testUrl = ''
+const testUrl = 'http://223.93.170.82:23650'
+// const testUrl = ''
 
 export default {
   host:'http://192.168.2.241:5050',

src/components/preTreat/AddSimpleQuestion.vue

@@ -24,6 +24,7 @@
                     :sexType="dataPub.region7"
                     :type="dataPub.region2"
                     @pushValues="pushValues"
+                    :hasId="editData.id||''"
                     :options="editData.questionDetailList"></PubSelect>
             <div class="btn">
                 <el-button

src/components/preTreat/PubSelect.vue

@@ -255,7 +255,7 @@ import Vue from "vue";
 const initRow = { orderNo: 0, name: "", description: "", exclusion: 0 };
 const initRows = utils.getInitRow(initRow, 4);
 export default {
-  props: ["type", "options", "ascription", "sexType"],
+  props: ["type", "options", "ascription", "sexType","hasId"],
   data() {
     return {
       rows: [...initRows],
@@ -380,12 +380,15 @@ export default {
           ids=ids.concat(it.subQuestion.split(','))
         }
       });
+      if(this.hasId!=''){
+        ids.push(this.hasId)
+      }
       let param = {
         tagName: this.searchVal.trim(),
         type: this.ascription,
         notIds: ids,
         noSubQuestion:1,
-        notControlType: ['8'], //组合填写单或非诊疗情况模版不能添加图片上传
+        notControlType: ['8','4'], //组合填写单或非诊疗情况模版不能添加图片上传
         sexType: this.sexType,
         tagType: ["1"] //qaType=2:组合填写单，qaType=3模板
       };
@@ -401,6 +404,16 @@ export default {
       this.rows = [...utils.getInitRow(initRow, 4)];
     },
     addRow() {
+      if(this.type == 3){
+        if(this.rows.length>5){
+          this.$message({
+            message: "多列填写类型最多添加6个选项",
+            type: "warning",
+            showClose: true
+          });
+          return
+        }
+      }
       this.rows.push(Object.assign({}, initRow, { orderNo: this.rows.length }));
     },
     selectRow(index, name) {

src/components/preTreat/QuestionTagGroup.vue

@@ -276,7 +276,6 @@ export default {
               return ;
             }
             this.rightTagsList.push(...this.selectLeftTagsList);
-
             for (let i = 0; i < this.rightTagsList.length; i++) {
                 this.leftTagsList = this.leftTagsList.filter(item => item.id !== this.rightTagsList[i].id)
             }

src/components/preTreat/SimpleQuestion.vue

@@ -163,7 +163,7 @@
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[2];
-            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0&&item.val != 6&&item.val != 7)  //去掉名称为默认值的填写单类型
 
           }