From 76fa49fa7a2d110848e2344d1a26cb00c482fd06 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 14 Aug 2023 18:58:42 +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                     |  2 +-
 src/components/LeftMenu/LeftMenu.vue           | 13 ++++++++++---
 .../GanttchartChart/index.vue                  | 18 +++++++++++++++---
 .../investmentPayment/index.vue                | 14 +++++++-------
 .../progressManagement/index.scss              |  8 +++++---
 .../progressManagement/index.vue               | 14 +++++++++-----
 .../progressManagement/payManagement/index.vue |  2 +-
 .../progressManagement/payManagement/index.vue |  2 +-
 8 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts
index 5353d8d..d4d40c6 100644
--- a/src/api/modules/huizhou.ts
+++ b/src/api/modules/huizhou.ts
@@ -133,7 +133,7 @@ export const payGovermentContactAdd = (params: any) => {
 export const payGovermentContactEdit = (params: any) => {
 	return http.post(BASEURL + `/gov/investmentContract/edit`, params);
 };
-// 投资支付合同设置结算定额日期
+// 投资支付合同设置结算定案日期
 export const payGovermentContactSet = (params: any) => {
 	return http.post(BASEURL + `/gov/engineering/edit`, params);
 };
diff --git a/src/components/LeftMenu/LeftMenu.vue b/src/components/LeftMenu/LeftMenu.vue
index e8863d0..74d28ae 100644
--- a/src/components/LeftMenu/LeftMenu.vue
+++ b/src/components/LeftMenu/LeftMenu.vue
@@ -17,7 +17,7 @@
 		<div class="content">
 			<div class="fule" v-for="(data, i) in records" :key="i" @click="isActive(i)">
 				<div class="item" :class="ActiveColor === i ? 'isActive' : ''">
-					<slot :data="data" />
+					<slot :data="data" :index="i" />
 				</div>
 			</div>
 		</div>
@@ -39,16 +39,17 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { Search } from "@element-plus/icons-vue";
 import { ElMessage } from "element-plus";
 import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 
-defineProps<{
+const props = defineProps<{
 	modelValue: number;
 	records: ResAiProjectPage[] | ResAiEngineerPage[];
 	pageable?: { pageNo: number; pageSize: number; total: number };
 	tabs?: string[];
+	activeIndex: number;
 	// leftBack?: boolean;
 }>();
 
@@ -92,6 +93,12 @@ const search = () => {
 	// if (!value.value.trim()) return ElMessage.warning("请先输入内容");
 	emit("search", value.value);
 };
+watch(
+	() => props.activeIndex,
+	async (value: number) => {
+		ActiveColor.value = value;
+	}
+);
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
index d09c66d..5fd62b8 100644
--- a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue
@@ -4,6 +4,7 @@
 			v-model="active"
 			:tabs="['项目名称', '工程名称']"
 			:records="records"
+			:activeIndex="modelActive"
 			@change-page="onCurChange"
 			@search="onSearchInput"
 			:pageable="pages"
@@ -127,6 +128,8 @@ import { useRoute } from "vue-router";
 import { bigItemGovermentAll } from "@/api/modules/huizhou";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
 import { getDustprojectPage, getDustengineeringPage } from "@/api/modules/goverment";
+import { sendIframeMessage } from "@/utils/util";
+const modelActive = ref(null);
 const route = useRoute();
 const headerList = reactive([
 	{ label: "未开始", color: "#D0A530" },
@@ -339,9 +342,18 @@ const getEngPage = async () => {
 };
 onMounted(async () => {
 	await getEngPage();
-	onSearch(records.value[0]);
-	searchSn.value = (records.value as any[])[0].projectSn;
-	searchName.value = (records.value as any[])[0].projectName;
+	if (route.query.menuIndex) {
+		modelActive.value = route.query.menuIndex;
+		onSearch(records.value[modelActive.value]);
+		searchSn.value = (records.value as any[])[modelActive.value].projectSn;
+		searchName.value = (records.value as any[])[modelActive.value].projectName;
+	} else {
+		modelActive.value = 0;
+		onSearch(records.value[0]);
+		searchSn.value = (records.value as any[])[0].projectSn;
+		searchName.value = (records.value as any[])[0].projectName;
+	}
+	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });
 const getGanttStyle = (project: any) => {
 	console.log("进入 getGanttStyle --- ", project);
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
index 3ed987a..664904a 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue
@@ -39,7 +39,7 @@
 					<template #formButton="scope">
 						<el-button class="btnStyle" v-auth="'investment_contract_add'" @click="handleAddItem()">新增</el-button>
 						<el-button class="btnStyle" v-auth="'investment_contract_setting'" @click="handleSetDate()"
-							>设置结算定额日期</el-button
+							>设置结算定案日期</el-button
 						>
 					</template>
 					<!-- 表格操作 -->
@@ -63,7 +63,7 @@
 					@confirm="saveItem"
 				>
 				</DialogForm>
-				<!-- 设置结算定额日期 -->
+				<!-- 设置结算定案日期 -->
 				<DialogForm
 					:title="dateTitle"
 					:formConfig="dateFormConfig"
@@ -128,7 +128,7 @@ const columns: ColumnProps[] = [
 	// 多级 prop
 	{ prop: "contractAmount", label: "合同金额(万元)", width: 200 },
 	{ prop: "settlementAmount", label: "结算金额(万元)", width: 200 },
-	{ prop: "settlementTime", label: "结算定额日期", width: 200 },
+	{ prop: "settlementTime", label: "结算定案日期", width: 200 },
 	{ prop: "applicationUnit", label: "申请单位", width: 200 },
 	{ prop: "bidderTime", label: "中标通知书申请", width: 200 },
 	{
@@ -172,7 +172,7 @@ const formConfig = {
 			type: "input"
 		},
 		// {
-		// 	label: "结算定额日期",
+		// 	label: "结算定案日期",
 		// 	prop: "settlementTime",
 		// 	type: "date",
 		// 	format: "YYYY-MM-DD",
@@ -250,11 +250,11 @@ const formConfig = {
 		]
 	}
 };
-// 设置结算定额日期
+// 设置结算定案日期
 const dateFormConfig = {
 	formItemConfig: [
 		{
-			label: "结算定额日期",
+			label: "结算定案日期",
 			prop: "settlementTime",
 			type: "date",
 			format: "YYYY-MM-DD",
@@ -346,7 +346,7 @@ const saveItem = async (form: any) => {
 	proTable.value.getTableList();
 	visible.value = false;
 };
-// 设置结算定额日期
+// 设置结算定案日期
 const saveDateItem = async (form: any) => {
 	if (active.value === 0) {
 		form.projectSn = searchSn.value;
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss
index f6283b6..1fe3fc9 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss
@@ -86,8 +86,11 @@
 	// flex-wrap: wrap;
 }
 :deep() {
-	.el-form-item__content > :not(button) {
-		// width: 160px;
+	.el-form .el-form-item__content .el-range-editor {
+		width: 300px;
+	}
+	.el-range-separator {
+		color: var(--el-menu-text-color);
 	}
 	.el-input__wrapper {
 		color: white;
@@ -108,7 +111,6 @@
 		box-shadow: 0 0 0 1px var(--el-color-primary, var(--el-color-primary)) inset;
 	}
 }
-
 // :deep(.el-dialog__body) {
 // 	padding: 0 0 0 0 !important;
 // 	background-color: pink;
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index 6539b4f..142b96e 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -9,8 +9,8 @@
 			:pageable="pages"
 			class="leftMenu"
 		>
-			<template #default="{ data }">
-				<div class="leftProject" @click="onSearch(data)">
+			<template #default="{ data, index }">
+				<div class="leftProject" @click="onSearch(data, index)">
 					<span class="projectName">{{ data.projectName || data.engineeringName }}</span>
 					<div class="leftMenu_item">
 						<div class="leftMenu_item flx-justify-between">
@@ -98,6 +98,7 @@ import { ColumnProps } from "@/components/ProTable/interface";
 import { parentItemGovermentList, payGovermentAdd } from "@/api/modules/huizhou";
 import { useRoute, useRouter } from "vue-router";
 import { sendIframeMessage } from "@/utils/util";
+const leftMenuIndex = ref(0);
 const route = useRoute();
 const pages = ref({
 	pageNo: 1,
@@ -174,7 +175,7 @@ const formConfig = {
 			type: "input"
 		},
 		{
-			label: "结算定额日期",
+			label: "结算定案日期",
 			prop: "settlementTime",
 			type: "date"
 		},
@@ -255,7 +256,7 @@ const proTable = ref();
 const searchSn = ref("");
 // 跳转至甘特图
 const seeGantt = () => {
-	router.push("/goverment/huizhou/progressManagement/GanttchartChart/index");
+	router.push("/goverment/huizhou/progressManagement/GanttchartChart/index?menuIndex=" + leftMenuIndex.value);
 };
 // 添加数据按钮
 const handleAddItem = () => {
@@ -322,7 +323,10 @@ const getTableList = (params: any) => {
 	return parentItemGovermentList(newParams);
 };
 // 页面的项目名称和工程名称的div点击事件
-const onSearch = async (params: any) => {
+const onSearch = async (params: any, index: number) => {
+	console.log(params);
+	console.log(index);
+	leftMenuIndex.value = index ? index : 0;
 	active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
 	active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
 	proTable.value.getTableList();
diff --git a/src/views/hz-enterprise/progressManagement/payManagement/index.vue b/src/views/hz-enterprise/progressManagement/payManagement/index.vue
index a212adb..be25c4c 100644
--- a/src/views/hz-enterprise/progressManagement/payManagement/index.vue
+++ b/src/views/hz-enterprise/progressManagement/payManagement/index.vue
@@ -122,7 +122,7 @@ const columns: ColumnProps[] = [
 	// 多级 prop
 	{ prop: "contractAmount", label: "合同金额(万元)" },
 	{ prop: "settlementAmount", label: "结算金额(万元)" },
-	{ prop: "settlementTime", label: "结算定额日期" },
+	{ prop: "settlementTime", label: "结算定案日期" },
 	{ prop: "applicationUnit", label: "申请单位" },
 	{ prop: "bidderTime", label: "中标通知书申请" },
 	// { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 },
diff --git a/src/views/hz-project/progressManagement/payManagement/index.vue b/src/views/hz-project/progressManagement/payManagement/index.vue
index 91a5b0c..8c0aa68 100644
--- a/src/views/hz-project/progressManagement/payManagement/index.vue
+++ b/src/views/hz-project/progressManagement/payManagement/index.vue
@@ -93,7 +93,7 @@ const columns: ColumnProps[] = [
 	// 多级 prop
 	{ prop: "contractAmount", label: "合同金额(万元)" },
 	{ prop: "settlementAmount", label: "结算金额(万元)" },
-	{ prop: "settlementTime", label: "结算定额日期" },
+	{ prop: "settlementTime", label: "结算定案日期" },
 	{ prop: "applicationUnit", label: "申请单位" },
 	{ prop: "bidderTime", label: "中标通知书申请" },
 	// { prop: "totalAmount", label: "累计拨款金额(万元)", width: 200 },