From 4e4a8a6cc2526d1b2a9d8eed375f1f5728f9a40c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 16 Aug 2023 17:55:12 +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/styles/element.scss                                   | 1 +
 .../acceptanceApply/components/detailsDialog.vue          | 7 +++++--
 .../engineeringAcceptance/acceptanceApply/index.vue       | 3 ++-
 .../progressManagement/subItemManagement/index.vue        | 1 +
 .../acceptanceApply/components/detailsDialog.vue          | 4 ++--
 .../acceptanceApply/components/transformInfo.vue          | 7 +++++--
 .../engineeringAcceptance/acceptanceApply/index.vue       | 3 ++-
 .../goverment/laborRealName/attendanceMonitor/index.vue   | 8 +++++++-
 src/views/goverment/laborRealName/memberSelect/index.vue  | 1 +
 src/views/goverment/laborRealName/projectSelect/index.vue | 1 +
 .../progressManagement/divisionsAndISubItems/index.scss   | 1 +
 .../acceptanceApply/components/detailsDialog.vue          | 7 +++++--
 .../engineeringAcceptance/acceptanceApply/index.vue       | 3 ++-
 .../progressManagement/subItemManagement/index.vue        | 1 +
 14 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/styles/element.scss b/src/styles/element.scss
index c62ee3f..e05bd87 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -107,6 +107,7 @@
 			// 去除时间选择器上下 padding
 			.el-range-editor.el-input__wrapper {
 				padding: 0 10px;
+				flex-grow: 0;
 			}
 		}
 		.operation {
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 33acfe9..063b4a9 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -104,7 +104,7 @@
 								<span v-else>{{ row.remark }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column align="center" width="180" label="操作" v-if="title != '详情'">
+						<el-table-column align="center" width="180" fixed="right" label="操作" v-if="title != '详情'">
 							<template #default="scope">
 								<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
 									<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@@ -232,7 +232,7 @@
 								}}</span>
 							</template>
 						</el-table-column>
-						<el-table-column align="center" width="100" label="操作">
+						<el-table-column align="center" fixed="right" width="100" label="操作">
 							<template #default="{ row }">
 								<el-button type="primary" link @click="handleLookItem(row)">
 									<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@@ -370,6 +370,9 @@ const confirm = async () => {
 		annexList: documentData.value,
 		engineeringSn: globalStore.engineeringSn
 	};
+	if (props.title == "重新发起") {
+		requestData.id = props.relativeId;
+	}
 	requestData.detailList.map(item => {
 		delete item.id;
 	});
diff --git a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
index bccde6a..9d47289 100644
--- a/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/enterprise/engineeringAcceptance/acceptanceApply/index.vue
@@ -84,7 +84,8 @@ const columns: ColumnProps[] = [
 			{ label: "审批中", value: 1 },
 			{ label: "资料验收通过", value: 2 },
 			{ label: "已驳回", value: 3 },
-			{ label: "已验收通过", value: 4 }
+			{ label: "已验收通过", value: 4 },
+			{ label: "已重新发起", value: 5 }
 		]
 	},
 	{ prop: "operation", label: "操作", fixed: "right" }
diff --git a/src/views/enterprise/progressManagement/subItemManagement/index.vue b/src/views/enterprise/progressManagement/subItemManagement/index.vue
index 758a5d1..50f320a 100644
--- a/src/views/enterprise/progressManagement/subItemManagement/index.vue
+++ b/src/views/enterprise/progressManagement/subItemManagement/index.vue
@@ -545,6 +545,7 @@ onMounted(() => {
 			:deep(.el-card__body) {
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
 			}
 		}
 	}
diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 205f42e..8330fa0 100644
--- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -175,7 +175,7 @@
 							<template #default="{ row }">
 								<span>{{
 									row.state == 0
-										? "待执法"
+										? "待检查"
 										: row.state == 1
 										? "执法中"
 										: row.state == 2
@@ -190,7 +190,7 @@
 								}}</span>
 							</template>
 						</el-table-column>
-						<el-table-column align="center" width="100" label="操作">
+						<el-table-column align="center" fixed="right" width="100" label="操作">
 							<template #default="{ row }">
 								<el-button type="primary" link @click="handleLookItem(row)">
 									<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
index c86fa44..fd92ae9 100644
--- a/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/components/transformInfo.vue
@@ -18,7 +18,9 @@
 							<span class="row-span"
 								>检查情况：
 								<span>{{
-									basicData?.state == 1
+									basicData?.state == 0
+										? "待检查"
+										: basicData?.state == 1
 										? "执法中"
 										: basicData?.state == 2
 										? "待整改"
@@ -122,7 +124,7 @@
 						</el-table-column>
 					</el-table>
 				</div>
-				<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
+				<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 0 && basicData?.state != 4">
 					<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
 						>驳回,请尽快整改</el-button
 					>
@@ -464,6 +466,7 @@ onMounted(() => {});
 		box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
 		border-radius: 8px 8px 8px 8px;
 		padding: 15px 20px;
+		overflow: hidden;
 		.content-title {
 			@include title;
 			margin-top: 45px;
diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
index a9d5b42..b02bb68 100644
--- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue
@@ -113,7 +113,8 @@ const columns: ColumnProps[] = [
 			{ label: "审批中", value: 1 },
 			{ label: "资料验收通过", value: 2 },
 			{ label: "已驳回", value: 3 },
-			{ label: "已验收通过", value: 4 }
+			{ label: "已验收通过", value: 4 },
+			{ label: "已重新发起", value: 5 }
 		]
 	},
 	{ prop: "operation", label: "操作", fixed: "right" }
diff --git a/src/views/goverment/laborRealName/attendanceMonitor/index.vue b/src/views/goverment/laborRealName/attendanceMonitor/index.vue
index d630304..7448216 100644
--- a/src/views/goverment/laborRealName/attendanceMonitor/index.vue
+++ b/src/views/goverment/laborRealName/attendanceMonitor/index.vue
@@ -237,7 +237,12 @@ onMounted(() => {
 .table-box {
 	.statistics-top {
 		display: flex;
-		justify-content: space-between;
+		// justify-content: space-between;
+		flex-wrap: wrap;
+		.sta-item:not(:last-child) {
+			margin-right: 17px;
+			margin-bottom: 10px;
+		}
 		.sta-item {
 			width: 405px;
 			min-width: 320px;
@@ -280,6 +285,7 @@ onMounted(() => {
 			:deep(.el-card__body) {
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
 			}
 		}
 	}
diff --git a/src/views/goverment/laborRealName/memberSelect/index.vue b/src/views/goverment/laborRealName/memberSelect/index.vue
index 0fe7076..05dda23 100644
--- a/src/views/goverment/laborRealName/memberSelect/index.vue
+++ b/src/views/goverment/laborRealName/memberSelect/index.vue
@@ -117,6 +117,7 @@ onMounted(() => {
 			:deep(.el-card__body) {
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
 			}
 		}
 	}
diff --git a/src/views/goverment/laborRealName/projectSelect/index.vue b/src/views/goverment/laborRealName/projectSelect/index.vue
index 44c3270..13d54d6 100644
--- a/src/views/goverment/laborRealName/projectSelect/index.vue
+++ b/src/views/goverment/laborRealName/projectSelect/index.vue
@@ -132,6 +132,7 @@ onMounted(() => {
 			:deep(.el-card__body) {
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
 			}
 		}
 	}
diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss b/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss
index df69ac2..fd1eacb 100644
--- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss
+++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.scss
@@ -62,6 +62,7 @@
 				:deep(.el-card__body) {
 					display: flex;
 					align-items: center;
+					flex-wrap: wrap;
 				}
 				span {
 					color: var(--el-menu-text-color);
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
index 1601e1b..dfc6921 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/components/detailsDialog.vue
@@ -104,7 +104,7 @@
 								<span v-else>{{ row.remark }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column align="center" width="180" label="操作" v-if="title != '详情'">
+						<el-table-column align="center" fixed="right" width="180" label="操作" v-if="title != '详情'">
 							<template #default="scope">
 								<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
 									<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
@@ -232,7 +232,7 @@
 								}}</span>
 							</template>
 						</el-table-column>
-						<el-table-column align="center" width="100" label="操作">
+						<el-table-column align="center" fixed="right" width="100" label="操作">
 							<template #default="{ row }">
 								<el-button type="primary" link @click="handleLookItem(row)">
 									<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
@@ -370,6 +370,9 @@ const confirm = async () => {
 		annexList: documentData.value,
 		engineeringSn: globalStore.engineeringSn
 	};
+	if (props.title == "重新发起") {
+		requestData.id = props.relativeId;
+	}
 	requestData.detailList.map(item => {
 		delete item.id;
 	});
diff --git a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
index 5fc370c..3b16020 100644
--- a/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
+++ b/src/views/project/engineeringAcceptance/acceptanceApply/index.vue
@@ -84,7 +84,8 @@ const columns: ColumnProps[] = [
 			{ label: "审批中", value: 1 },
 			{ label: "资料验收通过", value: 2 },
 			{ label: "已驳回", value: 3 },
-			{ label: "已验收通过", value: 4 }
+			{ label: "已验收通过", value: 4 },
+			{ label: "已重新发起", value: 5 }
 		]
 	},
 	{ prop: "operation", label: "操作", fixed: "right" }
diff --git a/src/views/project/progressManagement/subItemManagement/index.vue b/src/views/project/progressManagement/subItemManagement/index.vue
index 01098cd..a0a065b 100644
--- a/src/views/project/progressManagement/subItemManagement/index.vue
+++ b/src/views/project/progressManagement/subItemManagement/index.vue
@@ -540,6 +540,7 @@ onMounted(() => {
 			:deep(.el-card__body) {
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
 			}
 		}
 	}