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

This commit is contained in:
aixianling
2022-03-28 16:49:02 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -82,7 +82,7 @@
<span v-if="info.status === '0' && checkType === '1'">疑似风险</span> <span v-if="info.status === '0' && checkType === '1'">疑似风险</span>
<span v-if="info.status !== '2' && checkType === '2'">纳入监测</span> --> <span v-if="info.status !== '2' && checkType === '2'">纳入监测</span> -->
</el-form-item> </el-form-item>
<el-form-item label="备注说明" prop="opinion" style="width: 100%;" :rules="[{ required: form.operation === '2' ? true : false, message: '请输入备注说明' }]"> <el-form-item label="备注说明" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入备注说明' }]">
<el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入备注说明" show-word-limit></el-input> <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入备注说明" show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="照片" prop="files" style="width: 100%;"> <el-form-item label="照片" prop="files" style="width: 100%;">

View File

@@ -7,7 +7,7 @@
<ai-search-bar> <ai-search-bar>
<template #left> <template #left>
<ai-select <ai-select
v-model="search.fpRiskType" v-model="search.riskType"
clearable clearable
placeholder="请选择风险类型" placeholder="请选择风险类型"
:selectList="dict.getDict('fpRiskType')" :selectList="dict.getDict('fpRiskType')"
@@ -71,7 +71,7 @@
size: 10, size: 10,
name: '', name: '',
areaId: '', areaId: '',
fpRiskType: '', riskType: '',
status: '' status: ''
}, },
chooseList: [], chooseList: [],