From ac1ddac17ce9246891e3cba41fffa4d47577836d Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 13 Apr 2024 18:06:26 +0800
Subject: [PATCH] add
---
src/views/InvoicingRequests/edit.vue | 4 ++--
src/views/project_labor_contract/edit.vue | 2 +-
src/views/project_manager_appointment/edit.vue | 15 ++++++++++++++-
src/views/quality_detection_temp/index.vue | 7 +++----
src/views/safety_modify/detail.vue | 7 ++++---
src/views/safety_modify/edit.vue | 10 +++++-----
src/views/safety_target/edit.vue | 15 ++++++++++-----
7 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue
index e34c8d9..8c67c0c 100644
--- a/src/views/InvoicingRequests/edit.vue
+++ b/src/views/InvoicingRequests/edit.vue
@@ -129,7 +129,7 @@
-
@@ -188,7 +188,7 @@
-
+
diff --git a/src/views/project_labor_contract/edit.vue b/src/views/project_labor_contract/edit.vue
index e59fc4d..03386ef 100644
--- a/src/views/project_labor_contract/edit.vue
+++ b/src/views/project_labor_contract/edit.vue
@@ -18,7 +18,7 @@
-
+
diff --git a/src/views/project_manager_appointment/edit.vue b/src/views/project_manager_appointment/edit.vue
index 6d16e00..9f73519 100644
--- a/src/views/project_manager_appointment/edit.vue
+++ b/src/views/project_manager_appointment/edit.vue
@@ -86,7 +86,7 @@
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }, { validator: checkDate, trigger: 'blur' }]">
@@ -218,6 +218,19 @@ const formData = reactive({
})
+const checkDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.delivery_date) < new Date(formData.project_approval_date)) {
+ callback(new Error('项目交付日期不能早于立项日期'))
+ }
+ else if (new Date(formData.delivery_date) < new Date(formData.start_date)) {
+ callback(new Error('项目交付日期不能早于项目开始日期'))
+
+ }
+ else {
+ callback()
+ }
+}
+
// 表单验证
const formRules = reactive({
diff --git a/src/views/quality_detection_temp/index.vue b/src/views/quality_detection_temp/index.vue
index 9da8d36..e4b8b14 100644
--- a/src/views/quality_detection_temp/index.vue
+++ b/src/views/quality_detection_temp/index.vue
@@ -54,8 +54,7 @@
@click="handleDelete(row.id)">
删除
-
+
详情
@@ -133,11 +132,11 @@ const handleDelete = async (id: number | any[]) => {
}
// 详情
const handleDetail = async (id: any) => {
- let res = await qualitydetectiontempDetail({ id })
+ // let res = await qualitydetectiontempDetail({ id })
showDetail.value = true
await nextTick()
detailRef.value?.open()
- detailRef.value?.setFormData(res)
+ detailRef.value?.setFormData(id)
}
diff --git a/src/views/safety_modify/detail.vue b/src/views/safety_modify/detail.vue
index e14b652..c9726af 100644
--- a/src/views/safety_modify/detail.vue
+++ b/src/views/safety_modify/detail.vue
@@ -30,6 +30,9 @@
{{ formData.check_company }}
+
+ {{ formData.modify_user }}
+
{{ formData.modify_company }}
@@ -45,9 +48,7 @@
{{ formData.check_result }}
-
- {{ formData.modify_user }}
-
+
diff --git a/src/views/safety_modify/edit.vue b/src/views/safety_modify/edit.vue
index 98398fa..0e2abd4 100644
--- a/src/views/safety_modify/edit.vue
+++ b/src/views/safety_modify/edit.vue
@@ -65,6 +65,11 @@
+
+
+
+
+
@@ -98,11 +103,6 @@
-
-
-
-
-