From b1a1d73fcae0f8bd2936f512d75a82b60d54a8d4 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期五, 04 四月 2025 12:05:41 +0800
Subject: [PATCH] 修改bug
---
src/views/placement-batch/person.vue | 169 ++++++++++++++++++++++++++------------------------------
1 files changed, 79 insertions(+), 90 deletions(-)
diff --git a/src/views/placement-batch/person.vue b/src/views/placement-batch/person.vue
index 91ea90c..cca4936 100644
--- a/src/views/placement-batch/person.vue
+++ b/src/views/placement-batch/person.vue
@@ -70,13 +70,12 @@
<div v-if="activeTab === 'fullReport'">
<!-- 表格区域 -->
- <el-table v-loading="loading" :data="tableData" border style="width: 100%"
- @selection-change="handleSelectionChange" :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 v-loading="loading" :data="tableData" border style="width: 100%" :row-class-name="tableRowClassName">
+ <el-table-column type="index" key="table_A" label="序号" width="50" align="center" />
+ <el-table-column prop="street" key="table_A" label="镇（街道）" min-width="120" align="center" />
+ <el-table-column prop="projectName" key="table_A" label="拆迁项目名称" min-width="180" align="center" />
+ <el-table-column prop="community" key="table_A" label="所在村（社区）" min-width="120" align="center" />
+ <el-table-column prop="householdHead" key="table_A" 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">
@@ -85,7 +84,7 @@
</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="身份信息不存在于待安置人员库" placement="top">
@@ -94,8 +93,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" label="应安置人数（人）" key="table_A" min-width="140" align="center" />
+ <el-table-column label="所有家庭人员应安置面积（㎡）" prop="resettledArea" key="table_A" 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="应补偿面积数据异常" placement="top">
@@ -104,7 +103,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column label="补偿单位标准（万元）" min-width="160" align="center">
+ <el-table-column label="补偿单位标准（万元）" min-width="160" key="table_A" align="center">
<el-table-column prop="priceNewAmount" label="新建商品住房、商业用房、停车位" min-width="160" align="center">
<template slot-scope="scope">
<span>{{ scope.row.priceNewAmount }} <el-tooltip v-if="scope.row.priceAmountWarn == 1" class="item"
@@ -114,7 +113,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="priceOldAmount" label="二手住房" min-width="150" align="center">
+ <el-table-column prop="priceOldAmount" label="二手住房" min-width="150" key="table_A" align="center">
<template slot-scope="scope">
<span>{{ scope.row.priceOldAmount }} <el-tooltip v-if="scope.row.twoPriceWarn == 1" class="item"
effect="dark" content="检测到多个购房情况请人工核对" placement="top">
@@ -124,7 +123,7 @@
</template>
</el-table-column>
</el-table-column>
- <el-table-column prop="compensationAmount" label="补偿资金总额（万元）" min-width="160" align="center">
+ <el-table-column prop="compensationAmount" label="补偿资金总额（万元）" key="table_A" 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="补偿总金额数据异常" placement="top">
@@ -133,13 +132,12 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="downPaymentAmount" label="25%首付款（㎡）" min-width="150" align="center">
+ <el-table-column prop="downPaymentAmount" label="25%首付款（㎡）" key="table_A" min-width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.downPaymentAmount }}</span>
</template>
</el-table-column>
- <el-table-column prop="quarterPayAmount" v-if="activeTab == 'fullReport'" label="每季度需支付款项（万元）" min-width="180"
- align="center">
+ <el-table-column prop="quarterPayAmount" label="每季度需支付款项（万元）" key="table_A" 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">
@@ -148,7 +146,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="subsidyAmount" label="过渡补贴（万元）" min-width="180" align="center">
+ <el-table-column prop="subsidyAmount" label="过渡补贴（万元）" min-width="180" key="table_A" 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">
@@ -157,7 +155,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column label="操作" prop="operation" fixed="right" width="180" align="center">
+ <el-table-column label="操作" prop="operation" fixed="right" width="180" key="table_A" align="center">
<template slot-scope="scope" v-if="activeTab == 'fullReport'">
<el-button type="text" size="small" @click="handleView(scope.row)">详情</el-button>
<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
@@ -176,29 +174,29 @@
</div>
<div v-else>
<!-- 购房信息表格 -->
- <el-table v-loading="loading" :data="tableData" border style="width: 100%" :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 v-loading="loading" :data="tableData1" border style="width: 100%" :row-class-name="tableRowClassName1">
+ <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 prop="community" key="table_B" 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 prop="demolitionTime" key="table_B" 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 prop="householdHead" key="table_B" 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">
@@ -207,7 +205,7 @@
</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_B" 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">
@@ -216,39 +214,39 @@
</el-tooltip>
</template>
</el-table-column>
- <el-table-column prop="mobile" label="联系电话" min-width="100" align="center">
+ <el-table-column prop="mobile" key="table_B" 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 label="本次安置人数（人）" key="table_B" min-width="100" align="center">
+ <el-table-column prop="currentCollectiveNum" key="table_B" 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 prop="currentNoCollectiveNum" key="table_B" 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 prop="currentCount" label="合计" key="table_B" 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 prop="waitFamilyNames" key="table_B" 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">
+ {{ scope.row.waitFamilyNames || '-' }} <el-tooltip v-if="scope.row.waitFamilyNamesWarn == 1 || scope.row.waitFamilyNamesNoWarn==1" class="item"
+ effect="dark" :content="scope.row.waitFamilyNamesWarn==1?'身份信息存在重复数据':'家庭成员不在安置库'" placement="top">
<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="waitFamilyArea" label="待安置人员应安置面积合计（㎡）" min-width="100" align="center">
+ <el-table-column prop="waitFamilyArea" key="table_B" 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">
@@ -257,8 +255,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 label="补偿金额（万元）" key="table_B" min-width="100" align="center">
+ <el-table-column prop="compensationNewAmount" key="table_B" 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">
@@ -267,12 +265,12 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="compensationOldAmount" label="二手住房" min-width="100" align="center">
+ <el-table-column prop="compensationOldAmount" key="table_B" 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 prop="compensationSum" key="table_B" 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">
@@ -282,12 +280,12 @@
</template>
</el-table-column>
</el-table-column>
- <el-table-column prop="downPaymentAmount" label="25%首付款（万元）" min-width="100" align="center">
+ <el-table-column prop="downPaymentAmount" key="table_B" 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"
+ <el-table-column prop="quarterPayAmount" key="table_B" label="每季度需支付款项（万元）" min-width="100"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.quarterPayAmount }} <el-tooltip v-if="scope.row.quarterPayAmountWarn == 1" class="item"
@@ -297,7 +295,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="subsidyAmount" label="过渡补贴（万元）" min-width="100" align="center">
+ <el-table-column prop="subsidyAmount" key="table_B" 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">
@@ -306,35 +304,35 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="remark" label="备注" min-width="100" align="center">
+ <el-table-column prop="remark" key="table_B" 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 prop="certificateTime" key="table_B" 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 prop="buyTime" label="购房时间" key="table_B" 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 prop="dealAmount" label="成交金额（万元）" key="table_B" 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 label="新建商品住房" min-width="100" key="table_B" align="center">
+ <el-table-column prop="newHousingName" label="楼盘名称" key="table_B" 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 prop="newHousingArea" key="table_B" 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">
@@ -343,7 +341,7 @@
</el-tooltip></span>
</template>
</el-table-column>
- <el-table-column prop="newHousingNum" label="套数（套）" min-width="100" align="center">
+ <el-table-column prop="newHousingNum" key="table_B" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newHousingNum }}</span>
</template>
@@ -351,18 +349,18 @@
</el-table-column>
- <el-table-column label="二手住房" min-width="100" align="center">
+ <el-table-column label="二手住房" key="table_B" min-width="100" align="center">
<el-table-column 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 prop="oldHousingArea" key="table_B" 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 prop="oldHousingNum" key="table_B" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oldHousingNum }}</span>
</template>
@@ -371,18 +369,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 prop="householdHead" key="table_B" label="新建商业用房" min-width="100" align="center">
+ <el-table-column prop="buildHousingName" key="table_B" 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 prop="buildHousingArea" key="table_B" 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 prop="buildHousingNum" key="table_B" label="套数（套）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buildHousingNum }}</span>
</template>
@@ -391,18 +389,18 @@
- <el-table-column label="新建停车位" min-width="100" align="center">
- <el-table-column prop="newStopName" label="楼盘名称" min-width="100" align="center">
+ <el-table-column label="新建停车位" key="table_B" min-width="100" align="center">
+ <el-table-column prop="newStopName" key="table_B" 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 prop="newStopArea" key="table_B" 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 prop="newStopNum" key="table_B" label="个数（个）" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.newStopNum }}</span>
</template>
@@ -410,44 +408,44 @@
</el-table-column>
- <el-table-column prop="signTime" label="自主购房协议签订时间" min-width="100" align="center">
+ <el-table-column prop="signTime" key="table_B" 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 prop="compensationPayTime" key="table_B" 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 label="剩余款项支付时间" key="table_B" min-width="100" align="center">
+ <el-table-column prop="remainingTime1" key="table_B" 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 prop="remainingTime2" key="table_B" 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 prop="remainingTime3" key="table_B" 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 prop="remainingTime4" key="table_B" 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 prop="remainingTime5" key="table_B" label="第四年" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remainingTime5 }}</span>
</template>
</el-table-column>
</el-table-column>
- <el-table-column label="操作" prop="operation" fixed="right" width="180" align="center">
+ <el-table-column label="操作" prop="operation" key="table_B" fixed="right" width="180" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleView(scope.row)">详情</el-button>
<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
@@ -498,23 +496,9 @@
// 总条数
total: 0,
// 表格数据
- tableData: [
- {
- street: '长洲社区',
- projectName: '长洲水利工程征地拆迁',
- community: '和兴社区',
- householdHead: '张三',
- idCard: '220102198512345678',
- familySize: 3,
- totalArea: 160,
- registeredArea: 120,
- measuredArea: 120,
- courtArea: 40,
- compensationAmount: 30,
- buildingArea: 38,
- temporaryAmount: 5
- }
- ],
+ tableData: [],
+ // 表格数据
+ tableData1: [],
// 当前激活的tab
activeTab: 'fullReport',
// 查询参数
@@ -542,7 +526,12 @@
// TODO: 调用接口获取数据
getPlacementBatchDetail({ ...this.queryParams, placementBatchId: this.$route.query.id, type: this.activeTab == 'fullReport' ? 1 : 2 }).then(res => {
if (res.code == 200) {
- this.tableData = this.activeTab == 'fullReport' ? res.data.assetList : res.data.householdList
+ // this.tableData = this.activeTab == 'fullReport' ? res.data.assetList : res.data.householdList
+ if (this.activeTab == 'fullReport') {
+ this.tableData = res.data.assetList
+ } else {
+ this.tableData1 = res.data.householdList
+ }
this.detailData = res.data.placementBatch
this.total = res.data.total
this.loading = false
@@ -555,13 +544,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.waitFamilyNamesNoWarn==1 || row.priceAmountWarn == 1 || row.quarterPayAmountWarn == 1 || row.subsidyAmountWarn == 1 || row.twoPriceWarn == 1 || row.waitFamilyAreaWarn == 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.waitFamilyNamesNoWarn==1 || row.idCardWarn == 1 || row.waitFamilyAreaWarn == 1 || row.waitFamilyNamesWarn == 1 || row.subsidyAmountWarn == 1 || row.quarterPayAmountWarn == 1) {
return 'warning-row'
}
return ''
--
Gitblit v1.7.1