Merge remote-tracking branch 'origin/dev5.3.4' into test

src/components/preTreat/PubIndeptQa.vue

@@ -85,7 +85,7 @@
                             @click="pushSystemName(item.name)">{{item.name}}</li>
                     </ul>
                 </div>
-                <span class="changeTips changeTipsName">
+                <span class="changeTips changeTipsName" v-if="qaType !=='1'">
                     当为症状时，填写单系统名称需要与医学标准术语内容相对应，如果没有可以先在医学标准术语中建立相关信息！未建立相关信息可能会影响系统使用！
                 </span>
             </el-form-item>
@@ -462,6 +462,7 @@
           this.labelTypes = this.labelTypesList.filter(item => maps[this.form.region1].includes(item.val));
         }
         //if(type === 2||type === 3) {
+        this.form.flag = '';
           this.sendData();
         //}
       },

src/components/preTreat/PubSelect.vue

@@ -122,7 +122,7 @@
     .main-area{
         width: 80%;
         min-width: 400px;
-        margin:20px 150px 20px 20px;
+        margin:20px 150px 20px 140px;
         &.sigle-row{
              width: 60%;
              margin:20px 150px 20px 30%;