From 8d974cde0c3bcdced4c91866348ad95499ae227b Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Wed, 8 Jul 2026 14:51:59 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260708=20=E5=85=9A=E5=A7=94=E4=BC=9A?=
 =?UTF-8?q?=E3=80=81=E6=89=80=E5=8A=A1=E4=BC=9A=E7=9A=84=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A02=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=92=8C=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bg/bgpartymatter/BgPartymatter.data.ts    | 22 +++++++++++++++++--
 .../bg/bgpartymatter/BgPartymatterList.vue    |  2 +-
 .../BgPartymatterBPMFeedbackModal.vue         | 16 +++++++++++---
 .../components/BgPartymatterBPMForm.vue       | 10 ++++++++-
 .../components/BgPartymatterFeedbackForm.vue  | 12 ++++++++++
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
index ad5f318..5ac2e03 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
@@ -159,7 +159,23 @@ export const bgPartymatterFeedbackColumns: BasicColumn[] = [
   {
     title: '反馈人姓名',
     align:"center",
-    dataIndex: 'responPersonname'
+    dataIndex: 'responPersonname',
+    width: 110,
+  },
+  {
+    title: '计划完成目标',
+    align:"center",
+    dataIndex: 'planExect'
+  },
+  {
+    title: '计划完成日期',
+    align:"center",
+    dataIndex: 'planTime',
+    width: 120,
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
   },
   {
     title: '实际执行情况',
@@ -169,12 +185,14 @@ export const bgPartymatterFeedbackColumns: BasicColumn[] = [
   {
     title: '实际完成时间',
     align:"center",
-    dataIndex: 'actualTime'
+    dataIndex: 'actualTime',
+    width: 155,
   },
   {
     title: '完成状态',
     align:"center",
     dataIndex: 'bpmStatus',
+    width: 95,
     customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus
   },
   // {
diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue
index e5b0830..8091e22 100644
--- a/src/views/bg/bgpartymatter/BgPartymatterList.vue
+++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue
@@ -112,7 +112,7 @@
               :dataSource="getFeedbackTableData(record)"
               :loading="getFeedbackTableLoading(record)"
               :pagination="false"
-              :scroll="{ x: 1220 }"
+              :scroll="{ x: 1400 }"
             >
               <template #feedbackAttachments="{ record: feedbackRecord }">
                 <SUploadFile
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 5c209a1..9be2113 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -48,6 +48,16 @@
             <a-date-picker v-model:value="formData.actualTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
           </a-form-item>
         </a-col>
+        <a-col :span="24">
+          <a-form-item label="计划完成目标" name="planExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+            <a-textarea v-model:value="formData.planExect" :rows="3" allow-clear />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="计划完成日期" name="planTime">
+            <a-date-picker v-model:value="formData.planTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+          </a-form-item>
+        </a-col>
         <a-col :span="24">
           <a-form-item label="实际执行情况" name="actualExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
             <a-textarea v-model:value="formData.actualExect" :rows="4" allow-clear />
@@ -105,6 +115,8 @@
     responDeptname: '',
     responPersonid: '',
     responPersonname: '',
+    planExect: '',
+    planTime: '',
     actualExect: '',
     actualTime: '',
     bpmStatus: '',
@@ -112,9 +124,7 @@
     mainId: '',
   });
 
-  const formRules = {
-    actualExect: [{ required: true, message: '请输入实际执行情况' }],
-  };
+  const formRules = {};
 
   function resetForm(mainId = '', bpmProcessId = '') {
     Object.keys(formData).forEach((key) => {
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index 508e040..f67d3be 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
@@ -334,6 +334,14 @@
   const feedbackBaseColumns = [
     { title: '责任部门名称', dataIndex: 'responDeptname', align: 'center', width: 160 },
     { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 140 },
+    { title: '计划完成目标', dataIndex: 'planExect', align: 'center', width: 260 },
+    {
+      title: '计划完成日期',
+      dataIndex: 'planTime',
+      align: 'center',
+      width: 140,
+      customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)),
+    },
     { title: '实际执行情况', dataIndex: 'actualExect', align: 'center', width: 280 },
     { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 180 },
     { title: '完成状态', dataIndex: 'bpmStatus', align: 'center', width: 120, customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus },
@@ -344,7 +352,7 @@
     return canManageFeedback.value ? [...feedbackBaseColumns, feedbackActionColumn] : feedbackBaseColumns;
   });
   const feedbackTableScrollX = computed(() => {
-    return canManageFeedback.value ? 1340 : 1220;
+    return canManageFeedback.value ? 1740 : 1620;
   });
 
   const mainDisabled = computed(() => {
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
index 1e2ccd5..8522b50 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
@@ -24,6 +24,16 @@
 								<a-input v-model:value="formData.responPersonname" placeholder="请输入反馈人姓名"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
+						<a-col :span="24">
+							<a-form-item label="计划完成目标" v-bind="validateInfos.planExect" id="BgPartymatterFeedback-planExect" name="planExect">
+								<a-textarea v-model:value="formData.planExect" placeholder="请输入计划完成目标" :rows="3" allow-clear ></a-textarea>
+							</a-form-item>
+						</a-col>
+						<a-col :span="12">
+							<a-form-item label="计划完成日期" v-bind="validateInfos.planTime" id="BgPartymatterFeedback-planTime" name="planTime">
+								<a-date-picker placeholder="请选择计划完成日期" v-model:value="formData.planTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
+							</a-form-item>
+						</a-col>
 						<a-col :span="12">
 							<a-form-item label="实际执行情况" v-bind="validateInfos.actualExect" id="BgPartymatterFeedback-actualExect" name="actualExect">
 								<a-input v-model:value="formData.actualExect" placeholder="请输入实际执行情况"  allow-clear ></a-input>
@@ -73,6 +83,8 @@
         responDeptname: '',   
         responPersonid: '',   
         responPersonname: '',   
+        planExect: '',   
+        planTime: '',   
         actualExect: '',   
         actualTime: '',   
         bpmStatus: '',