From f5a752776da26e806f141aae8f897a154aaa4a82 Mon Sep 17 00:00:00 2001
From: liting <994745334@qq.com>
Date: Mon, 15 Apr 2024 21:56:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/apply/apply/MainForm.vue | 6 --
.../apply/apply/components/UnitsForm.vue | 71 +++++++++----------
2 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue
index febe124b8..7d57a1110 100644
--- a/src/views/apply/apply/MainForm.vue
+++ b/src/views/apply/apply/MainForm.vue
@@ -280,12 +280,6 @@ const open = async (type: string, id?: number) => {
if(formData.value.beginDate){
formData.value.beginDate = Number(formData.value.beginDate)
}
- if(formData.value.engagMajor){
- formData.value.engagMajor =(formData.value.engagMajor).toString()
- }
- if(formData.value.major){
- formData.value.major =(formData.value.major).toString()
- }
} finally {
formLoading.value = false
}
diff --git a/src/views/apply/apply/components/UnitsForm.vue b/src/views/apply/apply/components/UnitsForm.vue
index 91358abcb..a48323a67 100644
--- a/src/views/apply/apply/components/UnitsForm.vue
+++ b/src/views/apply/apply/components/UnitsForm.vue
@@ -4,46 +4,43 @@
:model="formData"
:rules="formRules"
v-loading="formLoading"
- label-width="0px"
+ label-width="150px"
:inline-message="true"
>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
From 8fdd5cefcfc05d79648e067629d87f1a5607282f Mon Sep 17 00:00:00 2001
From: liting <994745334@qq.com>
Date: Mon, 15 Apr 2024 22:24:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/apply/apply/MainForm.vue | 6 +
src/views/apply/apply/components/InfoForm.vue | 1 -
.../apply/components/ParticipantForm.vue | 166 +++++----------
.../apply/apply/components/UnitsForm.vue | 192 ++++++------------
4 files changed, 114 insertions(+), 251 deletions(-)
diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue
index 7d57a1110..f62964280 100644
--- a/src/views/apply/apply/MainForm.vue
+++ b/src/views/apply/apply/MainForm.vue
@@ -280,6 +280,12 @@ const open = async (type: string, id?: number) => {
if(formData.value.beginDate){
formData.value.beginDate = Number(formData.value.beginDate)
}
+ if(formData.value.engagMajor){
+ formData.value.engagMajor =Number(formData.value.engagMajor)
+ }
+ if(formData.value.major){
+ formData.value.major =Number(formData.value.major)
+ }
} finally {
formLoading.value = false
}
diff --git a/src/views/apply/apply/components/InfoForm.vue b/src/views/apply/apply/components/InfoForm.vue
index 998e70a8e..8c66e7221 100644
--- a/src/views/apply/apply/components/InfoForm.vue
+++ b/src/views/apply/apply/components/InfoForm.vue
@@ -21,7 +21,6 @@
-
+ 添加主要参加人员
diff --git a/src/views/apply/apply/components/UnitsForm.vue b/src/views/apply/apply/components/UnitsForm.vue
index a48323a67..8718b133d 100644
--- a/src/views/apply/apply/components/UnitsForm.vue
+++ b/src/views/apply/apply/components/UnitsForm.vue
@@ -1,154 +1,78 @@
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- —
-
-
-
+
+ 添加立项单位信息
From 382dcb0edc50905d5490023501ea0a7dbde5d757 Mon Sep 17 00:00:00 2001
From: liting <994745334@qq.com>
Date: Mon, 15 Apr 2024 22:26:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/apply/apply/index.vue | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/apply/apply/index.vue b/src/views/apply/apply/index.vue
index 2e8b07c5f..1f409bb40 100644
--- a/src/views/apply/apply/index.vue
+++ b/src/views/apply/apply/index.vue
@@ -67,18 +67,18 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
编辑