From 37de82e230064801aa1e574b2c7ae9c96b3ddd17 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期四, 20 三月 2025 11:40:17 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle
---
src/views/applicationBatchList/list.vue | 394 ++++++++++++++++++-------------------------------------
1 files changed, 132 insertions(+), 262 deletions(-)
diff --git a/src/views/applicationBatchList/list.vue b/src/views/applicationBatchList/list.vue
index 5c4e55e..921d46f 100644
--- a/src/views/applicationBatchList/list.vue
+++ b/src/views/applicationBatchList/list.vue
@@ -1,86 +1,37 @@
<template>
<div class="app-container">
<!-- 搜索区域 -->
- <el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="项目名称">
- <el-input
- v-model="queryParams.projectName"
- placeholder="请输入"
- clearable
- size="small"
- />
- </el-form-item>
- <el-form-item label="镇街">
- <el-input
- v-model="queryParams.town"
- placeholder="请输入"
- clearable
- size="small"
- />
- </el-form-item>
- <el-form-item label="产主姓名">
- <el-input
- v-model="queryParams.owner"
- placeholder="请输入"
- clearable
- size="small"
- />
- </el-form-item>
- <el-form-item label="身份证号">
- <el-input
- v-model="queryParams.idCard"
- placeholder="请输入"
- clearable
- size="small"
- />
- </el-form-item>
- <el-form-item label="状态">
- <el-select
- v-model="queryParams.status"
- placeholder="请选择状态"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in statusOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ <div class="search-area">
+ <el-form :inline="true" :model="queryParams" class="search-form">
+ <el-form-item label="批次号">
+ <el-input
+ v-model="queryParams.batchNo"
+ placeholder="请输入"
+ clearable
+ size="small"
/>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="small"
- @click="handleQuery"
- >查询</el-button
- >
- <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
- >重置</el-button
- >
- </el-form-item>
- </el-form>
+ </el-form-item>
+ <el-form-item label="状态">
+ <el-input
+ v-model="queryParams.status"
+ placeholder="请输入"
+ clearable
+ size="small"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="default" @click="resetQuery">重置</el-button>
+ <el-button type="primary" @click="handleQuery">查询</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
<!-- 操作按钮区域 -->
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" size="small" @click="handleAdd"
- >新增申请批次</el-button
- >
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" size="small" @click="handleImport"
- >下载导入模板</el-button
- >
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" size="small" @click="handleBatchImport"
- >批量导入</el-button
- >
- </el-col>
- </el-row>
+ <div class="action-buttons">
+ <el-button type="primary" @click="handleAdd">新增申请批次</el-button>
+ <el-button type="success" @click="handleImport">下载导入模板</el-button>
+ <el-button type="primary" @click="handleBatchImport">批量导入</el-button>
+ </div>
<!-- 表格区域 -->
<el-table
@@ -88,177 +39,73 @@
:data="tableData"
border
style="width: 100%"
- :header-cell-style="{ 'text-align': 'center' }"
>
- <el-table-column
- type="index"
- label="序号"
- width="50"
- align="center"
- fixed="left"
- />
- <el-table-column
- prop="projectName"
- label="项目名称"
- align="center"
- width="150"
- />
- <el-table-column
- prop="projectCompleteTime"
- label="项目启动时间"
- align="center"
- width="110"
- />
- <el-table-column prop="town" label="镇街" align="center" width="80" />
- <el-table-column
- prop="village"
- label="村社区"
- align="center"
- width="80"
- />
- <el-table-column prop="group" label="组" align="center" width="60" />
- <el-table-column
- prop="owner"
- label="户主姓名"
- align="center"
- width="80"
- />
- <el-table-column
- prop="ownerIdCard"
- label="户主身份证号"
- align="center"
- width="180"
- /><el-table-column
- prop="relationship"
- label="家庭成员名字"
- align="center"
- width="160"
- />
- <el-table-column
- prop="relationship"
- label="关系"
- align="center"
- width="60"
- />
- <el-table-column
- prop="personType"
- label="人员性质"
- align="center"
- width="80"
- />
- <el-table-column
- prop="idCard"
- label="身份证号"
- align="center"
- width="180"
- />
-
- <el-table-column prop="age" label="年龄" align="center" width="60" />
- <el-table-column prop="remark1" label="性别" align="center" width="80" />
- <el-table-column
- prop="birthDate"
- label="出生年月日"
- align="center"
- width="100"
- />
- <el-table-column
- prop="resettlementType"
- label="安置方式"
- align="center"
- width="100"
- />
- <el-table-column
- prop="firstDeliveryDate"
- label="原始拆迁时领取过渡费时间"
- align="center"
- width="100"
- />
- <el-table-column
- prop="secondDeliveryDate"
- label="上次过渡费发放时间(起)"
- align="center"
- width="100"
- />
- <el-table-column
- prop="thirdDeliveryDate"
- label="上次过渡费发放时间(止)"
- align="center"
- width="100"
- />
- <el-table-column
- prop="thirdDeliveryRemark"
- label="安置状态"
- align="center"
- width="100"
- />
- <el-table-column
- prop="resettlementArea"
- label="剩余未安置面积(㎡)"
- align="center"
- width="90"
- />
- <el-table-column
- prop="previousTotalAmount"
- label="剩余未安置商铺面积(㎡)"
- align="center"
- width="110"
- />
-
- <el-table-column
- prop="contact"
- label="联系电话"
- align="center"
- width="120"
- />
- <el-table-column prop="remark" label="备注" align="center" width="80" />
- <el-table-column prop="status" label="安置状态" align="center" width="80" fixed="right">
+ <el-table-column type="index" label="序号" width="60" align="center" />
+ <el-table-column prop="batchNo" label="批次号" min-width="120" align="center" />
+ <el-table-column prop="totalApplications" label="申请总数" min-width="100" align="center" />
+ <el-table-column prop="totalApplicants" label="申请总人数" min-width="100" align="center" />
+ <el-table-column prop="compensationAmount" label="补偿金总额（万元）" min-width="150" align="center" />
+ <el-table-column prop="quarterlyAmount" label="25%暂付款（万元）" min-width="150" align="center" />
+ <el-table-column prop="quarterlyPaymentStatus" label="每季度发放支付情况（万元）" min-width="180" align="center" />
+ <el-table-column prop="transitionalAmount" label="过渡补助（万元）" min-width="150" align="center" />
+
+ <el-table-column label="状态" width="100" align="center">
<template slot-scope="scope">
<el-tag
- :type="
- scope.row.status === '待审核'
- ? 'warning'
- : scope.row.status === '已通过'
- ? 'success'
- : 'danger'
- "
- >
- {{ scope.row.status }}
- </el-tag>
+ :type="scope.row.status === '待审核' ? 'warning' : scope.row.status === '已通过' ? 'success' : 'info'"
+ >{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="操作" align="center" width="200" fixed="right">
+
+ <el-table-column label="操作" width="180" align="center" fixed="right">
<template slot-scope="scope">
+ <!-- 待审核状态 -->
+ <template v-if="scope.row.status === '待审核'">
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleView(scope.row, 'audit')"
+ >审核</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleView(scope.row, 'view')"
+ >查看</el-button>
+ </template>
- <el-button size="mini" type="text" @click="handleView(scope.row)"
- >查看</el-button
- >
- <el-button size="mini" type="text" @click="handleDetail(scope.row)"
- >详情</el-button
- >
- <el-button
- size="mini"
- type="text"
- @click="handleAudit(scope.row)"
- v-if="scope.row.status === '待审核'"
- >审核</el-button
- >
- <el-button size="mini" type="text" @click="handleDelete(scope.row)"
- >删除</el-button
- >
+ <!-- 已审核状态 -->
+ <template v-else>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleView(scope.row, 'detail')"
+ >详情</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleDelete(scope.row)"
+ >删除</el-button>
+ </template>
</template>
</el-table-column>
</el-table>
<!-- 分页区域 -->
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <div class="pagination-container">
+ <el-pagination
+ background
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="queryParams.pageNum"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="queryParams.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ >
+ </el-pagination>
+ </div>
- <!-- 审核对话框 - 替换原有的审核对话框 -->
+ <!-- 审核对话框 -->
<approval-dialog
ref="approvalDialog"
:visible.sync="approvalDialogVisible"
@@ -483,27 +330,15 @@
this.uploadType = "batch";
this.uploadDialogVisible = true;
},
- /** 查看按钮操作 */
- handleView(row) {
+ /** 统一的查看/详情按钮操作 */
+ handleView(row, type) {
this.$router.push({
path: "/applicationBatchList/detail",
query: {
batchNo: row.batchNo,
- status: row.status,
+ type: type // 'audit'/'view'/'detail'
},
});
- },
- /** 详情按钮操作 */
- handleDetail(row) {
- this.currentRow = row;
- this.approvalType = "detail";
- this.approvalDialogVisible = true;
- },
- /** 审核按钮操作 */
- handleAudit(row) {
- this.currentRow = row;
- this.approvalType = "audit";
- this.approvalDialogVisible = true;
},
/** 审核提交处理 */
handleApprovalSubmit(data) {
@@ -546,20 +381,55 @@
};
</script>
-<style scoped>
+<style lang="scss" scoped>
.app-container {
padding: 20px;
-}
-.search-form {
- margin-bottom: 20px;
background-color: #fff;
- padding: 20px;
- border-radius: 4px;
-}
-.mb8 {
- margin-bottom: 8px;
-}
-.el-button + .el-button {
- margin-left: 10px;
+
+ .search-area {
+ background-color: #fff;
+ padding: 15px 0;
+ margin-bottom: 20px;
+ border-radius: 4px;
+
+ .search-form {
+ display: flex;
+ align-items: center;
+
+ .el-form-item {
+ margin-bottom: 0;
+ margin-right: 20px;
+ }
+ }
+ }
+
+ .action-buttons {
+ margin-bottom: 20px;
+
+ .el-button {
+ margin-right: 10px;
+ }
+ }
+
+ .el-table {
+ margin-bottom: 20px;
+
+ .el-button--text {
+ padding: 0 8px;
+
+ &:not(:last-child) {
+ border-right: 1px solid #dcdfe6;
+ }
+ }
+ }
+
+ .pagination-container {
+ text-align: center;
+ margin-top: 20px;
+ }
+
+ .el-tag {
+ border-radius: 2px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.7.1