fix: BUG修改

src/views/goverment/huizhou/projectMonitoring/projectApproval/components/auditDialog.vue

@@ -11,27 +11,27 @@
 				</div>
 			</template>
 			<div class="content-detail">
-				<img src="@/assets/images/tableIcon/look.png" alt="" />
+				<img src="@/assets/images/hzImg/Vector.png" alt="" />
 				<span>是否通过审批?</span>
 			</div>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button class="hzCancelStyle" @click="singleAuditSubmit(1)">驳 回</el-button>
+					<el-button class="hzCancelStyle" @click="backAudit">驳 回</el-button>
-					<el-button class="hzStyle" type="primary" @click="singleAuditSubmit(2)">通 过</el-button>
+					<el-button class="hzStyle" type="primary" @click="visible1 = false">通 过</el-button>
 				</span>
 			</template>
 		</el-dialog>
-		<el-dialog v-model="auditVisible" :append-to-body="true">
+		<el-dialog v-model="auditVisible" :append-to-body="true" width="30%">
 			<template #title>
-				<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: #333333">
+				<div style="border-left: 2px solid #0f81ff; font-size: 20px; color: var(--el-menu-text-color)">
-					<span style="margin-left: 5px">审核意见</span>
+					<span style="margin-left: 5px">驳回原因</span>
 				</div>
 			</template>
-			<el-input v-model="auditForm.content" type="textarea" :rows="2" placeholder="请输入内容" />
+			<el-input v-model="auditForm.content" type="textarea" :rows="4" :maxLength="200" placeholder="请输入内容" />
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button @click="singleAuditSubmit(1)">驳 回</el-button>
+					<el-button class="hzCancelStyle" @click="auditVisible = false">取 消</el-button>
-					<el-button type="primary" @click="singleAuditSubmit(2)">通 过</el-button>
+					<el-button class="hzStyle" type="primary" @click="auditVisible = false">确 认</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -53,6 +53,10 @@ const singleData = ref(); // 单个整改情况数据
 const auditForm = ref({
 	content: ""
 });
+// 驳回审核
+const backAudit = () => {
+	auditVisible.value = true;
+};
 // 关闭主窗口
 const closeMain = () => {
 	visible1.value = false;
@@ -168,4 +172,15 @@ onMounted(() => {});
 	justify-content: center;
 	align-items: center;
 }
+:deep(.el-input__wrapper),
+:deep(.el-textarea__inner) {
+	background-color: transparent;
+	box-shadow: 0 0 0 1px #087ba4 inset;
+}
+:deep(.el-input__inner),
+:deep(.el-textarea__inner),
+:deep(.el-range-input) {
+	color: var(--el-menu-text-color);
+	font-size: 16px;
+}
 </style>

src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/duty.vue

@@ -50,11 +50,11 @@ const isAllowNext = computed(() => active.value >= stepOptions.value.length - 1)
 
 const handleToPrevOrNext = () => {
 	if (isAllowNext.value) {
-		const isInValid = formData.value.find(item => {
+		// const isInValid = formData.value.find(item => {
-			return !item.enterpriseSn || !item.creditCode || ("contractType" in item && !item.contractType);
+		// 	return !item.enterpriseSn || !item.creditCode || ("contractType" in item && !item.contractType);
-		});
+		// });
 
-		if (isInValid) return ElMessage.warning("请输入必填项");
+		// if (isInValid) return ElMessage.warning("请输入必填项");
 		emit("next", { engineeringMains: formData.value });
 	} else {
 		emit("prev");

src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/dutyForm.vue

@@ -21,7 +21,7 @@
 			</div>
 		</el-form>
 
-		<el-table
+		<!-- <el-table
 			:data="formData.engineeringMainPersonList"
 			border
 			max-height="500"
@@ -70,7 +70,7 @@
 					<el-button type="danger" link @click="removeEngineeringMainPerson(row)">删除</el-button>
 				</template>
 			</el-table-column>
-		</el-table>
+		</el-table> -->
 	</div>
 </template>
 

src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/index.vue

@@ -53,11 +53,12 @@ const allSubmit = async () => {
 	ElMessage.success("提交成功");
 };
 const next = async (data: OverviewForm | { engineeringMains: EngineeringMainList } | { annexFiles: Array<AnnexFile> }) => {
-	addRepostData.value = Object.assign({}, addRepostData.value, data);
+	// addRepostData.value = Object.assign({}, addRepostData.value, data);
 
 	if (active.value >= datas.length - 1) {
-		await submit();
+		// await submit();
-		router.push("/project/supervision/SupervisionRecord/index");
+		// router.push("/project/supervision/SupervisionRecord/index");
+		visible1.value = false;
 	}
 	active.value++;
 };
@@ -80,10 +81,10 @@ watch(
 	(n, o) => {
 		visible1.value = n;
 		emits("confirm");
-		// if (n) {
+		if (n) {
-		// 	getInfo();
+			active.value = 0;
-		// } else {
+		} else {
-		// }
+		}
 	}
 );
 // 监听el-dialog显示状态，再通过@update:visible 通知父组件，一般是用于关

src/views/hz-project/projectMonitor/projectApproval/components/ProjectSupervision/overview.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="overview">
-		<el-form ref="ruleFormRef" :model="form" label-width="150px" :rules="rules" class="form" size="default">
+		<el-form ref="ruleFormRef" :model="form" label-width="160px" :rules="rules" class="form" size="default">
 			<!-- <el-form ref="ruleFormRef" :model="form" label-width="150px" class="form" size="default"> -->
 			<el-form-item label="项目名称:" prop="projectName">
 				<el-input placeholder="请输入" v-model="form.projectName" disabled />
@@ -177,7 +177,7 @@
 			</div>
 		</el-form>
 
-		<div class="table">
+		<!-- <div class="table">
 			<h4>单体工程</h4>
 			<el-table
 				:data="form.engineeringSingles"
@@ -229,11 +229,10 @@
 					</template>
 				</el-table-column>
 			</el-table>
-
+		</div> -->
-			<footer class="footer">
+		<footer class="footer">
-				<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
+			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
-			</footer>
+		</footer>
-		</div>
 		<AMap v-model="isOpen" @get-address="getAddress" />
 	</div>
 </template>
@@ -316,18 +315,20 @@ const removeEngineeringSingle = (row: EngineeringSingle) => {
 
 const next = async (formEl: FormInstance | undefined, params: any) => {
 	if (!formEl) return;
-	await formEl.validate(async (valid, fields) => {
+	// await formEl.validate(async (valid, fields) => {
-		if (valid) {
+	// 	if (valid) {
-			emit("next", form.value);
+	// 		emit("next", form.value);
-		} else {
+	// 	} else {
-			console.log("error submit!", fields);
+	// 		console.log("error submit!", fields);
-			ElMessage({
+	// 		ElMessage({
-				showClose: true,
+	// 			showClose: true,
-				message: "请完善表单信息！",
+	// 			message: "请完善表单信息！",
-				type: "error"
+	// 			type: "error"
-			});
+	// 		});
-		}
+	// 	}
-	});
+	// });
+
+	emit("next", form.value);
 };
 
 onMounted(async () => {

src/views/hz-project/projectMonitor/projectApproval/index.vue

@@ -19,7 +19,7 @@
 			<template #operation="{ row }">
 				<el-button type="primary" link @click="handleLookItem(row)">
 					<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
-					<span>查看</span>
+					<span>再次申请</span>
 				</el-button>
 			</template>
 			<template #state="{ row }">
@@ -93,7 +93,7 @@ const columns: ColumnProps[] = [
 		prop: "state",
 		label: "状态"
 	},
-	{ prop: "operation", label: "操作", fixed: "right", width: 260 }
+	{ prop: "operation", label: "操作", fixed: "right", width: 120 }
 ];
 const detailsDialog = ref(false);
 const relativeId = ref("");