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

This commit is contained in:
super_liu
2021-12-29 15:04:34 +08:00
6 changed files with 273 additions and 6 deletions
@@ -1672,7 +1672,7 @@
<custom-select-array
style="margin-left: -14px"
:config="applyArcticOptions"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
@@ -2305,6 +2305,7 @@ export default {
standNature: '',//标准性质
textStatus: '',//文本状态
synopsis: '', // 内容摘要
CLLX: '' // 适用车型
}, // 分页查询过程中用到的对象
@@ -619,7 +619,7 @@
<custom-select-array
:config="applyArcticOptions"
style="margin-left: -14px"
v-model="sarStandardsSearch['applyArctic']"
v-model="sarStandardsSearch['CLLX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@@ -1850,7 +1850,8 @@ export default {
standState: '',
standNature: '',//标准性质
synopsis: '', // 内容摘要
textStatus: ''//文本状态
textStatus: '',//文本状态
CLLX: ''
},
//高级搜索映射
advanceSearchMapping: {