This commit is contained in:
dhr
2025-09-06 18:51:05 +08:00
parent fff6fb5584
commit 4fa4c754f9
5 changed files with 555 additions and 67 deletions

View File

@ -10,7 +10,7 @@
<el-form-item label="地块名称" prop="landName">
<el-input v-model="queryParams.landName" placeholder="请输入地块名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="所属村委会" prop="villageCommittee">
<!-- <el-form-item label="所属村委会" prop="villageCommittee">
<el-input v-model="queryParams.villageCommittee" placeholder="请输入所属村委会" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="设计面积(亩)" prop="designArea">
@ -21,7 +21,7 @@
</el-form-item>
<el-form-item label="农户数(户)" prop="farmerCount">
<el-input v-model="queryParams.farmerCount" type="number" placeholder="请输入农户数" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>

View File

@ -667,16 +667,20 @@ const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>
},
rules: {
projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
landBlockId: [{ required: true, message: '请选择对应地块', trigger: 'change' }],
landType: [{ required: true, message: '土地类型不能为空', trigger: 'change' }],
transferStatus: [{ required: true, message: '请选择流转台账状态', trigger: 'change' }],
designArea: [{ required: true, message: '请输入设计面积', trigger: 'blur' }],
responsiblePerson: [{ required: true, message: '请输责任人', trigger: 'blur' }],
expectedFinishDate: [{ required: true, message: '请选择预计完成时间', trigger: 'change' }],
transferRatio: [
// 动态校验:仅已流转状态下必填
{
required: true,
message: '流转比例不能为空',
trigger: ['blur', 'change'],
validator: (rule, value, callback) => {
if (data.form.transferStatus !== '1') {
callback(); // 非已流转状态跳过校验
callback();
return;
}
if (value === undefined || value === null || value === '') {
@ -686,7 +690,6 @@ const data = reactive<PageData<LandTransferLedgerForm, LandTransferLedgerQuery>>
}
}
},
// 比例范围校验0-100
{
validator: (rule, value, callback) => {
if (value < 0 || value > 100) {
@ -746,6 +749,7 @@ const sonSummaryInfo = computed(() => {
const lastSelectedParent = ref<LandTransferLedgerVO | null>(null);
const sonRules = {
projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
parentId: [{ required: true, message: '父级ID不能为空', trigger: 'blur' }],
landType: [{ required: true, message: '土地类型不能为空', trigger: 'change' }],
transferRatio: [
{