diff --git a/src/views/manage_company/edit.vue b/src/views/manage_company/edit.vue index 43d44fe..e79e2a2 100644 --- a/src/views/manage_company/edit.vue +++ b/src/views/manage_company/edit.vue @@ -108,12 +108,12 @@ const tableConfig = reactive( { label: "手机号码", value: 'mobile', - check: true + check: ['contacts', checkPhone] }, { label: "电子邮箱", value: 'email', - check: true + check: ['contacts', checkEmail] }, { diff --git a/src/views/manage_project/edit.vue b/src/views/manage_project/edit.vue index f1cd16d..01f488e 100644 --- a/src/views/manage_project/edit.vue +++ b/src/views/manage_project/edit.vue @@ -246,6 +246,26 @@ const formData = reactive({ }) +const chekcDate = (rule: any, value: any, callback: any) => { + if (new Date(formData.actual_end_date) < new Date(formData.actual_start_date)) { + callback(new Error('实际竣工日期不能早于实际开工日期')) + } else { + callback() + } +} + + +const chekcDate1 = (rule: any, value: any, callback: any) => { + if (new Date(formData.planned_end_date) < new Date(formData.planned_start_date)) { + callback(new Error('计划竣工日期不能早于计划开工日期')) + } else { + callback() + } +} + + + + // 表单验证 const formRules = reactive({ project_name: [{ @@ -322,6 +342,10 @@ const formRules = reactive({ required: true, message: '请输入计划竣工日期', trigger: ['blur'] + }, + { + validator: chekcDate1, + trigger: ['blur'] }], actual_start_date: [{ required: true, @@ -332,6 +356,10 @@ const formRules = reactive({ required: true, message: '请输入实际竣工日期', trigger: ['blur'] + }, + { + validator: chekcDate, + trigger: ['blur'] }], implementation_department: [{ required: true, diff --git a/src/views/marketing_custom_return_visit/index.vue b/src/views/marketing_custom_return_visit/index.vue index 65336ac..2d97806 100644 --- a/src/views/marketing_custom_return_visit/index.vue +++ b/src/views/marketing_custom_return_visit/index.vue @@ -45,9 +45,11 @@
- + + + diff --git a/src/views/project/components/Overview.vue b/src/views/project/components/Overview.vue index fe83d14..2041f8d 100644 --- a/src/views/project/components/Overview.vue +++ b/src/views/project/components/Overview.vue @@ -65,6 +65,20 @@ {{ formData.my_construction_recognition_text }} + + + {{ formData.relationship_text }} + + + {{ formData.construction_financial_status_text }} + + + {{ formData.construction_recognition_text }} + + + + + diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue index c4e025c..01230e4 100644 --- a/src/views/supervision_accept/edit.vue +++ b/src/views/supervision_accept/edit.vue @@ -31,7 +31,7 @@ - + diff --git a/src/views/supervision_diary/detail.js b/src/views/supervision_diary/detail.js index 767edc0..7d605a1 100644 --- a/src/views/supervision_diary/detail.js +++ b/src/views/supervision_diary/detail.js @@ -19,6 +19,10 @@ const detailConfig = { label: "气温", value: "air_temperature" }, + { + label: "气候", + value: "climate" + }, { label: "监理人员", value: "user" @@ -49,6 +53,7 @@ const detailConfig = { }, + { label: "附件", value: "annex", diff --git a/src/views/supervision_diary/index.vue b/src/views/supervision_diary/index.vue index 6eac9e9..136a3aa 100644 --- a/src/views/supervision_diary/index.vue +++ b/src/views/supervision_diary/index.vue @@ -42,7 +42,7 @@ - + diff --git a/src/views/supervision_large_equipment/edit.vue b/src/views/supervision_large_equipment/edit.vue index b852678..70483b2 100644 --- a/src/views/supervision_large_equipment/edit.vue +++ b/src/views/supervision_large_equipment/edit.vue @@ -184,7 +184,7 @@ const chekcDate = (rule: any, value: any, callback: any) => { } const chekcDate1 = (rule: any, value: any, callback: any) => { - if (new Date(formData.qualification_two_status) < new Date(formData.get_date_two)) { + if (new Date(formData.effective_date_two) < new Date(formData.get_date_two)) { callback(new Error('有效日期不能早于发证日期')) } else { callback() diff --git a/src/views/supervision_project_personnel/edit.vue b/src/views/supervision_project_personnel/edit.vue index d67f6a0..594db01 100644 --- a/src/views/supervision_project_personnel/edit.vue +++ b/src/views/supervision_project_personnel/edit.vue @@ -1,7 +1,6 @@