From ee44870604013be48d6e8f9af837e5c7a9f882aa Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 18 Mar 2024 17:17:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/goverment.ts                  |  2 +-
 src/components/ProTable/index.vue             |  2 +-
 .../goverment/huizhou/unDealList/index.vue    | 55 +++++++++++++------
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/api/modules/goverment.ts b/src/api/modules/goverment.ts
index 12549de..9e1de44 100644
--- a/src/api/modules/goverment.ts
+++ b/src/api/modules/goverment.ts
@@ -450,5 +450,5 @@ export const annexFileSave = (params: any) => {
 // 待办清单
 // 查询是否有待办事项
 export const noFinishApi = (params: any) => {
-	return http.get(BASEURL + `/xmgl/systemUser/getToDoItems`, params);
+	return http.post(BASEURL + `/xmgl/systemUser/getToDoItems`, params);
 };
diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue
index b3b739a..3148d49 100644
--- a/src/components/ProTable/index.vue
+++ b/src/components/ProTable/index.vue
@@ -67,7 +67,7 @@
 				<!-- other 循环递归 -->
 				<TableColumn v-if="!item.type && item.prop && item.isShow" :column="item">
 					<template v-for="slot in Object.keys($slots)" #[slot]="scope">
-						<slot :name="slot" :row="scope.row"></slot>
+						<slot :name="slot" :row="scope.row" :index="scope.$index"></slot>
 					</template>
 				</TableColumn>
 			</template>
diff --git a/src/views/goverment/huizhou/unDealList/index.vue b/src/views/goverment/huizhou/unDealList/index.vue
index 5daaff1..a09ded0 100644
--- a/src/views/goverment/huizhou/unDealList/index.vue
+++ b/src/views/goverment/huizhou/unDealList/index.vue
@@ -10,8 +10,11 @@
 			:tool-button="false"
 			:pagination="true"
 			background
-			:isShowSearch="false"
+			:isShowSearch="true"
 		>
+			<template #numIndex="{ row, index }">
+				{{ index + 1 + (responseData.pageNo - 1) * responseData.pageSize }}
+			</template>
 			<template #state="{ row }">
 				{{ row.state === 3 ? "已逾期" : "待处理" }}
 			</template>
@@ -37,6 +40,7 @@ import { sendIframeMessage } from "@/utils/util";
 const globalStore = GlobalStore();
 const route = useRoute();
 const router = useRouter();
+const responseData = ref();
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
 
@@ -60,10 +64,31 @@ const handleDealItem = (obj: any) => {
 
 // 表格配置项
 const columns: ColumnProps[] = [
-	{ type: "index", label: "序号", width: 100 },
+	{ prop: "numIndex", label: "序号", width: 100 },
 	{ prop: "type", label: "待办事项", width: 220 },
-	{ prop: "projectName", label: "项目名称" },
-	{ prop: "state", label: "状态", width: 120 },
+	{ prop: "projectName", label: "项目名称", search: { el: "input" } },
+	{
+		prop: "state",
+		label: "状态",
+		search: { el: "select" },
+		enum: [
+			{ label: "已逾期", value: 3 },
+			{ label: "待处理", value: 1 }
+		],
+		width: 120
+	},
+	{
+		prop: "flag",
+		label: "类型",
+		isShow: false,
+		search: { el: "select" },
+		enum: [
+			{ label: "质量管理", value: 1 },
+			{ label: "安全管理", value: 2 },
+			{ label: "进度管理", value: 3 }
+		],
+		width: 120
+	},
 	{ prop: "operation", label: "操作", width: 120 }
 ];
 
@@ -76,24 +101,26 @@ const initParam = reactive({
 // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
 const dataCallback = (data: any) => {
 	// console.log(data);
-	return {
+	responseData.value = {
 		list: data.records,
 		total: Number(data.total),
 		pageNo: Number(data.current),
 		pageSize: Number(data.size)
 	};
+	return responseData.value;
 };
 
 // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = async (params: any) => {
 	let newParams = JSON.parse(JSON.stringify(params));
-	const res: any = await noFinishApi({});
-	if (res && res.data && res.data.length > 0) {
-		return { result: { records: res.data, current: "1", pages: "1", size: "100", total: res.data.length + "" } };
-	} else {
-		return { result: { records: [], current: "1", pages: "1", size: "100", total: "0" } };
-	}
+	// const res: any = await noFinishApi({});
+	// if (res && res.data && res.data.length > 0) {
+	// 	return { result: { records: res.data, current: "1", pages: "1", size: "100", total: res.data.length + "" } };
+	// } else {
+	// 	return { result: { records: [], current: "1", pages: "1", size: "100", total: "0" } };
+	// }
+	return noFinishApi(newParams);
 };
 onMounted(async () => {
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
@@ -110,10 +137,4 @@ onMounted(async () => {
 	height: 700px;
 	overflow: auto;
 }
-:deep() {
-	.theme-transform,
-	.el-pagination {
-		display: none;
-	}
-}
 </style>