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

This commit is contained in:
super_liu
2021-12-21 15:22:52 +08:00
@@ -1159,19 +1159,19 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-form-item label="中文名称" prop="standName" class="search-item" > <el-form-item label="标准名称" prop="standName" class="search-item" >
<el-input v-model="standardSearchForm.standName" <el-input v-model="standardSearchForm.standName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
:maxlength="500"></el-input> :maxlength="500"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="search-item"> <!-- <el-form-item label="英文名称" prop="standEnName" class="search-item">-->
<el-input <!-- <el-input-->
v-model="standardSearchForm.standEnName" <!-- v-model="standardSearchForm.standEnName"-->
maxlength="1000" <!-- maxlength="1000"-->
placeholder="请输入英文名称" <!-- placeholder="请输入英文名称"-->
clearable></el-input> <!-- clearable></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"