From 85ff49fbfc98b043780d84436939e3ac3e153938 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期一, 07 四月 2025 09:12:01 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle
---
src/views/placement-batch/components/ApprovalDialog.vue | 130 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/src/views/placement-batch/components/ApprovalDialog.vue b/src/views/placement-batch/components/ApprovalDialog.vue
index 8c76e32..11e42a8 100644
--- a/src/views/placement-batch/components/ApprovalDialog.vue
+++ b/src/views/placement-batch/components/ApprovalDialog.vue
@@ -15,11 +15,11 @@
<!-- 表格区域 -->
<el-table v-loading="loading" :data="tableData" border style="width: 100%" max-height="300px"
:row-class-name="tableRowClassName">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="street" label="镇（街道）" min-width="120" align="center" />
- <el-table-column prop="projectName" label="拆迁项目名称" min-width="180" align="center" />
- <el-table-column prop="community" label="所在村（社区）" min-width="120" align="center" />
- <el-table-column prop="householdHead" label="户主姓名" min-width="100" align="center">
+ <el-table-column type="index" label="序号" key="table_A" width="50" align="center" />
+ <el-table-column prop="street" label="镇（街道）" key="table_A" min-width="120" align="center" />
+ <el-table-column prop="projectName" label="拆迁项目名称" key="table_A" min-width="180" align="center" />
+ <el-table-column prop="community" label="所在村（社区）" key="table_A" min-width="120" align="center" />
+ <el-table-column prop="householdHead" label="户主姓名" key="table_A" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.householdHead }}
<el-tooltip v-if="scope.row.householdHeadWarn == 1" class="item" effect="dark" content="用户信息未通过安置申请"
@@ -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="身份证号" 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,8 +38,8 @@
</el-tooltip>
</template>
</el-table-column>
- <el-table-column prop="resettledNum" label="应安置人数（人）" min-width="140" align="center" />
- <el-table-column label="所有家庭人员应安置面积（㎡）" prop="resettledArea" min-width="160" 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 }}
<el-tooltip v-if="scope.row.waitFamilyAreaWarn == 1" class="item" effect="dark" content="应补偿面积数据异常"
@@ -48,8 +48,8 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column label="补偿单位标准（万元）" min-width="160" align="center">
- <el-table-column prop="priceNewAmount" label="新建商品住房、商业用房、停车位" min-width="160" align="center">
+ <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">
<template slot-scope="scope">
<span>{{ scope.row.priceNewAmount }}
<el-tooltip v-if="scope.row.priceAmountWarn == 1" class="item" effect="dark" content="补充标准数据异常"
@@ -58,7 +58,7 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="priceOldAmount" label="二手住房" min-width="150" align="center">
+ <el-table-column prop="priceOldAmount" key="table_A" label="二手住房" min-width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.priceOldAmount }}
<el-tooltip v-if="scope.row.twoPriceWarn == 1" class="item" effect="dark" content="检测到多个购房情况请人工核对"
@@ -68,7 +68,7 @@
</template>
</el-table-column>
</el-table-column>
- <el-table-column prop="compensationAmount" label="补偿资金总额（万元）" min-width="160" align="center">
+ <el-table-column prop="compensationAmount" key="table_A" label="补偿资金总额（万元）" min-width="160" align="center">
<template slot-scope="scope">
<span>{{ scope.row.compensationAmount }}
<el-tooltip v-if="scope.row.compensationSumWarn == 1" class="item" effect="dark" content="补偿总金额数据异常"
@@ -77,8 +77,8 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="downPaymentAmount" label="25%首付款（㎡）" min-width="150" align="center" />
- <el-table-column prop="quarterPayAmount" v-if="activeTab == '1'" label="每季度需支付款项（万元）" min-width="180"
+ <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">
<template slot-scope="scope">
<span>{{ scope.row.quarterPayAmount }}
@@ -88,7 +88,7 @@
:src="require('../../../assets/logo/warning.png')" :fit="fit"></el-image> </el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="subsidyAmount" label="过渡补贴（万元）" min-width="180" align="center">
+ <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="过渡补贴金额数据异常"
@@ -103,28 +103,28 @@
<!-- 购房信息表格 -->
<el-table v-loading="loading" :data="tableData" border style="width: 100%" max-height="300px"
:row-class-name="tableRowClassName1">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="street" label="镇（街道）" min-width="100" align="center">
+ <el-table-column type="index" key="table_B" label="序号" width="50" align="center" />
+ <el-table-column prop="street" key="table_B" label="镇（街道）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.street }}</span>
</template>
</el-table-column>
- <el-table-column prop="projectName" label="拆迁项目名称" min-width="100" align="center">
+ <el-table-column prop="projectName" key="table_B" label="拆迁项目名称" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.projectName }}</span>
</template>
</el-table-column>
- <el-table-column prop="community" label="所在村（社区）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="community" label="所在村（社区）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.community }}</span>
</template>
</el-table-column>
- <el-table-column prop="demolitionTime" label="拆迁时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="demolitionTime" label="拆迁时间" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.demolitionTime }}</span>
</template>
</el-table-column>
- <el-table-column prop="householdHead" label="户主姓名" min-width="100" align="center">
+ <el-table-column key="table_B" prop="householdHead" label="户主姓名" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.householdHead }} <el-tooltip v-if="scope.row.householdHeadWarn == 1" class="item"
effect="dark" content="户主信息不存在于待安置人员库" placement="top">
@@ -133,7 +133,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="idCard" label="身份证号" min-width="180" align="center">
+ <el-table-column key="table_B" prop="idCard" label="身份证号" 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="身份信息不存在于待安置人员库" placement="top">
@@ -142,30 +142,30 @@
</el-tooltip>
</template>
</el-table-column>
- <el-table-column prop="mobile" label="联系电话" min-width="100" align="center">
+ <el-table-column key="table_B" prop="mobile" label="联系电话" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.mobile || '-' }}
</template>
</el-table-column>
- <el-table-column label="本次安置人数（人）" min-width="100" align="center">
- <el-table-column prop="currentCollectiveNum" label="集体经济组织成员" min-width="100" align="center">
+ <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">
<template slot-scope="scope">
{{ scope.row.currentCollectiveNum || '-' }}
</template>
</el-table-column>
- <el-table-column 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>
</el-table-column>
- <el-table-column prop="currentCount" label="合计" min-width="100" align="center">
+ <el-table-column key="table_B" prop="currentCount" label="合计" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.currentCount }}</span>
</template>
</el-table-column>
</el-table-column>
- <el-table-column prop="waitFamilyNames" label="待安置家庭成员姓名" min-width="100" align="center">
+ <el-table-column key="table_B" prop="waitFamilyNames" label="待安置家庭成员姓名" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.waitFamilyNames || '-' }} <el-tooltip v-if="scope.row.waitFamilyNamesWarn == 1"
class="item" effect="dark" content="身份信息存在重复数据" placement="top">
@@ -174,7 +174,7 @@
</el-tooltip>
</template>
</el-table-column>
- <el-table-column prop="waitFamilyArea" label="待安置人员应安置面积合计（㎡）" min-width="100" align="center">
+ <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"
effect="dark" content="应补偿面积数据异常" placement="top">
@@ -183,8 +183,8 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column label="补偿金额（万元）" min-width="100" align="center">
- <el-table-column prop="compensationNewAmount" label="新建商品住房、商业用房、停车位" min-width="100" align="center">
+ <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">
<template slot-scope="scope">
<span>{{ scope.row.compensationNewAmount }} <el-tooltip v-if="scope.row.compensationAmountWarn == 1"
class="item" effect="dark" content="检测到多个购房情况请人工核对" placement="top">
@@ -193,12 +193,12 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="compensationOldAmount" label="二手住房" min-width="100" align="center">
+ <el-table-column key="table_B" prop="compensationOldAmount" label="二手住房" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.compensationOldAmount }}</span>
</template>
</el-table-column>
- <el-table-column prop="compensationSum" label="合计" min-width="100" align="center">
+ <el-table-column key="table_B" prop="compensationSum" label="合计" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.compensationSum }} <el-tooltip v-if="scope.row.compensationSumWarn == 1"
class="item" effect="dark" content="补偿总金额数据异常" placement="top">
@@ -208,13 +208,13 @@
</template>
</el-table-column>
</el-table-column>
- <el-table-column prop="downPaymentAmount" label="25%首付款（万元）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="downPaymentAmount" label="25%首付款（万元）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.downPaymentAmount }}</span>
</template>
</el-table-column>
- <el-table-column prop="quarterPayAmount" v-if="activeTab == 'houseInfo'" label="每季度需支付款项（万元）"
- min-width="100" align="center">
+ <el-table-column key="table_B" prop="quarterPayAmount" v-if="activeTab == '2'" 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="季度款金额数据异常" placement="top">
@@ -223,7 +223,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="subsidyAmount" label="过渡补贴（万元）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="subsidyAmount" label="过渡补贴（万元）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.subsidyAmount }} <el-tooltip v-if="scope.row.subsidyAmount == 1" class="item"
effect="dark" content="过渡补贴金额数据异常" placement="top">
@@ -232,35 +232,35 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="remark" label="备注" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remark" label="备注" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remark }}</span>
</template>
</el-table-column>
- <el-table-column prop="certificateTime" label="凭证发放时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="certificateTime" label="凭证发放时间" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.certificateTime }}</span>
</template>
</el-table-column>
- <el-table-column prop="buyTime" label="购房时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="buyTime" label="购房时间" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buyTime }}</span>
</template>
</el-table-column>
- <el-table-column prop="dealAmount" label="成交金额（万元）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="dealAmount" label="成交金额（万元）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.dealAmount }}</span>
</template>
</el-table-column>
- <el-table-column label="新建商品住房" min-width="100" align="center">
- <el-table-column prop="newHousingName" label="楼盘名称" min-width="100" align="center">
+ <el-table-column key="table_B" label="新建商品住房" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newHousingName" label="楼盘名称" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newHousingName }}</span>
</template>
</el-table-column>
- <el-table-column prop="newHousingArea" label="面积（㎡）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newHousingArea" label="面积（㎡）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newHousingArea }} <el-tooltip v-if="scope.row.areaWarn == 1" class="item"
effect="dark" content="面积数据异常" placement="top">
@@ -269,7 +269,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="newHousingNum" label="套数（套）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newHousingNum" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newHousingNum }}</span>
</template>
@@ -277,18 +277,18 @@
</el-table-column>
- <el-table-column label="二手住房" min-width="100" align="center">
- <el-table-column prop="oldHousingName" label="小区名称" min-width="100" align="center">
+ <el-table-column key="table_B" label="二手住房" min-width="100" align="center">
+ <el-table-column key="table_B" prop="oldHousingName" label="小区名称" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oldHousingName }}</span>
</template>
</el-table-column>
- <el-table-column prop="oldHousingArea" label="面积（㎡）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="oldHousingArea" label="面积（㎡）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oldHousingArea }}</span>
</template>
</el-table-column>
- <el-table-column prop="oldHousingNum" label="套数（套）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="oldHousingNum" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oldHousingNum }}</span>
</template>
@@ -297,18 +297,18 @@
- <el-table-column prop="householdHead" label="新建商业用房" min-width="100" align="center">
- <el-table-column prop="buildHousingName" label="楼盘名称" min-width="100" align="center">
+ <el-table-column key="table_B" prop="householdHead" label="新建商业用房" min-width="100" align="center">
+ <el-table-column key="table_B" prop="buildHousingName" label="楼盘名称" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buildHousingName }}</span>
</template>
</el-table-column>
- <el-table-column prop="buildHousingArea" label="面积（㎡）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="buildHousingArea" label="面积（㎡）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buildHousingArea }}</span>
</template>
</el-table-column>
- <el-table-column prop="buildHousingNum" label="套数（套）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="buildHousingNum" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buildHousingNum }}</span>
</template>
@@ -317,18 +317,18 @@
- <el-table-column label="新建停车位" min-width="100" align="center">
- <el-table-column prop="newStopName" label="楼盘名称" min-width="100" align="center">
+ <el-table-column key="table_B" label="新建停车位" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newStopName" label="楼盘名称" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newStopName }}</span>
</template>
</el-table-column>
- <el-table-column prop="newStopArea" label="金额（万元）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newStopArea" label="金额（万元）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newStopArea }}</span>
</template>
</el-table-column>
- <el-table-column prop="newStopNum" label="个数（个）" min-width="100" align="center">
+ <el-table-column key="table_B" prop="newStopNum" label="个数（个）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newStopNum }}</span>
</template>
@@ -336,38 +336,38 @@
</el-table-column>
- <el-table-column prop="signTime" label="自主购房协议签订时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="signTime" label="自主购房协议签订时间" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.signTime }}</span>
</template>
</el-table-column>
- <el-table-column 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>
</el-table-column>
- <el-table-column label="剩余款项支付时间" min-width="100" align="center">
- <el-table-column prop="remainingTime1" label="第一年" min-width="100" align="center">
+ <el-table-column key="table_B" label="剩余款项支付时间" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remainingTime1" label="第一年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime1 }}</span>
</template>
</el-table-column>
- <el-table-column prop="remainingTime2" label="第二年" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remainingTime2" label="第二年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime2 }}</span>
</template>
</el-table-column>
- <el-table-column prop="remainingTime3" label="第三年" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remainingTime3" label="第三年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime3 }}</span>
</template>
</el-table-column>
- <el-table-column prop="remainingTime4" label="第四年" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remainingTime4" label="第四年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime4 }}</span>
</template>
</el-table-column>
- <el-table-column prop="remainingTime5" label="第四年" min-width="100" align="center">
+ <el-table-column key="table_B" prop="remainingTime5" label="第四年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime5 }}</span>
</template>
--
Gitblit v1.7.1