From 56cb274fd7cf7f479c25dca9df48f2279d7de98d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 23 Aug 2023 18:32: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

---
 .../unitScore/components/scoreTableNew.vue    |  9 +++++---
 .../components/ProjectSupervision/index.vue   |  4 ++--
 .../ProjectSupervision/overview.vue           | 23 +++++++++++--------
 .../goverment/huizhou/projectList/index.vue   |  1 +
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue
index 3d00c41..62a09e1 100644
--- a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue
+++ b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="origin-table">
-		<div class="table-head-one">审图单位服务考核评分表</div>
+		<div class="table-head-one">{{ formData.enterpriseTypeName }}服务考核评分表</div>
 		<div class="table-head-two">
 			<div><span>服务单位名称</span></div>
 			<div class="form-element">
@@ -15,13 +15,14 @@
 			</div>
 			<div><span>填表时间</span></div>
 			<div class="form-element-date">
-				<el-date-picker
+				<!-- <el-date-picker
 					type="date"
 					format="YYYY-MM-DD"
 					value-format="YYYY-MM-DD"
 					v-model="formData.scoreTime"
 					placeholder="请选择"
-				/>
+				/> -->
+				<span>{{ formData.scoreTime }}</span>
 			</div>
 		</div>
 		<div class="table-head-three">
@@ -128,6 +129,7 @@ import { onMounted, ref, watch, reactive } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import type { FormInstance, UploadProps } from "element-plus";
 import { scoreSubItemList, scoreDetail, noScoreDetail, addScoreDetail, updateScoreDetail } from "@/api/modules/huizhou";
+import dayjs from "dayjs";
 const formData = ref({});
 const emits = defineEmits(["confirm"]);
 const props = defineProps(["relativeInfo"]);
@@ -297,6 +299,7 @@ onMounted(async () => {
 	if (formData.value.startTime) {
 		formData.value.timeRange = [formData.value.startTime, formData.value.endTime];
 	}
+	formData.value.scoreTime = dayjs().format("YYYY-MM-DD");
 	console.log(formData.value);
 });
 </script>
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
index 777c716..98abc2a 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/index.vue
@@ -1,9 +1,9 @@
 <template>
 	<!-- <div class="report"> -->
-	<el-dialog class="report" :title="title" style="min-width: 1680px" v-model="visible1" @close="closeMain">
+	<el-dialog class="report" :title="title" style="min-width: 1390px" v-model="visible1" @close="closeMain">
 		<Steps class="steps" :datas="datas" :active="active" />
 
-		<keep-alive>
+		<keep-alive v-if="visible1">
 			<component :is="Components[active]" @next="next" @prev="active--"></component>
 		</keep-alive>
 	</el-dialog>
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
index e63f95b..30cff5d 100644
--- a/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
+++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervision/overview.vue
@@ -247,7 +247,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, nextTick, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
 import { form, reset, rules } from "./overview";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -337,8 +337,8 @@ const next = async (formEl: FormInstance | undefined, params: any) => {
 		}
 	});
 };
-
 onMounted(async () => {
+	ruleFormRef.value?.clearValidate();
 	// const res2 = await getEngineeringName();
 	// form.value.projectName = res2.result.projectName; //获取项目名称
 	const data = await getDicList({ dictType: "engineering_type" });
@@ -347,10 +347,18 @@ onMounted(async () => {
 	engineeringPurpose.value = res.result;
 	const res1 = await getDicList({ dictType: "structural_style" });
 	structuralStyle.value = res1.result;
-	if (store.Message) {
-		form.value = store.Message;
-		addressList.value = store.Message;
-	}
+	// if (store.Message) {
+	// 	form.value = store.Message;
+	// 	addressList.value = store.Message;
+	// } else {
+	// 	form.value = {};
+	// 	addressList.value = {
+	// 		province: "",
+	// 		city: "",
+	// 		area: "",
+	// 		district: ""
+	// 	};
+	// }
 });
 onUnmounted(() => {
 	ruleFormRef.value?.clearValidate();
@@ -360,9 +368,6 @@ onUnmounted(() => {
 
 <style lang="scss" scoped>
 @import "./overview.scss";
-.test :deep(.el-input__wrapper) {
-	box-shadow: 0 0 0 0;
-}
 .test :deep(.el-input__inner) {
 	text-align: center;
 }
diff --git a/src/views/goverment/huizhou/projectList/index.vue b/src/views/goverment/huizhou/projectList/index.vue
index cad1a4f..e4e01ff 100644
--- a/src/views/goverment/huizhou/projectList/index.vue
+++ b/src/views/goverment/huizhou/projectList/index.vue
@@ -170,6 +170,7 @@ const confirmReform = () => {
 };
 // 新增项目
 const handleAddItem = () => {
+	store.Message = null;
 	approvalTitle.value = "新增";
 	detailsDialog.value = true;
 };