From c4c74ae3afa4662c775e68895c4fde4d8c32976c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 1 Sep 2023 09:34:04 +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

---
 .../components/ProjectSupervision/duty.vue        |  3 ++-
 .../components/ProjectSupervision/index.vue       |  1 +
 .../components/ProjectSupervision/overview.vue    |  5 +++++
 src/views/goverment/huizhou/projectList/index.vue | 15 ++++++++++-----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/duty.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/duty.vue
index e90054f..65599db 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/duty.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/duty.vue
@@ -86,7 +86,8 @@ onMounted(async () => {
 			let curr = store.Message.engineeringMains.find(main => item.type == main.type);
 			if ("contractType" in item) {
 				return (curr = {
-					enterpriseSn: curr.enterpriseName,
+					...curr,
+					enterpriseSn: curr.enterpriseSn,
 					creditCode: curr.creditCode,
 					legalPerson: curr.legalPerson,
 					legalPersonTel: curr.legalPersonTel,
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
index 98abc2a..f1ce4db 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
@@ -93,6 +93,7 @@ watch(visible1, (n, o) => {
 	emits("update:detailsDialog", n);
 });
 onMounted(() => {
+	console.log(666);
 	// console.log(router.params);
 });
 onUnmounted(() => {
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
index 0a3b309..10f7ff4 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
@@ -347,6 +347,11 @@ onMounted(async () => {
 	engineeringPurpose.value = res.result;
 	const res1 = await getDicList({ dictType: "structural_style" });
 	structuralStyle.value = res1.result;
+	if (store.Message) {
+		form.value = store.Message;
+		form.value.position = "经度：" + store.Message.longitude + " 纬度：" + store.Message.latitude;
+		addressList.value = store.Message;
+	}
 	// if (store.Message) {
 	// 	form.value = store.Message;
 	// 	addressList.value = store.Message;
diff --git a/src/views/goverment/huizhou/projectList/index.vue b/src/views/goverment/huizhou/projectList/index.vue
index e4e01ff..8f9f432 100644
--- a/src/views/goverment/huizhou/projectList/index.vue
+++ b/src/views/goverment/huizhou/projectList/index.vue
@@ -63,7 +63,7 @@ import ProTable from "@/components/ProTable/index.vue";
 import ProjectSupervision from "./components/ProjectSupervision/index.vue";
 import readonlyDialog from "./components/readonlyDialog/index.vue";
 import editDialog from "./components/editDialog/index.vue";
-import { getEngineeringApproveList, getEngineeringApproveArea } from "@/api/modules/goverment";
+import { getEngineeringApproveList, getEngineeringApproveArea, getIdEngApproveList } from "@/api/modules/goverment";
 import { getDicList } from "@/api/modules/jxjview";
 import { GlobalStore } from "@/stores";
 import largeScreen from "../../../hz-enterprise/largeScreen/largeScreenOne/index.vue";
@@ -144,10 +144,6 @@ const toScreen = row => {
 	}
 	showScreen.value = !showScreen.value;
 };
-const onEdit = row => {
-	relativeId.value = row.id;
-	editennMEssageVisible.value = true;
-};
 const getDicStatusList = async () => {
 	const { result } = await getDicList({ dictType: "engineering_state" });
 	DicStatusList.value.length = 0;
@@ -174,6 +170,15 @@ const handleAddItem = () => {
 	approvalTitle.value = "新增";
 	detailsDialog.value = true;
 };
+// 编辑项目
+const onEdit = async row => {
+	const res = await getIdEngApproveList({ id: row.id });
+	store.Message = res.result;
+	approvalTitle.value = "编辑";
+	detailsDialog.value = true;
+	// relativeId.value = row.id;
+	// editennMEssageVisible.value = true;
+};
 const getTableList = (params: any) => {
 	let newParams = JSON.parse(JSON.stringify(params));
 	console.log(newParams);