From 0366835b1d0c62068e2e7d8545746594dc5b988a Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 11 四月 2025 16:15:09 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle
---
src/views/placement-batch/components/ApprovalDialog.vue | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/views/placement-batch/components/ApprovalDialog.vue b/src/views/placement-batch/components/ApprovalDialog.vue
index 11e42a8..54cff64 100644
--- a/src/views/placement-batch/components/ApprovalDialog.vue
+++ b/src/views/placement-batch/components/ApprovalDialog.vue
@@ -28,7 +28,7 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="idCard" label="身份证号" key="table_A" min-width="180" align="center">
+ <el-table-column prop="idCard" label="身份证号" key="table_A" min-width="180" align="center">
<template slot-scope="scope">
{{ scope.row.idCard || "-" }}
<el-tooltip v-if="scope.row.idCardWarn == 1" class="item" effect="dark" content="身份信息不存在于待安置人员库"
@@ -38,7 +38,7 @@
</el-tooltip>
</template>
</el-table-column>
- <el-table-column prop="resettledNum" key="table_A" label="应安置人数（人）" min-width="140" align="center" />
+ <el-table-column prop="resettledNum" key="table_A" label="应安置人数（人）" min-width="140" align="center" />
<el-table-column label="所有家庭人员应安置面积（㎡）" key="table_A" prop="resettledArea" min-width="160" align="center">
<template slot-scope="scope">
<span>{{ scope.row.resettledArea }}
@@ -49,7 +49,8 @@
</template>
</el-table-column>
<el-table-column label="补偿单位标准（万元）" key="table_A" min-width="160" align="center">
- <el-table-column prop="priceNewAmount" key="table_A" label="新建商品住房、商业用房、停车位" min-width="160" align="center">
+ <el-table-column prop="priceNewAmount" key="table_A" label="新建商品住房、商业用房、停车位" min-width="160"
+ align="center">
<template slot-scope="scope">
<span>{{ scope.row.priceNewAmount }}
<el-tooltip v-if="scope.row.priceAmountWarn == 1" class="item" effect="dark" content="补充标准数据异常"
@@ -77,9 +78,20 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="downPaymentAmount" key="table_A" label="25%首付款（㎡）" min-width="150" align="center" />
- <el-table-column prop="quarterPayAmount" key="table_A" v-if="activeTab == '1'" label="每季度需支付款项（万元）" min-width="180"
- align="center">
+ <el-table-column prop="downPaymentAmount" key="table_A" label="25%首付款（㎡）" min-width="150" align="center" >
+ <template slot-scope="scope">
+ <span>{{ scope.row.downPaymentAmount }}</span>
+ <el-tooltip v-if="scope.row.downPaymentAmountWarn == 1" placement="top">
+ <div slot="content">
+ {{ "首付款金额异常" }}
+ </div>
+ <el-image style="width: 12px; height: 12px;margin-left:5px"
+ :src="require('../../../assets/logo/warning.png')" fit="fit"></el-image>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ <el-table-column prop="quarterPayAmount" key="table_A" v-if="activeTab == '1'" label="每季度需支付款项（万元）"
+ min-width="180" align="center">
<template slot-scope="scope">
<span>{{ scope.row.quarterPayAmount }}
<el-tooltip v-if="scope.row.quarterPayAmountWarn == 1" class="item" effect="dark" content="季度款金额数据异常"
@@ -91,7 +103,7 @@
<el-table-column prop="subsidyAmount" key="table_A" label="过渡补贴（万元）" min-width="180" align="center">
<template slot-scope="scope">
<span>{{ scope.row.subsidyAmount }}
- <el-tooltip v-if="scope.row.subsidyAmount == 1" class="item" effect="dark" content="过渡补贴金额数据异常"
+ <el-tooltip v-if="scope.row.subsidyAmountWarn == 1" class="item" effect="dark" content="过渡补贴金额数据异常"
placement="top">
<el-image style="width: 12px; height: 12px; margin-left: 5px"
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
@@ -149,12 +161,14 @@
</el-table-column>
<el-table-column key="table_B" label="本次安置人数（人）" min-width="100" align="center">
- <el-table-column key="table_B" prop="currentCollectiveNum" label="集体经济组织成员" min-width="100" align="center">
+ <el-table-column key="table_B" prop="currentCollectiveNum" label="集体经济组织成员" min-width="100"
+ align="center">
<template slot-scope="scope">
{{ scope.row.currentCollectiveNum || '-' }}
</template>
</el-table-column>
- <el-table-column key="table_B" prop="currentNoCollectiveNum" label="非集体经济组织成员" min-width="100" align="center">
+ <el-table-column key="table_B" prop="currentNoCollectiveNum" label="非集体经济组织成员" min-width="100"
+ align="center">
<template slot-scope="scope">
{{ scope.row.currentNoCollectiveNum || '-' }}
</template>
@@ -174,6 +188,19 @@
</el-tooltip>
</template>
</el-table-column>
+
+ <el-table-column prop="orgArea" key="table_B" label="集体成员面积" align="center" width="150">
+ <template slot-scope="scope">
+ {{ scope.row.orgArea }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="noOrgArea" key="table_B" label="非集体成员面积" align="center" width="150">
+ <template slot-scope="scope">
+ {{ scope.row.noOrgArea }}
+ </template>
+ </el-table-column>
+
+
<el-table-column key="table_B" prop="waitFamilyArea" label="待安置人员应安置面积合计（㎡）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.waitFamilyArea }} <el-tooltip v-if="scope.row.waitFamilyAreaWarn == 1" class="item"
@@ -184,7 +211,8 @@
</template>
</el-table-column>
<el-table-column key="table_B" label="补偿金额（万元）" min-width="100" align="center">
- <el-table-column key="table_B" prop="compensationNewAmount" label="新建商品住房、商业用房、停车位" min-width="100" align="center">
+ <el-table-column key="table_B" prop="compensationNewAmount" label="新建商品住房、商业用房、停车位" min-width="100"
+ align="center">
<template slot-scope="scope">
<span>{{ scope.row.compensationNewAmount }} <el-tooltip v-if="scope.row.compensationAmountWarn == 1"
class="item" effect="dark" content="检测到多个购房情况请人工核对" placement="top">
@@ -211,6 +239,13 @@
<el-table-column key="table_B" prop="downPaymentAmount" label="25%首付款（万元）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.downPaymentAmount }}</span>
+ <el-tooltip v-if="scope.row.downPaymentAmountWarn == 1" placement="top">
+ <div slot="content">
+ {{ "首付款金额异常" }}
+ </div>
+ <el-image style="width: 12px; height: 12px;margin-left:5px"
+ :src="require('../../../assets/logo/warning.png')" fit="fit"></el-image>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column key="table_B" prop="quarterPayAmount" v-if="activeTab == '2'" label="每季度需支付款项（万元）"
@@ -341,7 +376,8 @@
<span>{{ scope.row.signTime }}</span>
</template>
</el-table-column>
- <el-table-column key="table_B" prop="compensationPayTime" label="25%补偿款及过渡补贴支付时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="compensationPayTime" label="25%补偿款及过渡补贴支付时间" min-width="100"
+ align="center">
<template slot-scope="scope">
<span>{{ scope.row.compensationPayTime }}</span>
</template>
@@ -598,13 +634,13 @@
this.getList();
},
tableRowClassName({ row, rowIndex }) {
- if (row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.priceAmountWarn == 1 || row.quarterPayAmountWarn == 1 || row.subsidyAmountWarn == 1 || row.twoPriceWarn == 1 || row.waitFamilyAreaWarn == 1) {
+ if (row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.priceAmountWarn == 1 || row.quarterPayAmountWarn == 1 || row.subsidyAmountWarn == 1 || row.twoPriceWarn == 1 || row.waitFamilyAreaWarn == 1 || row.downPaymentAmountWarn == 1) {
return 'warning-row'
}
return ''
},
tableRowClassName1({ row, rowIndex }) {
- if (row.areaWarn == 1 || row.compensationAmountWarn == 1 || row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.waitFamilyAreaWarn == 1 || row.waitFamilyNamesWarn == 1 || row.subsidyAmountWarn == 1 || row.quarterPayAmountWarn == 1) {
+ if (row.areaWarn == 1 || row.compensationAmountWarn == 1 || row.compensationSumWarn == 1 || row.householdHeadWarn == 1 || row.idCardWarn == 1 || row.waitFamilyAreaWarn == 1 || row.waitFamilyNamesWarn == 1 || row.subsidyAmountWarn == 1 || row.quarterPayAmountWarn == 1 || row.downPaymentAmountWarn) {
return 'warning-row'
}
return ''
--
Gitblit v1.7.1