From 8ad8940acb30603daa96aab5150cf995cd616c30 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 1 Aug 2023 19:15:43 +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/huizhou.ts                    |   4 +
 src/assets/images/screenImg/change.png        | Bin 0 -> 5046 bytes
 .../largeScreenOne/components/BDmaps.vue      |   2 +-
 .../largeScreen/largeScreenOne/index.vue      |  16 ++-
 .../largeScreen/largeScreenTwo/index.vue      |  16 ++-
 .../GanttchartChart/index.vue                 |   9 ++
 .../divisionsAndISubItems/index.vue           | 117 +++++++++++++++--
 .../engineerInventory/index.vue               |   9 +-
 .../investmentPayment/index.vue               |   2 +-
 .../panoramicPlan/index.vue                   |   8 +-
 .../components/transformInfo1.vue             |  68 +++++++---
 .../planFinishSituation/index.vue             |  35 ++++-
 .../components/ProjectSupervision/index.vue   |   6 +-
 .../components/editDialog/index.vue           |  24 ++--
 .../goverment/huizhou/projectList/index.vue   |   8 +-
 .../components/transformInfo.vue              | 124 ++++++++++++++++--
 .../components/transformInfo.vue              | 113 ++++++++++++++--
 .../subItemManagement/index.vue               |   2 +-
 18 files changed, 461 insertions(+), 102 deletions(-)
 create mode 100644 src/assets/images/screenImg/change.png

diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts
index f3d51f8..76e6c1e 100644
--- a/src/api/modules/huizhou.ts
+++ b/src/api/modules/huizhou.ts
@@ -53,6 +53,10 @@ export const bigItemGovermentAll = (params: any) => {
 export const bigItemGovermentEngList = (params: any) => {
 	return http.post(BASEURL + `/gov/projectSubItem/engineeringPage`, params);
 };
+// 分部分项审核(政务端)
+export const bigItemGovermentAudit = (params: any) => {
+	return http.post(BASEURL + `/gov/projectSubItem/examine`, params);
+};
 
 // 投资支付管理(项目端)------
 // 投资支付合同管理分页列表
diff --git a/src/assets/images/screenImg/change.png b/src/assets/images/screenImg/change.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd06a4373d3b05a668c987e2ef17ee72d1e2cf95
GIT binary patch
literal 5046
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
RjD$uUpslX|umWZs{y%B!NY?-W

literal 0
HcmV?d00001

diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
index 06d7ad7..c85aba4 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
@@ -96,7 +96,7 @@ const drawArea = () => {
 	});
 	// 创建区域掩膜实例
 	var polygon = new BMapGL.Polygon(path, {
-		fillColor: "",
+		fillColor: "#060f2c",
 		strokeColor: "#fff",
 		strokeWeight: 2,
 		strokeOpacity: 0.5
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue b/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
index a9e70e5..18f6c0d 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenOne/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<!-- <div class="main-content"> -->
 	<div class="orderBgc" v-if="screenValue == 0">
-		<div class="change-btn">
-			<el-button type="primary" @click="changeScreen">切换驾驶舱</el-button>
+		<div class="change-btn" @click="changeScreen">
+			<img src="@/assets/images/screenImg/change.png" alt="" />
 		</div>
 		<!-- <Map2D class="mapStyle" v-if="mapValue == 0"></Map2D> -->
 		<!-- <Map3DStyle class="mapStyle" v-if="mapValue == 1"></Map3DStyle> -->
@@ -86,11 +86,17 @@ onMounted(async () => {
 
 	.change-btn {
 		position: absolute;
-		right: 0;
+		right: 10px;
 		top: 0;
 		z-index: 100;
-		:deep(.el-button) {
-			background-color: transparent;
+		width: 50px;
+		height: 50px;
+		border-radius: 50%;
+		background-color: #060f2c;
+		cursor: pointer;
+		img {
+			width: 60px;
+			height: 60px;
 		}
 	}
 	.mapStyle {
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/index.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/index.vue
index bba142d..6094bd6 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/index.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="project">
-		<div class="change-btn">
-			<el-button type="primary" @click="changeScreen">切换驾驶舱</el-button>
+		<div class="change-btn" @click="changeScreen">
+			<img src="@/assets/images/screenImg/change.png" alt="" />
 		</div>
 		<div class="Leftcent">
 			<LeftcentView></LeftcentView>
@@ -46,11 +46,17 @@ onMounted(async () => {
 	width: 100%;
 	.change-btn {
 		position: absolute;
-		right: 0;
+		right: 10px;
 		top: 0;
 		z-index: 100;
-		:deep(.el-button) {
-			background-color: transparent;
+		width: 50px;
+		height: 50px;
+		border-radius: 50%;
+		background-color: #060f2c;
+		cursor: pointer;
+		img {
+			width: 60px;
+			height: 60px;
 		}
 	}
 	.Leftcent {
diff --git a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
index 2d9884f..b41aee2 100644
--- a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
@@ -752,6 +752,9 @@ watch(
 						color: #fff;
 						font-size: 20px;
 						border-top: 1px solid #0a769a;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
 						.date {
 							line-height: 21px;
 							border-left: 1px solid #0a769a;
@@ -857,6 +860,9 @@ watch(
 							border-top: 1px solid #0a769a;
 							color: #fff;
 							font-size: 20px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
 
 							.grids {
 								height: 100%;
@@ -904,6 +910,9 @@ watch(
 							height: 38px;
 							line-height: 38px;
 							font-size: 18px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
 						}
 					}
 				}
diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
index cdd23a7..c03c1dc 100644
--- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
@@ -52,6 +52,9 @@
 						:headers="headers"
 						:action="`${baseUrl}` + '/project/projectSubItem/importMpp'"
 						:on-success="uploadFileSuccess"
+						:data="{
+							engineeringSn: searchSn
+						}"
 						multiple
 						:limit="1"
 						style="margin-left: 20px"
@@ -74,6 +77,11 @@
 					<el-table-column align="center" prop="realEndTime" label="实际完成日期" width="200"></el-table-column>
 					<el-table-column align="center" prop="commander" label="负责人" width="150"></el-table-column>
 					<el-table-column align="center" prop="completeRatio" width="200" label="完成比率(%)"></el-table-column>
+					<el-table-column align="center" label="审核状态" width="150">
+						<template #default="scope">
+							<span>{{ scope.row.approvalStatus == 0 ? "未审核" : scope.row.approvalStatus == 1 ? "审核通过" : "已驳回" }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column align="center" label="状态" width="150">
 						<template #default="scope">
 							<span>{{
@@ -117,6 +125,14 @@
 								<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
 								<span>查看</span>
 							</el-button>
+							<el-button
+								v-auth="'sub_item_examine'"
+								v-if="scope.row.approvalStatus == 0"
+								type="primary"
+								link
+								@click="auditData(scope.row)"
+								><img src="@/assets/images/tableIcon/seal.png" alt="" class="configureIcon" /><span>审批</span></el-button
+							>
 						</template>
 					</el-table-column>
 					<template #empty>
@@ -251,6 +267,20 @@
 					</div>
 				</template>
 			</el-dialog>
+			<!-- 审核 -->
+			<el-dialog title="审批" width="26%" v-model="aproveVisible" show-close>
+				<div style="display: flex; align-items: center">
+					<el-icon style="color: var(--el-menu-text-color); margin: 0 12px; font-size: 20px"><WarningFilled /></el-icon>
+					<span>是否通过审批?</span>
+				</div>
+
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button class="hzCancelStyle" @click="reject">驳回</el-button>
+						<el-button type="primary" @click="onSubmit">通过</el-button>
+					</span>
+				</template>
+			</el-dialog>
 		</div>
 	</div>
 </template>
@@ -265,12 +295,46 @@ import { ElMessage, UploadProps } from "element-plus";
 import changeTheme from "@/components/changeTheme/index.vue";
 import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
-import { bigItemGovermentList, bigItemGovermentEngList, addEntBigItem, updateEntBigItem } from "@/api/modules/huizhou";
+import {
+	bigItemGovermentList,
+	bigItemGovermentEngList,
+	bigItemGovermentAudit,
+	addEntBigItem,
+	updateEntBigItem,
+	deleteEntBigItem
+} from "@/api/modules/huizhou";
+import { jxj_User } from "@/api/types";
+import { useHandleData } from "@/hooks/useHandleData";
 const rules = reactive<FormRules>({
 	name: {
 		required: true,
 		message: "请输入",
 		trigger: "blur"
+	},
+	workload: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	completeRatio: {
+		required: true,
+		message: "请输入",
+		trigger: "blur"
+	},
+	state: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planStartTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
+	},
+	planEndTime: {
+		required: true,
+		message: "请选择",
+		trigger: "change"
 	}
 });
 const ruleFormRef = ref();
@@ -342,6 +406,42 @@ const searchForm = ref({
 	realEndTime_end: "",
 	timeRange: []
 });
+const aproveVisible = ref(false);
+const rowId = ref("");
+const form = ref({
+	title: "",
+	createTime: "",
+	startTime: "",
+	endTime: ""
+});
+// 搜索用的项目sn或者工程sn
+const searchSn = ref("");
+
+// 项目或者工程名字
+const searchName = ref<string>("");
+
+const reject = async () => {
+	await bigItemGovermentAudit({ id: rowId.value, approvalStatus: 2 });
+	ElMessage.success("已驳回");
+	aproveVisible.value = false;
+	getDataList();
+};
+const onSubmit = async () => {
+	await bigItemGovermentAudit({ id: rowId.value, approvalStatus: 1 });
+	ElMessage.success("通过成功");
+	aproveVisible.value = false;
+	getDataList();
+};
+// 审核
+const auditData = async (row: any) => {
+	rowId.value = row.id;
+	aproveVisible.value = true;
+};
+// 删除
+const handleDeleteItem = async (params: jxj_User.ResUserList) => {
+	await useHandleData(deleteEntBigItem, { id: params.id }, `删除【${params.name}】`);
+	getDataList();
+};
 const handleAddSubItem = (row: any) => {
 	parentObj.value = row;
 	childrenFormData.value = reactive({
@@ -379,6 +479,8 @@ const childrenConfirm = async (formEl: FormInstance | undefined, form: any) => {
 	if (!formEl) return;
 	await formEl.validate(async (valid, fields) => {
 		if (valid) {
+			form.engineeringSn = searchSn.value;
+			console.log(form);
 			if (form.id) {
 				if (newTitle.value == "编辑子项") {
 					form.parentId = parentObj.value.parentId;
@@ -494,17 +596,6 @@ const getDataList = async () => {
 	}
 	console.log(res);
 };
-const form = ref({
-	title: "",
-	createTime: "",
-	startTime: "",
-	endTime: ""
-});
-// 搜索用的项目sn或者工程sn
-const searchSn = ref("");
-
-// 项目或者工程名字
-const searchName = ref<string>("");
 // 页面的项目名称和工程名称的div点击事件
 const onSearch = async (params: any) => {
 	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
@@ -575,9 +666,9 @@ watch(
 );
 onMounted(async () => {
 	await getEngPage();
-	onSearch(records.value[0]);
 	searchSn.value = (records.value as any[])[0].projectSn;
 	searchName.value = (records.value as any[])[0].projectName;
+	onSearch(records.value[0]);
 });
 </script>
 
diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
index afd2ac4..4ed992d 100644
--- a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue
@@ -159,7 +159,7 @@ const onSearch = async (params: any) => {
 	} else {
 		searchSn.value = params.engineeringSn;
 		searchName.value = params.engineeringName;
-		otherParams.value.engineeringSn = params.projectSn;
+		otherParams.value.engineeringSn = params.engineeringSn;
 	}
 	proTable.value.getTableList();
 };
@@ -227,8 +227,11 @@ watch(
 );
 onMounted(async () => {
 	await getEngPage();
-	searchSn.value = records.value[0].projectSn;
-	searchName.value = records.value[0].projectName;
+	searchSn.value = records.value[0].engineeringSn;
+	searchName.value = records.value[0].engineeringName;
+	otherParams.value = {
+		engineeringSn: records.value[0].engineeringSn
+	};
 	onSearch(records.value[0]);
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
index 02342bb..bbf6399 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
@@ -387,9 +387,9 @@ watch(
 );
 onMounted(async () => {
 	await getEngPage();
-	onSearch(records.value[0]);
 	searchSn.value = records.value[0].projectSn;
 	searchName.value = records.value[0].projectName;
+	onSearch(records.value[0]);
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 </script>
diff --git a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue
index adb481f..3cbbf89 100644
--- a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue
@@ -249,7 +249,7 @@ const formConfig = {
 		},
 		{
 			label: "节点负责人",
-			prop: "chargerNumber",
+			prop: "chargerName",
 			type: "input",
 			disabled: true
 		}
@@ -400,7 +400,7 @@ const getTableList = (params: any) => {
 	// } else {
 	// 	newParams.engineeringSn = searchSn.value;
 	// }
-	newParams.projectSn = searchSn.value;
+	newParams.engineeringSn = searchSn.value;
 	if (!(newParams.projectSn || newParams.engineeringSn)) {
 		return;
 	}
@@ -472,7 +472,7 @@ const handleItemDetail = async (row: any) => {
 };
 // 新增，编辑数据
 const saveItem = async (form: any) => {
-	form.projectSn = searchSn.value;
+	form.engineeringSn = searchSn.value;
 	if (form.id && title.value != "查看") {
 		// console.log(form.dictCode);
 		const res = await globalPlanGovermentEdit(form);
@@ -507,9 +507,9 @@ watch(
 onMounted(async () => {
 	getDicMainList();
 	await getEngPage();
-	onSearch(records.value[0]);
 	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
 	searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
+	onSearch(records.value[0]);
 });
 </script>
 
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
index bdf1ca3..1c20b2a 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/components/transformInfo1.vue
@@ -27,9 +27,8 @@
 					<el-table-column type="index" label="序号" width="80"> </el-table-column>
 					<el-table-column prop="reportContent" label="汇报内容" align="left"> </el-table-column>
 					<el-table-column prop="totalAmount" label="总工程造价(元)">
-						<template #default="scope">
+						<template #default="scope" v-auth="'investment_apply_add'">
 							<el-input
-								disabled
 								v-if="scope.row.symbolSum && countData"
 								v-model.number="countData[scope.row.key]"
 								placeholder="请输入"
@@ -75,7 +74,7 @@
 			<el-table
 				:data="recordItemData"
 				class="el-table"
-				height="100%"
+				height="350"
 				:row-style="{ height: '40px' }"
 				:header-cell-style="{ textAlign: 'center', height: '40px' }"
 				:cell-style="{ textAlign: 'center', height: '40px' }"
@@ -150,7 +149,15 @@ import { onMounted, ref, watch, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import { relativeInfo, timeLineData, submitReform, submitAll } from "@/api/modules/project";
-import { payGovermentSubItemList, payGovermentSubItemCount, payGovermentSubItemDetail } from "@/api/modules/huizhou";
+import {
+	payGovermentSubItemList,
+	payGovermentSubItemCount,
+	payGovermentSubItemDetail,
+	entPaySubItemAdd,
+	entPayCountAdd,
+	entPayCountEdit,
+	entSubItemDetailAdd
+} from "@/api/modules/huizhou";
 import { CirclePlus } from "@element-plus/icons-vue";
 import DialogForm from "@/components/DialogForm/index.vue";
 const addVisible = ref(false);
@@ -415,7 +422,8 @@ const formData2 = ref({
 const baseUrl = import.meta.env.VITE_API_URL;
 const props = defineProps({
 	detailsDialog: Boolean,
-	relativeId: String
+	relativeId: String,
+	searchSn: String
 });
 const emits = defineEmits(["update:detailsDialog", "confirm"]);
 const visible1 = ref(false);
@@ -465,25 +473,44 @@ const openAdd2 = (row: object) => {
 	});
 	addVisible2.value = true;
 };
+// const submitCount = async () => {
+// 	// 数据提交
+// 	console.log(countData.value);
+// 	console.log(recordData.value);
+// 	let isAdd = true;
+// 	for (let i in countData.value) {
+// 		if (i == "constructionCost" || i == "payment" || i == "advanceCharge" || i == "unPayment" || i == "applyPayment") {
+// 			if (countData.value[i] || countData.value[i] != 0) {
+// 				isAdd = false;
+// 				break;
+// 			}
+// 		}
+// 	}
+// 	if (isAdd) {
+// 		const res = await payCountAdd(countData.value);
+// 		ElMessage.success("新增成功");
+// 		getSubItemList();
+// 	} else {
+// 		const res = await payCountEdit(countData.value);
+// 		ElMessage.success("编辑成功");
+// 		getSubItemList();
+// 	}
+// };
 const submitCount = async () => {
 	// 数据提交
 	console.log(countData.value);
 	console.log(recordData.value);
-	let isAdd = true;
-	for (let i in countData.value) {
-		if (i == "constructionCost" || i == "payment" || i == "advanceCharge" || i == "unPayment" || i == "applyPayment") {
-			if (countData.value[i] || countData.value[i] != 0) {
-				isAdd = false;
-				break;
-			}
-		}
-	}
-	if (isAdd) {
-		const res = await payCountAdd(countData.value);
+	let requestData = {
+		...countData.value,
+		investmentApplyId: props.relativeId,
+		engineeringSn: props.searchSn
+	};
+	if (!countData.value.id) {
+		const res = await entPayCountAdd(requestData);
 		ElMessage.success("新增成功");
 		getSubItemList();
 	} else {
-		const res = await payCountEdit(countData.value);
+		const res = await entPayCountEdit(requestData);
 		ElMessage.success("编辑成功");
 		getSubItemList();
 	}
@@ -492,9 +519,10 @@ const submitCount = async () => {
 const saveItem = async (form: any) => {
 	let requestData = {
 		investmentApplyId: props.relativeId,
-		...form
+		...form,
+		engineeringSn: props.searchSn
 	};
-	const res = await paySubItemAdd(requestData);
+	const res = await entPaySubItemAdd(requestData);
 	getSubItemList();
 	ElMessage.success("新增成功");
 	addVisible.value = false;
@@ -505,7 +533,7 @@ const saveItem2 = async (form: any) => {
 		parentId: detailsData.value.id,
 		itemId: rowDetailId.value
 	};
-	const res = await subItemDetailAdd(requestData);
+	const res = await entSubItemDetailAdd(requestData);
 	getSubDetailList(rowDetailId.value);
 	ElMessage.success("新增成功");
 	addVisible2.value = false;
diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
index 2bae8f0..072a17e 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
@@ -68,7 +68,7 @@
 				>
 				</DialogForm>
 				<!-- 投资支付详情 -->
-				<transformInfo1 v-model:detailsDialog="detailsDialog" :relativeId="relativeId"></transformInfo1>
+				<transformInfo1 v-model:detailsDialog="detailsDialog" :relativeId="relativeId" :searchSn="searchSn"></transformInfo1>
 			</div>
 		</div>
 	</div>
@@ -104,6 +104,20 @@ const formConfig = {
 			type: "date",
 			format: "YYYY-MM-DD",
 			valueFormat: "YYYY-MM-DD"
+		},
+		{
+			label: "申报时段开始时间",
+			prop: "applyStartTime",
+			type: "date",
+			format: "YYYY-MM-DD",
+			valueFormat: "YYYY-MM-DD"
+		},
+		{
+			label: "申报时段结束时间",
+			prop: "applyEndTime",
+			type: "date",
+			format: "YYYY-MM-DD",
+			valueFormat: "YYYY-MM-DD"
 		}
 	],
 	rules: {
@@ -120,7 +134,21 @@ const formConfig = {
 				message: "请选择",
 				trigger: "change"
 			}
-		]
+		],
+		applyStartTime: [
+			{
+				required: true,
+				message: "请选择",
+				trigger: "change"
+			}
+		],
+		applyEndTime: [
+			{
+				required: true,
+				message: "请选择",
+				trigger: "change"
+			}
+		],
 	}
 };
 const formData = ref({
@@ -198,6 +226,7 @@ const onCurChange = async (params: number) => {
 	pages.value.total = +res.result.total;
 };
 const saveItem = async (form: any) => {
+	form.engineeringSn = searchSn.value;
 	if (form.id) {
 		const res = await applyTimeAdd(form);
 		proTable.value.getTableList();
@@ -304,9 +333,9 @@ watch(
 );
 onMounted(async () => {
 	await getEngPage();
-	onSearch(records.value[0]);
 	searchSn.value = records.value[0].projectSn;
 	searchName.value = records.value[0].projectName;
+	onSearch(records.value[0]);
 });
 </script>
 <style scoped lang="scss">
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
index 26af6c2..777c716 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
@@ -3,9 +3,9 @@
 	<el-dialog class="report" :title="title" style="min-width: 1680px" v-model="visible1" @close="closeMain">
 		<Steps class="steps" :datas="datas" :active="active" />
 
-		<!-- <keep-alive> -->
-		<component v-if="visible1" :is="Components[active]" @next="next" @prev="active--"></component>
-		<!-- </keep-alive> -->
+		<keep-alive>
+			<component :is="Components[active]" @next="next" @prev="active--"></component>
+		</keep-alive>
 	</el-dialog>
 	<!-- </div> -->
 </template>
diff --git a/src/views/goverment/huizhou/projectList/components/editDialog/index.vue b/src/views/goverment/huizhou/projectList/components/editDialog/index.vue
index 91ce359..cef021c 100644
--- a/src/views/goverment/huizhou/projectList/components/editDialog/index.vue
+++ b/src/views/goverment/huizhou/projectList/components/editDialog/index.vue
@@ -1,27 +1,27 @@
 <template>
-	<el-dialog title="编辑工程信息" width="60%" v-model="visible1" show-close>
+	<el-dialog title="编辑项目信息" width="60%" v-model="visible1" show-close>
 		<div class="overview">
 			<div class="littleTitle">概况信息</div>
 			<el-form ref="formRef" :model="editFormData" label-width="150px" class="form" size="default">
 				<!-- <el-form-item label="项目名称:">
 					<el-input v-model="editProjectName" disabled />
 				</el-form-item> -->
-				<el-form-item label="工程名称:">
+				<el-form-item label="项目名称:">
 					<el-input v-model="editFormData.engineeringName" />
 				</el-form-item>
 				<div class="row">
-					<el-form-item label="工程编码:">
+					<el-form-item label="项目编码:">
 						<el-input v-model="editFormData.engineeringCode" />
 					</el-form-item>
-					<el-form-item label="工程造价（万元）:">
+					<el-form-item label="项目造价（万元）:">
 						<el-input v-model="editFormData.engineeringCost" />
 					</el-form-item>
 				</div>
 				<div class="row">
-					<el-form-item label="工程总面积（㎡）:">
+					<el-form-item label="项目总面积（㎡）:">
 						<el-input v-model="editFormData.engineeringArea" />
 					</el-form-item>
-					<el-form-item label="工程总长度（m）:">
+					<el-form-item label="项目总长度（m）:">
 						<el-input v-model="editFormData.engineeringLength" />
 					</el-form-item>
 				</div>
@@ -62,7 +62,7 @@
 				</div>
 				<div class="littleTitle" style="margin-left: -10%">补录信息</div>
 				<div class="row">
-					<el-form-item label="是否重点工程:">
+					<el-form-item label="是否重点项目:">
 						<el-radio-group v-model="editFormData.isImportant">
 							<el-radio :label="1">是</el-radio>
 							<el-radio :label="0">否</el-radio>
@@ -70,7 +70,7 @@
 					</el-form-item>
 				</div>
 				<div class="row">
-					<el-form-item label="工程类别:">
+					<el-form-item label="项目类别:">
 						<el-select class="select" v-model="editFormData.engineeringType">
 							<el-option
 								v-for="item in engineeringTypeOptions"
@@ -80,7 +80,7 @@
 							/>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="工程用途:">
+					<el-form-item label="项目用途:">
 						<el-select class="select" v-model="editFormData.engineeringUse">
 							<el-option
 								v-for="item in engineeringPurpose"
@@ -111,10 +111,10 @@
 					</el-form-item>
 				</div>
 				<div class="row">
-					<el-form-item label="安全监督工程状态:">
+					<el-form-item label="安全监督项目状态:">
 						<el-input v-model="editFormData.safetySupervisionState"> </el-input>
 					</el-form-item>
-					<el-form-item label="质量监督工程状态:">
+					<el-form-item label="质量监督项目状态:">
 						<el-input v-model="editFormData.qualitySupervisionState"> </el-input>
 					</el-form-item>
 				</div>
@@ -174,7 +174,7 @@ const getDataDetail = async () => {
 	};
 	const data = await getDicList({ dictType: "engineering_type" });
 	engineeringTypeOptions.value = data.result;
-	const res = await getDicList({ dictType: "engineering_purpose" }); //工程用途
+	const res = await getDicList({ dictType: "engineering_purpose" }); //项目用途
 	engineeringPurpose.value = res.result;
 };
 watch(
diff --git a/src/views/goverment/huizhou/projectList/index.vue b/src/views/goverment/huizhou/projectList/index.vue
index 76daea7..e19fb51 100644
--- a/src/views/goverment/huizhou/projectList/index.vue
+++ b/src/views/goverment/huizhou/projectList/index.vue
@@ -73,12 +73,12 @@ const columns: ColumnProps[] = [
 	{ type: "index", label: "序号", width: 80 },
 	{
 		prop: "engineeringName",
-		label: "工程名称",
+		label: "项目名称",
 		search: { el: "input" }
 	},
 	{
 		prop: "engineeringCode",
-		label: "工程编号",
+		label: "项目编号",
 		search: { el: "input" }
 	},
 	// 多级 prop
@@ -90,14 +90,14 @@ const columns: ColumnProps[] = [
 	},
 	{
 		prop: "engineeringType",
-		label: "工程类型",
+		label: "项目类型",
 		enum: DicTypeList.value,
 		search: { el: "select", props: { filterable: true } },
 		fieldNames: { label: "dictValue", value: "dictLabel" }
 	},
 	{
 		prop: "state",
-		label: "工程状态",
+		label: "项目状态",
 		enum: DicStatusList.value,
 		search: { el: "select", props: { filterable: true } },
 		fieldNames: { label: "dictValue", value: "dictLabel" }
diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
index 90aea3c..02bcd20 100644
--- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
@@ -171,29 +171,72 @@
 				</div>
 				<div class="situation">
 					<span>整改情况</span>
+					<el-button
+						class="btnStyle"
+						type="success"
+						@click="addSituation"
+						v-if="recordRowData.state === 1 || recordRowData.state === 4"
+						>新增整改记录</el-button
+					>
 				</div>
 				<div class="situation-step">
 					<el-timeline>
 						<el-timeline-item :timestamp="item.createTime" placement="top" v-for="(item, index) in timelineList" :key="index">
 							<div class="row">
 								<span>整改人:</span>
-								<span>{{ item.solveBy }}</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.solveBy" placeholder="请输入" />
+								</template>
+								<span v-else>{{ item.solveBy }}</span>
+							</div>
+							<div class="row">
+								<span>整改日期:</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-date-picker
+										v-model="reformInfo.solveTime"
+										type="datetime"
+										style="width: 100%"
+										placeholder="请选择日期"
+										format="YYYY-MM-DD HH:mm:ss"
+										value-format="YYYY-MM-DD HH:mm:ss"
+									/>
+								</template>
+								<span v-else>{{ item.solveTime }}</span>
+							</div>
+							<div class="row">
+								<span>措施建议:</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.recommend" type="textarea" :rows="2" placeholder="请输入" />
+								</template>
+								<span v-else>{{ item.recommend }}</span>
 							</div>
 							<div class="row">
 								<span>整改回复:</span>
-								<span>{{ item.solveDesc }}</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.solveDesc" type="textarea" :rows="2" placeholder="请输入" />
+								</template>
+								<span v-else>{{ item.solveDesc }}</span>
 							</div>
 							<div class="row">
 								<span>整改照片:</span>
-								<div class="imgList">
-									<el-image
-										:src="item2.url"
-										fit="fill"
-										v-for="(item2, index) in item.solveImage"
-										:key="index"
-										:preview-src-list="[item2.url]"
+								<div class="face-img" v-if="item.type && item.type == 'insert'">
+									<div class="imgList" v-if="reformInfo.solveImage.length > 0">
+										<img :src="item.url" class="face-avatar" v-for="(item, index) in reformInfo.solveImage" :key="index" />
+									</div>
+									<el-upload
+										class="face-uploader"
+										:action="`${baseUrl}` + '/xmgl/file/upload'"
+										:show-file-list="false"
+										:on-success="handleAvatarSuccess"
+										accept="image/jpg, image/jpeg, image/png"
 									>
-									</el-image>
+										<el-icon>
+											<plus />
+										</el-icon>
+									</el-upload>
+								</div>
+								<div class="imgList" v-else-if="Array.isArray(item.solveImage)">
+									<img :src="item2.url" alt="" v-for="(item2, index) in item.solveImage" :key="index" />
 								</div>
 							</div>
 							<div class="row" v-if="item.suggest">
@@ -203,11 +246,15 @@
 							<div
 								class="status-name"
 								:style="{ color: item.examineState === 0 ? '#008BFF' : item.examineState === 1 ? '#30AC7C' : '#F64D31' }"
+								v-if="!item.type"
 							>
 								{{ item.examineState == 0 ? "待审核" : item.examineState == 1 ? "已通过" : "已驳回" }}
 							</div>
-							<div class="status-operate" v-if="item.examineState === 0">
-								<el-button type="primary" @click="singleAudit(item)">审核</el-button>
+							<!-- <div class="status-operate" v-if="item.examineState === 0">
+								<el-button type="primary" @click="auditVisible = true">审核</el-button>
+							</div> -->
+							<div class="status-operate" v-if="item.type">
+								<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
 							</div>
 						</el-timeline-item>
 					</el-timeline>
@@ -236,6 +283,7 @@ import { onMounted, ref, watch, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment";
+import { submitReform } from "@/api/modules/project";
 const props = defineProps({
 	detailsDialog: Boolean,
 	relativeId: String
@@ -253,6 +301,41 @@ const singleData = ref(); // 单个整改情况数据
 const auditForm = ref({
 	content: ""
 });
+const timelineList = ref([{ name: 1 }]);
+const reformInfo = ref({
+	solveBy: "",
+	solveTime: "",
+	solveDesc: "",
+	recommend: "",
+	solveImage: []
+});
+const baseUrl = import.meta.env.VITE_API_URL;
+// 提交整改情况
+const submitForm = async () => {
+	reformInfo.value.solveImage = JSON.stringify(reformInfo.value.solveImage);
+	let requestData = {
+		...reformInfo.value,
+		inspectQuestionId: recordRowData.value.id
+	};
+	const res = await submitReform(requestData);
+	timelineList.value.shift();
+	getInfo();
+	getTimeLineList();
+	closeSecondary();
+	ElMessage.success("提交成功");
+};
+const addSituation = () => {
+	timelineList.value.unshift({
+		type: "insert"
+	});
+};
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+	reformInfo.value.solveImage.push({
+		url: response.result.url
+	});
+};
 // 单项审核提交
 const singleAuditSubmit = async index => {
 	if (index == 1) {
@@ -322,6 +405,14 @@ const rowClick = row => {
 		"min-width": "824px",
 		transform: "translateX(-170px)"
 	};
+	reformInfo.value = reactive({
+		solveBy: "",
+		solveTime: "",
+		solveDesc: "",
+		recommend: "",
+		solveImage: []
+	});
+	// 全部
 	getTimeLineList();
 };
 // 相关信息接口调用
@@ -334,7 +425,6 @@ const getInfo = async () => {
 	});
 	console.log(recordData);
 };
-const timelineList = ref([{ name: 1 }]);
 // 获取整改情况时间轴列表
 const getTimeLineList = async () => {
 	const res = await timeLineData({ inspectQuestionId: recordRowData.value.id });
@@ -450,7 +540,8 @@ onMounted(() => {});
 		top: 0;
 		right: -460px;
 		width: 380px;
-		height: 650px;
+		// height: 650px;
+		height: calc(100% - 31px);
 		min-width: 420px;
 		background: var(--el-menu-bg-color);
 		box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
@@ -488,6 +579,11 @@ onMounted(() => {});
 					height: 53px;
 					margin-right: 15px;
 				}
+				img {
+					width: 95px;
+					height: 53px;
+					margin-right: 15px;
+				}
 			}
 			.face-img {
 				width: 100%;
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
index 6047cc2..6eb0cc5 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
@@ -166,29 +166,70 @@
 				</div>
 				<div class="situation">
 					<span>整改情况</span>
+					<el-button
+						class="btnStyle"
+						type="success"
+						@click="addSituation"
+						v-if="recordRowData.state === 1 || recordRowData.state === 4"
+						>新增整改记录</el-button
+					>
 				</div>
 				<div class="situation-step">
 					<el-timeline>
 						<el-timeline-item :timestamp="item.createTime" placement="top" v-for="(item, index) in timelineList" :key="index">
 							<div class="row">
 								<span>整改人:</span>
-								<span>{{ item.solveBy }}</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.solveBy" placeholder="请输入" v-if="item.type && item.type == 'insert'" />
+								</template>
+								<span v-else>{{ item.solveBy }}</span>
+							</div>
+							<div class="row">
+								<span>整改日期:</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-date-picker
+										v-model="reformInfo.solveTime"
+										type="datetime"
+										style="width: 100%"
+										placeholder="请选择日期"
+										format="YYYY-MM-DD HH:mm:ss"
+										value-format="YYYY-MM-DD HH:mm:ss"
+									/>
+								</template>
+								<span v-else>{{ item.solveTime }}</span>
+							</div>
+							<div class="row">
+								<span>措施建议:</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.recommend" type="textarea" :rows="2" placeholder="请输入" />
+								</template>
+								<span v-else>{{ item.recommend }}</span>
 							</div>
 							<div class="row">
 								<span>整改回复:</span>
-								<span>{{ item.solveDesc }}</span>
+								<template v-if="item.type && item.type == 'insert'">
+									<el-input v-model="reformInfo.solveDesc" type="textarea" :rows="2" placeholder="请输入" />
+								</template>
+								<span v-else>{{ item.solveDesc }}</span>
 							</div>
 							<div class="row">
 								<span>整改照片:</span>
-								<div class="imgList">
-									<el-image
-										:src="item2.url"
-										fit="fill"
-										v-for="(item2, index) in item.solveImage"
-										:key="index"
-										:preview-src-list="[item2.url]"
+								<div class="face-img" v-if="item.type && item.type == 'insert'">
+									<div class="imgList" v-if="reformInfo.solveImage.length > 0">
+										<img :src="item.url" class="face-avatar" v-for="(item, index) in reformInfo.solveImage" :key="index" />
+									</div>
+									<el-upload
+										class="face-uploader"
+										:action="`${baseUrl}` + '/xmgl/file/upload'"
+										:show-file-list="false"
+										:on-success="handleAvatarSuccess"
+										accept="image/jpg, image/jpeg, image/png"
 									>
-									</el-image>
+										<el-icon><plus /></el-icon>
+									</el-upload>
+								</div>
+								<div class="imgList" v-else-if="Array.isArray(item.solveImage)">
+									<img :src="item2.url" alt="" v-for="(item2, index) in item.solveImage" :key="index" />
 								</div>
 							</div>
 							<div class="row" v-if="item.suggest">
@@ -198,11 +239,15 @@
 							<div
 								class="status-name"
 								:style="{ color: item.examineState === 0 ? '#008BFF' : item.examineState === 1 ? '#30AC7C' : '#F64D31' }"
+								v-if="!item.type"
 							>
 								{{ item.examineState == 0 ? "待审核" : item.examineState == 1 ? "已通过" : "已驳回" }}
 							</div>
-							<div class="status-operate" v-if="item.examineState === 0">
-								<el-button type="primary" @click="singleAudit(item)">审核</el-button>
+							<!-- <div class="status-operate" v-if="item.examineState === 0">
+								<el-button type="primary" @click="auditVisible = true">审核</el-button>
+							</div> -->
+							<div class="status-operate" v-if="item.type">
+								<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
 							</div>
 						</el-timeline-item>
 					</el-timeline>
@@ -231,6 +276,7 @@ import { onMounted, ref, watch, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment";
+import { submitReform } from "@/api/modules/project";
 const baseUrl = import.meta.env.VITE_API_URL;
 const props = defineProps({
 	detailsDialog: Boolean,
@@ -247,13 +293,41 @@ const dialogStyle = ref({
 });
 const reformInfo = ref({
 	solveBy: "",
+	solveTime: "",
 	solveDesc: "",
+	recommend: "",
 	solveImage: []
 });
 const singleData = ref(); // 单个整改情况数据
 const auditForm = ref({
 	content: ""
 });
+// 提交整改情况
+const submitForm = async () => {
+	reformInfo.value.solveImage = JSON.stringify(reformInfo.value.solveImage);
+	let requestData = {
+		...reformInfo.value,
+		inspectQuestionId: recordRowData.value.id
+	};
+	const res = await submitReform(requestData);
+	timelineList.value.shift();
+	getTimeLineList();
+	closeSecondary();
+	getInfo();
+	ElMessage.success("提交成功");
+};
+// 图片上传成功后的钩子
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+	console.log(response.result.url);
+	reformInfo.value.solveImage.push({
+		url: response.result.url
+	});
+};
+const addSituation = () => {
+	timelineList.value.unshift({
+		type: "insert"
+	});
+};
 // 单项审核提交
 const singleAuditSubmit = async index => {
 	if (index == 1) {
@@ -324,6 +398,13 @@ const rowClick = row => {
 		"min-width": "824px",
 		transform: "translateX(-170px)"
 	};
+	reformInfo.value = reactive({
+		solveBy: "",
+		solveTime: "",
+		solveDesc: "",
+		recommend: "",
+		solveImage: []
+	});
 	getTimeLineList();
 };
 // 相关信息接口调用
@@ -451,7 +532,8 @@ onMounted(() => {});
 		top: 0;
 		right: -460px;
 		width: 380px;
-		height: 650px;
+		// height: 650px;
+		height: calc(100% - 31px);
 		min-width: 420px;
 		background: var(--el-menu-bg-color);
 		box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
@@ -489,6 +571,11 @@ onMounted(() => {});
 					height: 53px;
 					margin-right: 15px;
 				}
+				img {
+					width: 95px;
+					height: 53px;
+					margin-right: 15px;
+				}
 			}
 			.face-img {
 				width: 100%;
diff --git a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
index b52f892..f9174a9 100644
--- a/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/hz-enterprise/progressManagement/subItemManagement/index.vue
@@ -360,7 +360,7 @@ const onCurChange = async (params: number) => {
 	records.value = result.records;
 	pages.value.total = +result.total;
 };
-// 删除用户信息
+// 删除
 const handleDeleteItem = async (params: jxj_User.ResUserList) => {
 	await useHandleData(deleteEntBigItem, { id: params.id }, `删除【${params.name}】`);
 	getDataList();