From cbd048e7d31db968b37322d588f9b6c378cdfb8f Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Sat, 9 May 2026 15:52:49 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260509-=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E5=8D=95=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=8A=A0=E4=B8=8A=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=83=A8=E9=97=A8=E5=92=8C=E5=8F=8D=E9=A6=88=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BgPartymatterBPMFeedbackModal.vue         | 46 +++++++++++++++++
 .../components/BgPartymatterBPMForm.vue       |  4 +-
 .../components/BgPartymatterFeedbackForm.vue  | 49 +++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 1129ede..2d0f375 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -60,12 +60,15 @@
 
 <script lang="ts" setup>
   import { nextTick, reactive, ref } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api';
+  import { useUserStore } from '/@/store/modules/user';
 
   const emit = defineEmits(['success']);
   const { createMessage } = useMessage();
+  const userStore = useUserStore();
 
   const visible = ref(false);
   const saving = ref(false);
@@ -101,9 +104,51 @@
 
   function open(mainId: string) {
     resetForm(mainId);
+    void applyCurrentUserFeedbackInfo();
     visible.value = true;
   }
 
+  function getCurrentLoginDepart() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    const loginInfo = (userStore.getLoginInfo || {}) as Record<string, any>;
+    const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : [];
+    if (userInfo.orgCode) {
+      return departs.find((item) => item.orgCode === userInfo.orgCode);
+    }
+    return departs.length === 1 ? departs[0] : undefined;
+  }
+
+  async function getCurrentDepartInfo() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    const loginDepart = getCurrentLoginDepart();
+    if (loginDepart) {
+      return {
+        id: loginDepart.id || '',
+        departName: loginDepart.departName || '',
+      };
+    }
+    if (userInfo.orgCode) {
+      const depart = await defHttp.get({ url: '/sys/sysDepart/getDepartName', params: { orgCode: userInfo.orgCode } });
+      return {
+        id: depart?.id || '',
+        departName: depart?.departName || '',
+      };
+    }
+    return {
+      id: userInfo.departIds || '',
+      departName: userInfo.departIds_dictText || userInfo.orgCodeTxt || '',
+    };
+  }
+
+  async function applyCurrentUserFeedbackInfo() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    formData.responPersonid = userInfo.id || userInfo.userId || '';
+    formData.responPersonname = userInfo.realname || '';
+    const departInfo = await getCurrentDepartInfo();
+    formData.responDeptid = departInfo.id;
+    formData.responDeptname = departInfo.departName;
+  }
+
   function handleCancel() {
     visible.value = false;
   }
@@ -116,6 +161,7 @@
     }
     saving.value = true;
     try {
+      await applyCurrentUserFeedbackInfo();
       const res = await bgPartymatterFeedbackSaveOrUpdate({ ...formData }, false);
       if (res.success) {
         createMessage.success(res.message || '保存成功');
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index af4b3fe..e6f68fa 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -80,7 +80,7 @@
           </template>
         </a-row>
         <div v-if="!mainDisabled" class="main-actions">
-          <a-button type="primary" :loading="savingMain" @click="submitForm">保存主表数据</a-button>
+          <a-button type="primary" :loading="savingMain" @click="submitForm">保存</a-button>
         </div>
       </a-form>
 
@@ -423,6 +423,6 @@
     display: flex;
     justify-content: center;
     gap: 12px;
-    margin-top: 8px;
+    margin-top: 1px;
   }
 </style>
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
index 87403c9..1e2ccd5 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
@@ -59,11 +59,13 @@
   import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api';
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { useUserStore } from '/@/store/modules/user';
 
   //接收主表id
   const mainId = inject('mainId');
   const formRef = ref();
   const useForm = Form.useForm;
+  const userStore = useUserStore();
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
@@ -98,6 +100,9 @@
    */
   function add() {
     edit({});
+    nextTick(() => {
+      void applyCurrentUserFeedbackInfo();
+    });
   }
 
   /**
@@ -117,6 +122,47 @@
     });
   }
 
+  function getCurrentLoginDepart() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    const loginInfo = (userStore.getLoginInfo || {}) as Record<string, any>;
+    const departs = Array.isArray(loginInfo.departs) ? loginInfo.departs : [];
+    if (userInfo.orgCode) {
+      return departs.find((item) => item.orgCode === userInfo.orgCode);
+    }
+    return departs.length === 1 ? departs[0] : undefined;
+  }
+
+  async function getCurrentDepartInfo() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    const loginDepart = getCurrentLoginDepart();
+    if (loginDepart) {
+      return {
+        id: loginDepart.id || '',
+        departName: loginDepart.departName || '',
+      };
+    }
+    if (userInfo.orgCode) {
+      const depart = await defHttp.get({ url: '/sys/sysDepart/getDepartName', params: { orgCode: userInfo.orgCode } });
+      return {
+        id: depart?.id || '',
+        departName: depart?.departName || '',
+      };
+    }
+    return {
+      id: userInfo.departIds || '',
+      departName: userInfo.departIds_dictText || userInfo.orgCodeTxt || '',
+    };
+  }
+
+  async function applyCurrentUserFeedbackInfo() {
+    const userInfo = (userStore.getUserInfo || {}) as Record<string, any>;
+    formData.responPersonid = userInfo.id || userInfo.userId || '';
+    formData.responPersonname = userInfo.realname || '';
+    const departInfo = await getCurrentDepartInfo();
+    formData.responDeptid = departInfo.id;
+    formData.responDeptname = departInfo.departName;
+  }
+
   /**
    * 提交数据
    */
@@ -141,6 +187,9 @@
     if (model.id) {
       isUpdate.value = true;
     }
+    if (!isUpdate.value) {
+      await applyCurrentUserFeedbackInfo();
+    }
    
     //循环数据
     for (let data in model) {