From 647ef6974a149e21bc88e4b559ba9badaafe367e Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: Mon, 11 Jul 2022 18:02:28 +0800
Subject: [PATCH] 添加我的申请tab切换页面，优化组件表单的校验
---
src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue b/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
index 39bb014..3d0260b 100644
--- a/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
+++ b/src/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue
@@ -2,14 +2,14 @@
<div class="home-container">
<el-scrollbar height="100%">
<el-form :model="form" label-width="150px" :rules="applyRules" ref="ruleFormRef2">
- <blind-panel-form :bpForm="form.addForm"></blind-panel-form>
-<!-- <cut-line-form :clForm="form.addForm"></cut-line-form>-->
-<!-- <dirt-work-form :dwForm="form.addForm"></dirt-work-form>-->
-<!-- <fire-work-form :fwForm="form.addForm"></fire-work-form>-->
-<!-- <hang-load-form :hlForm="form.addForm"></hang-load-form>-->
-<!-- <high-work-form :hwForm="form.addForm"></high-work-form>-->
-<!-- <limited-space-form :lsForm="form.addForm"></limited-space-form>-->
-<!-- <temp-elect-form :teForm="form.addForm"></temp-elect-form>-->
+<!-- <blind-panel-form :bpForm="form.addForm" ref="additionalForm"></blind-panel-form>-->
+<!-- <cut-line-form :clForm="form.addForm" ref="additionalForm"></cut-line-form>-->
+<!-- <dirt-work-form :dwForm="form.addForm" ref="additionalForm"></dirt-work-form>-->
+ <fire-work-form :fwForm="form.addForm" ref="additionalForm"></fire-work-form>
+<!-- <hang-load-form :hlForm="form.addForm" ref="additionalForm"></hang-load-form>-->
+<!-- <high-work-form :hwForm="form.addForm" ref="additionalForm"></high-work-form>-->
+<!-- <limited-space-form :lsForm="form.addForm" ref="additionalForm"></limited-space-form>-->
+<!-- <temp-elect-form :teForm="form.addForm" ref="additionalForm"></temp-elect-form>-->
<div>
<div class="homeCard">
<el-row>
@@ -352,6 +352,7 @@
import {useUserInfo} from "/@/stores/userInfo";
import { Session } from '/@/utils/storage';
import { Search } from '@element-plus/icons-vue'
+ import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
let global: any = {
homeChartOne: null,
@@ -554,15 +555,31 @@
const deleteRow = (index) =>{
form.workerList.splice( index,1)
}
+ const isValid = ref(false)
+ const additionalForm = ref(null)
const handleApply = async (formEl: FormInstance | undefined) =>{
if (!formEl) return
+ const flag = additionalForm.value.validateForm()
+ await flag.then((res)=>{
+ isValid.value = res
+ })
await formEl.validate((valid, fields) => {
- if (valid) {
- console.log('submit',form)
+ console.log(valid,'and',isValid.value)
+ if (valid && isValid.value) {
+ console.log('submit',form,fields)
+ ElMessage({
+ message: '提交成功！',
+ type: 'success',
+ })
} else {
- console.log('error submit!', fields)
+ // console.log('error submit!',form,fields)
+ ElMessage({
+ message: '表单未填写完整',
+ type: 'error',
+ })
}
})
+
}
// 折线图
const renderMenu = async (value: string) => {
@@ -583,9 +600,11 @@
ruleFormRef,
ruleFormRef2,
ruleFormRef3,
+ additionalForm,
addWorkerRules,
saftyFileRules,
applyRules,
+ isValid,
handleApply,
cancleAddFile,
deleteRow,
--
Gitblit v1.9.2