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

This commit is contained in:
zhutianqi
2021-12-08 16:55:11 +08:00
@@ -14,12 +14,12 @@
placeholder="标准/政策名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="类型" class="search-item search-item-last">
<el-select v-model="sarProject.position" placeholder="请选择标准性质">
<el-option value="1" label="国内"></el-option>
<el-option value="2" label="海外"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="类型" class="search-item search-item-last">-->
<!-- <el-select v-model="sarProject.position" placeholder="请选择标准性质">-->
<!-- <el-option value="1" label="国内"></el-option>-->
<!-- <el-option value="2" label="海外"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
</el-form-item>