Merge remote-tracking branch 'origin/master'

This commit is contained in:
liyawei
2022-03-22 15:22:29 +08:00
2 changed files with 2 additions and 2 deletions
@@ -81,11 +81,11 @@
<a-date-picker class="box-input" <a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+item.db_field_txt" :placeholder="$t('PleaseSelect')+item.db_field_txt"
@change="dateChange(item)" @change="dateChange(item)"
:disabledDate="disabledDate"
format="YYYY-MM-DD" format="YYYY-MM-DD"
v-model="formInline[item.db_field_name]" v-model="formInline[item.db_field_name]"
:disabled="disabled" :disabled="disabled"
style="width: 100%"/> style="width: 100%"/>
<!-- :disabledDate="disabledDate"-->
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
+1 -1
View File
@@ -19,7 +19,7 @@
props: { props: {
title: { title: {
type: String, type: String,
default: 'GPR', default: 'GRP',
required: false required: false
}, },
showTitle: { showTitle: {