fix: BUG修改

src/components/ProTable/components/Pagination.vue

@@ -2,6 +2,7 @@
 	<!-- 分页组件 -->
 	<el-pagination
 		:page-sizes="[10, 25, 50, 100]"
+		:current-page="pageable.pageNo"
 		:small="pageable.small"
 		:disabled="pageable.disabled"
 		:background="pageable.background"

src/views/goverment/progressManagement/investmentPayment/components/transformInfo1.vue

@@ -180,7 +180,8 @@ const formData = ref({
 	payAmount: "",
 	payTime: "",
 	unPayAmount: "",
-	payRatio: ""
+	payRatio: "",
+	applyIdList: ""
 });
 const background = ref(true);
 const pageable = ref({
@@ -225,6 +226,7 @@ const getApplyTimeData = async () => {
 const saveItem = async (form: any) => {
 	let requestData = {
 		...form,
+		applyIdList: [form.applyIdList],
 		contractId: props.relativeId
 	};
 	if (props.active == 0) {
@@ -243,7 +245,8 @@ const openAdd = () => {
 		payAmount: "",
 		payTime: "",
 		unPayAmount: "",
-		payRatio: ""
+		payRatio: "",
+		applyIdList: ""
 	});
 	addVisible.value = true;
 };

src/views/goverment/progressManagement/panoramicPlan/index.vue

@@ -463,7 +463,13 @@ const handleItemDetail = async (row: any) => {
 };
 // 新增，编辑数据
 const saveItem = async (form: any) => {
-	form.engineeringSn = searchSn.value;
+	if (active.value === 0) {
+		form.projectSn = searchSn.value;
+		delete form.engineeringSn;
+	} else {
+		form.engineeringSn = searchSn.value;
+		delete form.projectSn;
+	}
 	if (form.id && title.value != "查看") {
 		// console.log(form.dictCode);
 		const res = await globalPlanGovermentEdit(form);

src/views/goverment/reportStatistics/index.vue

@@ -0,0 +1,31 @@
+<template>
+	<div class="outside">
+		<layoutTop></layoutTop>
+		<iframe :src="`${baseUrl}/jmreport/list`" style="width: 100%; height: 98%; border: medium none" frameborder="1"></iframe>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onBeforeMount } from "vue";
+import layoutTop from "@/components/layoutTop/index.vue";
+import { GlobalStore } from "@/stores";
+onBeforeMount(() => {
+	getToken();
+});
+const baseUrl = import.meta.env.VITE_API_URL;
+const token = ref("");
+const getToken = () => {
+	const globalstore = GlobalStore();
+	token.value = globalstore.token;
+};
+</script>
+
+<style>
+.outside {
+	margin: 0;
+	padding: 0;
+	height: 90vh;
+	width: 100vw;
+	box-sizing: border-box;
+}
+</style>