From f04dc15b4aa9fed4f08028fbf13b7f6e1a65d1b5 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 12 Oct 2023 17:35:23 +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

---
 .../company/components/editForm/basic-form.vue   |  6 +++---
 .../company/components/editForm/index.vue        | 16 ++++++++--------
 .../company/components/editForm/unit-table.vue   |  2 +-
 src/views/goverment/approve/company/index.vue    |  7 +++++++
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/goverment/approve/company/components/editForm/basic-form.vue b/src/views/goverment/approve/company/components/editForm/basic-form.vue
index 665ddbd..8679857 100644
--- a/src/views/goverment/approve/company/components/editForm/basic-form.vue
+++ b/src/views/goverment/approve/company/components/editForm/basic-form.vue
@@ -161,7 +161,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, reactive, watch } from "vue";
+import { ref, onBeforeMount, reactive, watch } from "vue";
 import AMap from "@/components/AMap/AMap.vue";
 import { ruleForm, rules } from "./basic-form";
 import { ElMessage, FormInstance } from "element-plus";
@@ -265,11 +265,11 @@ const reset = () => {
 	ruleForm.latitude = ""; //维度
 	ruleForm.businessLicenseOriginalName = "";
 };
-
-onMounted(async () => {
+onBeforeMount(async () => {
 	const res = await goverMentlist();
 	// @ts-expect-error
 	governNameList.value = res.result;
+	console.log(globalStore.Message, "-----qy");
 	if (globalStore.Message) {
 		ruleForm.value = globalStore.Message;
 		ruleForm.value.position = "经度：" + ruleForm.value.longitude + " 纬度：" + ruleForm.value.latitude;
diff --git a/src/views/goverment/approve/company/components/editForm/index.vue b/src/views/goverment/approve/company/components/editForm/index.vue
index 7314844..2d790f4 100644
--- a/src/views/goverment/approve/company/components/editForm/index.vue
+++ b/src/views/goverment/approve/company/components/editForm/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, onBeforeMount } from "vue";
 import { useRouter } from "vue-router";
 import Setps from "@/components/Steps/setps.vue";
 import BasicForm from "./basic-form.vue";
@@ -22,7 +22,7 @@ import type { RuleFormData } from "./basic-form.vue";
 import type { EnterpriseMains } from "./entrepreneur.vue";
 import { ElMessage } from "element-plus";
 import { GlobalStore } from "@/stores";
-import { getIdCompanyDetail } from "@/api/modules/goverment";
+// import { getIdCompanyDetail } from "@/api/modules/goverment";
 const globalStore = GlobalStore();
 const router = useRouter();
 const emits = defineEmits(["confirm"]);
@@ -93,12 +93,12 @@ const onSubmit = async () => {
 		// router.replace("/login");
 	}
 };
-onMounted(async () => {
-	const { result } = await getIdCompanyDetail({ enterpriseId: props.id });
-	console.log(result);
-	if (result) {
-		globalStore.Message = result;
-	}
+onBeforeMount(async () => {
+	// const { result } = await getIdCompanyDetail({ enterpriseId: props.id });
+	// console.log(result);
+	// if (result) {
+	// 	globalStore.Message = result;
+	// }
 	// console.log(router.params);
 });
 </script>
diff --git a/src/views/goverment/approve/company/components/editForm/unit-table.vue b/src/views/goverment/approve/company/components/editForm/unit-table.vue
index fa98bcb..2f1d4bc 100644
--- a/src/views/goverment/approve/company/components/editForm/unit-table.vue
+++ b/src/views/goverment/approve/company/components/editForm/unit-table.vue
@@ -61,7 +61,7 @@
 						>
 							<el-button plain color="#47A99D" size="small">选择文件</el-button>
 							<template #tip>
-								<div v-show="!row.fileList.length" style="margin-left: 10px; margin-top: 10px; color: #aeaeae">
+								<div v-show="row.fileList && !row.fileList.length" style="margin-left: 10px; margin-top: 10px; color: #aeaeae">
 									未选择任何文件
 								</div>
 							</template>
diff --git a/src/views/goverment/approve/company/index.vue b/src/views/goverment/approve/company/index.vue
index 26d0c49..0912c7e 100644
--- a/src/views/goverment/approve/company/index.vue
+++ b/src/views/goverment/approve/company/index.vue
@@ -204,6 +204,8 @@ import { getDicList } from "@/api/modules/jxjview";
 import { getCompanyApproveList, getIdCompanyList, getIdCompanyDetail, editCompanyApprove } from "@/api/modules/goverment";
 import { Base64 } from "js-base64";
 import editForm from "./components/editForm/index.vue";
+import { GlobalStore } from "@/stores";
+const globalStore = GlobalStore();
 
 const router = useRouter();
 const rowObj = ref();
@@ -238,6 +240,11 @@ getDicMainList();
 
 // 修改数据按钮
 const handleEditItem = async (row: any) => {
+	const { result } = await getIdCompanyDetail({ enterpriseId: row.enterpriseId });
+	console.log(result);
+	if (result) {
+		globalStore.Message = result;
+	}
 	editVisible.value = true;
 	rowObj.value = row;
 };