kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2022-04-08 17:59:00 +08:00
parent 999e1c895e ecb6a02a46
commit 3d6b1c9b7c
5 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/xiushan/apps/AppGroupShareholders/components/Add.vue
View File

@@ -27,7 +27,7 @@
</el-col>
</el-row>
<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"></ai-area-select>
<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>
</el-form-item>
<el-row type="flex">
<el-col :span="12">
@@ -180,8 +180,8 @@ export default {
{min: 18, message: '请输入18位统一社会信用代码', trigger: 'blur'}],
areaId: [
{required: true, message: '请选择所在地区', trigger: 'blur'},
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
],
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
],
stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
}

15
project/xiushan/apps/AppHouseManagement/components/Add.vue
View File

@@ -16,7 +16,7 @@
<el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
</el-form-item>
<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"></ai-area-select>
<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>
</el-form-item>
<el-row type="flex">
<el-col :span="20">
@@ -135,13 +135,12 @@ export default {
return {
useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
areaId: [
// {required: true, message: '所在地区必须选择到村', trigger: 'blur'}
{required: true, message: '请选择所在地区', trigger: 'blur'},
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
{pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村',trigger: 'blur'}
],
usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
{pattern: /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/, message: '请输入正整数',trigger: 'blur'}],
{pattern: /^[1-9]\d*$/, message: '请输入正整数',trigger: 'blur'}],
idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}],
landOwnership: [{required: true, message: '请输入土地所有权', trigger: 'blur'}],
landArea: [{required: true, message: '请输入土地面积', trigger: 'blur'}],
@@ -202,5 +201,13 @@ export default {
::v-deep .ai-detail .ai-detail__footer {
background: #FFF;
}
::v-deep input::-webkit-outer-spin-button,
::v-deep input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
::v-deep input[type='number'] {
-moz-appearance: textfield !important;
}
}
</style>

13
project/xiushan/apps/AppLandTransfer/components/Add.vue
View File

@@ -55,7 +55,7 @@
</el-form-item>
</el-col>
<el-col :span="20">
<el-form-item label="每亩年租金" prop="yearRent">
<el-form-item label="每亩年租金(元)" prop="yearRent">
<el-input v-model="form.yearRent" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
@@ -106,14 +106,15 @@
<ai-info-item label="土地流出方" :value="data.landOutflowName" ></ai-info-item>
<ai-info-item label="土地流出方证件号码" :value="data.landOutflowNumber"></ai-info-item>
<ai-info-item label="土地承接方" :value="data.landUndertakeName"></ai-info-item>
<ai-info-item label="土地承接方证件号码" :value="data.landUndertakeNumber"></ai-info-item>
<ai-info-item label="土地承接方证件号码" :value="data.contractNo"></ai-info-item>
<ai-info-item label="合同编号" :value="data.landUndertakeNumber"></ai-info-item>
<ai-info-item label="流转形式">{{ $dict.getLabel('landCirculateType',data.circulateType) }}</ai-info-item>
<ai-info-item label="土地面积" :value="data.landArea"></ai-info-item>
<ai-info-item label="每亩年租金" :value="data.yearRent"></ai-info-item>
<ai-info-item label="土地面积/㎡" :value="data.landArea"></ai-info-item>
<ai-info-item label="每亩年租金(元)" :value="data.yearRent"></ai-info-item>
<ai-info-item label="开始日期" :value="data.startDate"></ai-info-item>
<ai-info-item label="截止日期" :value="data.endDate"></ai-info-item>
<ai-info-item label="土地信息" :value="data.landInfo"></ai-info-item>
<ai-info-item label="土地用途" :value="data.landUse"></ai-info-item>
<ai-info-item label="土地信息" :value="data.landInfo" isLine></ai-info-item>
<ai-info-item label="土地用途" :value="data.landUse" isLine></ai-info-item>
</ai-wrapper>
</template>
</ai-card>

2
project/xiushan/apps/AppLandTransfer/components/List.vue
View File

@@ -6,7 +6,7 @@
<ai-search-bar>
<template #left>
<el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
<ai-select v-model="circulateType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('landCirculateType')"></ai-select>
<ai-select v-model="select.circulateType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('landCirculateType')"></ai-select>
</template>
<template #right>
<el-input size="small" placeholder="查询合同编号/流出方/承接方/证件号码" v-model="search.contractNo" clearable @clear="page.current = 1, search.contractNo = '',getTableData()"