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

This commit is contained in:
super_liu
2022-05-23 14:02:46 +08:00
13 changed files with 252 additions and 188 deletions
@@ -1990,9 +1990,9 @@
clearable :maxlength="100"></el-input>
</el-form-item>
<!-- 部分代替标准号-->
<el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></el-input>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></el-input>-->
<!-- </el-form-item>-->
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>