From 65ea58b9a4a33a0a9b46ef61b4f152a5eef4d91f Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Tue, 19 May 2026 15:20:44 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260519-=20YHJY005-=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E8=A1=A8=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B9=20YHJY008-=E5=AF=B9=E4=BA=8E?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF=E4=B8=AD=E9=97=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BF=9D=E7=95=99=EF=BC=8C?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E5=8F=AA=E7=BC=96=E8=BE=91=E4=B8=8D=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatter.data.ts    |  3 +-
 .../BgPartymatterBPMFeedbackModal.vue         | 31 ++++++++++---
 .../components/BgPartymatterBPMForm.vue       | 45 +++++++++++++++++--
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
index 2f835de..e7596cc 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
@@ -151,7 +151,8 @@ export const bgPartymatterFeedbackColumns: BasicColumn[] = [
   {
     title: '完成状态',
     align:"center",
-    dataIndex: 'bpmStatus'
+    dataIndex: 'bpmStatus',
+    customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus
   },
   // {
   //   title: '外键',
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 74e892d..46cffd8 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -1,6 +1,6 @@
 <template>
   <JModal
-    title="新增反馈"
+    :title="modalTitle"
     :width="820"
     :visible="visible"
     :confirmLoading="saving"
@@ -40,7 +40,7 @@
 <!--        </a-col>-->
         <a-col :span="12">
           <a-form-item label="完成状态" name="bpmStatus">
-            <a-input v-model:value="formData.bpmStatus" allow-clear />
+            <JDictSelectTag v-model:value="formData.bpmStatus" dictCode="feedback_status" placeholder="请选择完成状态" allow-clear />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -78,6 +78,7 @@
   import { useUserStore } from '/@/store/modules/user';
   import { buildUUID } from '/@/utils/uuid';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const emit = defineEmits(['success']);
   const { createMessage } = useMessage();
@@ -85,6 +86,7 @@
 
   const visible = ref(false);
   const saving = ref(false);
+  const modalTitle = ref('新增反馈');
   const formRef = ref();
   const uploadFileRef = ref<InstanceType<typeof SUploadFile> | null>(null);
   const uploadSecretLevel = ref(1);
@@ -121,10 +123,22 @@
     nextTick(() => formRef.value?.clearValidate?.());
   }
 
-  function open(mainId: string, secretLevel?: string | number, bpmProcessId = '') {
+  function open(mainId: string, secretLevel?: string | number, bpmProcessId = '', record?: Record<string, any>) {
     resetForm(mainId, bpmProcessId);
     uploadSecretLevel.value = normalizeSecretLevel(secretLevel);
-    void applyCurrentUserFeedbackInfo();
+    if (record?.id) {
+      modalTitle.value = '编辑反馈';
+      Object.keys(formData).forEach((key) => {
+        if (Object.prototype.hasOwnProperty.call(record, key)) {
+          formData[key] = record[key] ?? '';
+        }
+      });
+      formData.mainId = formData.mainId || mainId;
+      formData.bpmProcessId = formData.bpmProcessId || bpmProcessId;
+    } else {
+      modalTitle.value = '新增反馈';
+      void applyCurrentUserFeedbackInfo();
+    }
     visible.value = true;
   }
 
@@ -186,11 +200,14 @@
     }
     saving.value = true;
     try {
-      await applyCurrentUserFeedbackInfo();
-      if (!formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
+      const isUpdate = !!formData.id;
+      if (!isUpdate) {
+        await applyCurrentUserFeedbackInfo();
+      }
+      if (!isUpdate && uploadFileRef.value?.hasPendingFiles?.()) {
         formData.id = buildUUID();
       }
-      const res = await bgPartymatterFeedbackSaveOrUpdate({ ...formData }, false);
+      const res = await bgPartymatterFeedbackSaveOrUpdate({ ...formData }, isUpdate);
       if (res.success) {
         if (formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
           await uploadFileRef.value.bindBussinessId(formData.id);
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 49a832e..4dd5243 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -109,12 +109,13 @@
         :columns="feedbackColumns"
         :data-source="feedbackList"
         :pagination="false"
-        :scroll="{ x: 1220 }"
+        :scroll="{ x: 1340 }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'attachments'">
             <SUploadFile
               v-if="record.id"
+              :key="getFeedbackAttachmentKey(record)"
               class="feedback-attachment-list"
               :bussiness-id="record.id"
               :disabled="true"
@@ -122,6 +123,14 @@
             />
             <span v-else>-</span>
           </template>
+          <template v-else-if="column.key === 'action'">
+            <a-space>
+              <a-button type="link" size="small" @click="openFeedbackEditModal(record)">编辑</a-button>
+              <a-popconfirm title="是否确认删除" @confirm="handleFeedbackDelete(record)">
+                <a-button type="link" size="small" danger>删除</a-button>
+              </a-popconfirm>
+            </a-space>
+          </template>
         </template>
       </a-table>
 
@@ -178,7 +187,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import Icon from '/@/components/Icon/index';
-  import { bgPartymatterFeedbackList, saveBpmForm, setProcessVariable } from '../BgPartymatter.api';
+  import { bgPartymatterFeedbackDelete, bgPartymatterFeedbackList, saveBpmForm, setProcessVariable } from '../BgPartymatter.api';
   import { usePermission } from '/@/hooks/web/usePermission';
   import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   import JDictSelectTag from "../../../../components/Form/src/jeecg/components/JDictSelectTag.vue";
@@ -216,6 +225,7 @@
   const savingSubApproveUser = ref(false);
   const showBaseInfoDetail = ref(false);
   const feedbackList = ref<any[]>([]);
+  const feedbackAttachmentRefreshKey = ref(0);
   const subApproveUser = ref('');
   const isEnd = ref(0);
 
@@ -250,8 +260,9 @@
     { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 140 },
     { title: '实际执行情况', dataIndex: 'actualExect', align: 'left', width: 280 },
     { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 180 },
-    { title: '完成状态', dataIndex: 'bpmStatus', align: 'center', width: 120 },
+    { title: '完成状态', dataIndex: 'bpmStatus', align: 'center', width: 120, customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus },
     { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
+    { title: '操作', dataIndex: 'action', key: 'action', align: 'center', width: 120, fixed: 'right' },
   ];
 
   const mainDisabled = computed(() => {
@@ -323,10 +334,16 @@
     const bpmProcessId = processInfo.value.processInstanceId;
     if (!mainForm.id || !bpmProcessId) {
       feedbackList.value = [];
+      feedbackAttachmentRefreshKey.value += 1;
       return;
     }
     const res = await bgPartymatterFeedbackList({ mainId: mainForm.id, bpmProcessId, pageNo: 1, pageSize: 999 });
     feedbackList.value = res?.records || res?.result?.records || [];
+    feedbackAttachmentRefreshKey.value += 1;
+  }
+
+  function getFeedbackAttachmentKey(record: Recordable) {
+    return `${record?.id || ''}-${feedbackAttachmentRefreshKey.value}`;
   }
 
   async function submitForm() {
@@ -389,6 +406,28 @@
     feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInstanceId);
   }
 
+  function openFeedbackEditModal(record: Recordable) {
+    if (!record?.id) {
+      createMessage.warning('反馈记录不存在，无法编辑');
+      return;
+    }
+    feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInfo.value.processInstanceId, record);
+  }
+
+  async function handleFeedbackDelete(record: Recordable) {
+    if (!record?.id) {
+      createMessage.warning('反馈记录不存在，无法删除');
+      return;
+    }
+    try {
+      await bgPartymatterFeedbackDelete({ id: record.id }, () => undefined);
+      createMessage.success('删除成功');
+      await loadFeedbackList();
+    } catch (error) {
+      createMessage.warning('删除失败');
+    }
+  }
+
   async function saveSubApproveUserVariable(options: { showSuccessMessage?: boolean } = {}) {
     const { showSuccessMessage = true } = options;
     const processInstanceId = processInfo.value.processInstanceId;