WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liyawei
2022-08-12 16:39:05 +08:00
parent a7ae7423f5 c3a50706d1
commit 41f0e96957
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue
+1 -1
View File
@@ -50,9 +50,9 @@
<a-select :placeholder="$t('PleaseSelect')+$t('ParentName')" <a-select :placeholder="$t('PleaseSelect')+$t('ParentName')"
class="box-input" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:popper-append-to-body="false"
allowClear allowClear
:disabled="isParentId" :disabled="isParentId"
style='z-index: 99'
v-model="formInline.parentId"> v-model="formInline.parentId">
<a-select-option v-for="(item, key) in ParentList" <a-select-option v-for="(item, key) in ParentList"
:key="item.id" :key="item.id"
jero-web/src/views/externalReports/index.vue
+5 -1
View File
@@ -191,7 +191,11 @@
:title="$t('Foldername')">{{$t('Foldername')}}</span> :title="$t('Foldername')">{{$t('Foldername')}}</span>
</div> </div>
<a-form-model-item prop="folderName" style='width: 72%'> <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> </a-form-model-item>
</div> </div>
</a-col> </a-col>