Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue

@@ -50,9 +50,9 @@
                 <a-select :placeholder="$t('PleaseSelect')+$t('ParentName')"
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          :popper-append-to-body="false"
                           allowClear
                           :disabled="isParentId"
-                          style='z-index: 99'
                           v-model="formInline.parentId">
                   <a-select-option v-for="(item, key) in ParentList"
                                    :key="item.id"

jero-web/src/views/externalReports/index.vue

@@ -191,7 +191,11 @@
                               :title="$t('Foldername')">{{$t('Foldername')}}</span>
                       </div>
                       <a-form-model-item prop="folderName" style='width: 72%'>
-                        <a-input v-model.trim="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
+                        <a-input
+                          v-model.trim="form.folderName"
+                          :min="1" :max="100" style='width: 130%'
+                          class="box-input add-input"
+                          :placeholder="$t('PleaseEnter')+$t('Foldername')" />
                       </a-form-model-item>
                     </div>
                   </a-col>