From 10ec0a4b15add6b1636b5f855beb1e79c5a0dffd Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 22 May 2025 15:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addAndEditForm.vue             | 19 ++++++++++++++++++-
 src/pages/workbenches/index.vue               |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pages/importantMatters/components/addAndEditForm.vue b/src/pages/importantMatters/components/addAndEditForm.vue
index aba3b0c..be8e1ad 100644
--- a/src/pages/importantMatters/components/addAndEditForm.vue
+++ b/src/pages/importantMatters/components/addAndEditForm.vue
@@ -264,8 +264,9 @@ import {
 import { getProcedureApi } from '@/services/common.js'
 import TitleTipModal from '@/components/TitleTipModal/index'
 
-import { useMemberStore } from '@/stores'
+import { useMemberStore, useCommonStore } from '@/stores'
 const memberStore = useMemberStore()
+const commonStore = useCommonStore()
 const baseURL = import.meta.env.VITE_API_BASE_URL // 获取当前的url地址
 const token = memberStore?.token
 
@@ -401,6 +402,22 @@ const formatter = (type, value) => {
     return value
 }
 
+// 根据store中的项目名称，专业名称，工序名称，以及id赋值给表单
+watch(
+    () => commonStore.projectName,
+    (newVal) => {
+        addAndEditModel.proName = newVal
+    },
+    { immediate: true },
+)
+watch(
+    () => commonStore.majorName,
+    (newVal) => {
+        addAndEditModel.majorName = newVal
+    },
+    { immediate: true },
+)
+
 // 选择项目
 const onSelectProject = () => {
     projectShow.value = true
diff --git a/src/pages/workbenches/index.vue b/src/pages/workbenches/index.vue
index 08c10da..00d135b 100644
--- a/src/pages/workbenches/index.vue
+++ b/src/pages/workbenches/index.vue
@@ -6,7 +6,7 @@
         </template>
     </up-navbar>
     <view class="workbenches-container">
-        <IconCard :iconList="iconList_1" :cardTitle="`照片上传`" />
+        <IconCard :iconList="iconList_1" :cardTitle="`照片上传`" style="margin-top: 33rpx" />
         <IconCard :iconList="iconList_2" :cardTitle="`照片查询`" />
     </view>