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

This commit is contained in:
宋伟佳
2022-04-07 16:45:07 +08:00
2 changed files with 2 additions and 1 deletions
@@ -1636,7 +1636,7 @@
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatusText')"
clearable>
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}