From 230ac446e2b257436848b1b599a1e0a0a3b65921 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 27 Jul 2023 14:04:36 +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

---
 .../planFinishSituation/index.vue             |  5 ++-
 .../progressManagement/index.vue              | 11 ++---
 .../planFinishSituation/index.vue             | 40 +++++++++++++++++--
 .../progressManagement/index.vue              | 12 +++---
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
index e10d1a1..de9be2e 100644
--- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
+++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue
@@ -46,7 +46,7 @@
 						<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
 					</template>
 					<template #applyStartTime="{ row }">
-						<span v-if="row.applyStartTime">{{ row.applyStartTime + "-" + row.applyEndTime }}</span>
+						<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
 					</template>
 					<template #operation="{ row }">
 						<el-button type="primary" link @click="handleItemDetail(2, row)">
@@ -158,7 +158,8 @@ const columns: ColumnProps[] = [
 	{ prop: "applyTime", label: "申报日期" },
 	{
 		label: "申报时段",
-		prop: "applyStartTime"
+		prop: "applyStartTime",
+		width: 260
 	},
 	{ prop: "investmentPaymentId", label: "支付状态" },
 	// {
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index 084363b..b7a95be 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -142,14 +142,14 @@ const columns: ColumnProps[] = [
 	{
 		prop: "name",
 		label: "任务名称",
-		width: 200,
+		width: 220,
 		search: { el: "input" }
 	},
 	// 多级 prop
-	{ prop: "commander", label: "负责人" },
-	{ prop: "planStartTime", label: "开始日期" },
-	{ prop: "planEndTime", label: "结束日期" },
-	{ prop: "unit", label: "申请单位" },
+	{ prop: "commander", label: "负责人", width: 100 },
+	{ prop: "planStartTime", label: "开始日期", width: 200 },
+	{ prop: "planEndTime", label: "结束日期", width: 200 },
+	{ prop: "unit", label: "申请单位", width: 200 },
 	{ prop: "completeRatio", label: "完成百分比(%)", width: 200 },
 	{ prop: "slippage", label: "逾期情况(天)", width: 200 },
 	{
@@ -169,6 +169,7 @@ const columns: ColumnProps[] = [
 	{
 		prop: "state",
 		label: "状态",
+		width: 150,
 		search: { el: "select" },
 		enum: [
 			{ label: "未开始", value: 1 },
diff --git a/src/views/hz-project/progressManagement/planFinishSituation/index.vue b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
index 95fdd57..6044c18 100644
--- a/src/views/hz-project/progressManagement/planFinishSituation/index.vue
+++ b/src/views/hz-project/progressManagement/planFinishSituation/index.vue
@@ -19,7 +19,7 @@
 				<span>{{ scope.row.investmentPaymentId ? "已支付" : "未支付" }}</span>
 			</template>
 			<template #applyStartTime="{ row }">
-				<span v-if="row.applyStartTime">{{ row.applyStartTime + "-" + row.applyEndTime }}</span>
+				<span v-if="row.applyStartTime">{{ row.applyStartTime + "~" + row.applyEndTime }}</span>
 			</template>
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="handleItemDetail(2, row)">
@@ -70,11 +70,25 @@ const formConfig = {
 			type: "input"
 		},
 		{
-			label: "申报时段",
+			label: "申报日期",
 			prop: "applyTime",
 			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: {
@@ -91,6 +105,20 @@ const formConfig = {
 				message: "请选择",
 				trigger: "change"
 			}
+		],
+		applyStartTime: [
+			{
+				required: true,
+				message: "请选择",
+				trigger: "change"
+			}
+		],
+		applyEndTime: [
+			{
+				required: true,
+				message: "请选择",
+				trigger: "change"
+			}
 		]
 	}
 };
@@ -103,7 +131,9 @@ const drawerVisible = ref(false);
 const title = ref("");
 const formData = ref({
 	name: "",
-	applyTime: ""
+	applyTime: "",
+	applyStartTime: "",
+	applyEndTime: ""
 });
 // 获取 ProTable 元素，调用其获取刷新数据方法（还能获取到当前查询参数，方便导出携带参数）
 const proTable = ref();
@@ -141,7 +171,9 @@ const columns: ColumnProps[] = [
 const handleAddItem = () => {
 	formData.value = reactive({
 		name: "",
-		applyTime: ""
+		applyTime: "",
+		applyStartTime: "",
+		applyEndTime: ""
 	});
 	openVisible.value = true;
 };
diff --git a/src/views/hz-project/projectMonitor/progressManagement/index.vue b/src/views/hz-project/projectMonitor/progressManagement/index.vue
index c35f16c..a82cfd3 100644
--- a/src/views/hz-project/projectMonitor/progressManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/progressManagement/index.vue
@@ -77,11 +77,12 @@ const columns: ColumnProps[] = [
 		label: "任务名称",
 		search: { el: "input" }
 	},
-	{ prop: "commander", label: "负责人" },
-	{ prop: "planStartTime", label: "开始日期" },
-	{ prop: "planEndTime", label: "结束日期" },
-	{ prop: "completeRatio", label: "完成百分比(%)" },
-	{ prop: "slippage", label: "逾期情况(天)" },
+	{ prop: "commander", label: "负责人", width: 100 },
+	{ prop: "planStartTime", label: "开始日期", width: 200 },
+	{ prop: "planEndTime", label: "结束日期", width: 200 },
+	{ prop: "unit", label: "申请单位", width: 200 },
+	{ prop: "completeRatio", label: "完成百分比(%)", width: 200 },
+	{ prop: "slippage", label: "逾期情况(天)", width: 200 },
 	// {
 	// 	prop: "state",
 	// 	label: "状态",
@@ -109,6 +110,7 @@ const columns: ColumnProps[] = [
 	{
 		prop: "state",
 		label: "状态",
+		width: 150,
 		search: { el: "select" },
 		enum: [
 			{ label: "未开始", value: 1 },