Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
<el-row type="flex">
|
<el-row type="flex">
|
||||||
<el-col :span="20">
|
<el-col :span="20">
|
||||||
<el-form-item label="处罚决定日期" prop="sanctionDate">
|
<el-form-item label="处罚决定日期" prop="sanctionDate">
|
||||||
<el-date-picker v-model="forms.sanctionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:3px">
|
<el-date-picker v-model="forms.sanctionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:337px">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-form-item label="所在地区" prop="areaId">
|
<el-form-item label="所在地区" prop="areaId">
|
||||||
<ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
|
<ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-row type="flex">
|
<el-row type="flex">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
@@ -180,7 +180,7 @@ export default {
|
|||||||
{min: 18, message: '请输入18位统一社会信用代码', trigger: 'blur'}],
|
{min: 18, message: '请输入18位统一社会信用代码', trigger: 'blur'}],
|
||||||
areaId: [
|
areaId: [
|
||||||
{required: true, message: '请选择所在地区', trigger: 'blur'},
|
{required: true, message: '请选择所在地区', trigger: 'blur'},
|
||||||
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
|
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
|
||||||
],
|
],
|
||||||
stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
|
stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
|
||||||
fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
|
fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
|
<el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="所在地区" prop="areaId">
|
<el-form-item label="所在地区" prop="areaId">
|
||||||
<ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
|
<ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-row type="flex">
|
<el-row type="flex">
|
||||||
<el-col :span="20">
|
<el-col :span="20">
|
||||||
@@ -136,7 +136,7 @@ export default {
|
|||||||
useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
|
useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
|
||||||
areaId: [
|
areaId: [
|
||||||
{required: true, message: '请选择所在地区', trigger: 'blur'},
|
{required: true, message: '请选择所在地区', trigger: 'blur'},
|
||||||
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
|
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
|
||||||
],
|
],
|
||||||
usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
|
usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
|
||||||
houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
|
houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
|
||||||
|
|||||||
Reference in New Issue
Block a user