From 23ff92974ce13ae02c555b5bed48e174f8cc13ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=B7=91=E5=8B=A4?=
 <13326422+wang-shuqin98@user.noreply.gitee.com>
Date: Wed, 29 Jul 2026 21:58:11 +0800
Subject: [PATCH] =?UTF-8?q?wsq-=E5=89=8D=E7=AB=AF-20260729-feat-=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=80=E7=BB=88=E5=A5=96=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImprovementProposal.data.ts                  | 10 +++++-----
 .../ImprovementProposalList.vue                  |  6 ++++++
 .../components/ImprovementProposalForm.vue       | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/gh/improvementProposal/ImprovementProposal.data.ts b/src/views/gh/improvementProposal/ImprovementProposal.data.ts
index e8a7ba8..0e11cd3 100644
--- a/src/views/gh/improvementProposal/ImprovementProposal.data.ts
+++ b/src/views/gh/improvementProposal/ImprovementProposal.data.ts
@@ -65,11 +65,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'improvementMethod'
    },
-   // {
-   //  title: '最终奖项',
-   //  align:"center",
-   //  dataIndex: 'finalAward'
-   // },
+   {
+    title: '最终奖项',
+    align:"center",
+    dataIndex: 'finalAward_dictText'
+   },
    {
     title: '业务展示状态',
     align:"center",
diff --git a/src/views/gh/improvementProposal/ImprovementProposalList.vue b/src/views/gh/improvementProposal/ImprovementProposalList.vue
index d3df91b..221b963 100644
--- a/src/views/gh/improvementProposal/ImprovementProposalList.vue
+++ b/src/views/gh/improvementProposal/ImprovementProposalList.vue
@@ -27,6 +27,12 @@
         <template #label><span title="提案部门">提案部门</span></template>
             <sz-select-dept v-model:value="queryParam.proposalDeptId" :multiple="false" checkStrictly allow-clear />
         </a-form-item>
+        </a-col>
+        <a-col v-if="toggleSearchStatus" :lg="6">
+        <a-form-item name="finalAward">
+        <template #label><span title="最终奖项">最终奖项</span></template>
+            <JDictSelectTag v-model:value="queryParam.finalAward" dictCode="proposal_prize" placeholder="请选择最终奖项" allow-clear />
+        </a-form-item>
         </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
index 7fb40e1..3cde3fe 100644
--- a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
@@ -2,7 +2,7 @@
   <a-spin :spinning="loading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form v-bind="formItemLayout" name="ImprovementProposalForm" ref="formRef">
+        <a-form v-bind="formItemLayout" name="ImprovementProposalForm" ref="formRef" :class="{ 'detail-disabled': disabled }">
           <a-row>
 						<a-col :span="12">
 							<a-form-item label="提案编号" :required="false" id="ImprovementProposalForm-proposalNo" name="proposalNo">
@@ -75,6 +75,11 @@
 								<a-textarea v-model:value="formData.improvementEffect" :rows="4" placeholder="请输入改善效果" />
 							</a-form-item>
 						</a-col>
+						<a-col v-if="disabled" :span="24">
+							<a-form-item label="部门评定结果" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
+								<j-dict-select-tag v-model:value="formData.finalAward" dictCode="proposal_prize" placeholder="请等待评定" disabled />
+							</a-form-item>
+						</a-col>
           </a-row>
         </a-form>
       </template>
@@ -470,4 +475,13 @@
     max-height: 340px;
     overflow: auto;
   }
+  .detail-disabled :deep(.ant-input-clear-icon) {
+    display: none !important;
+  }
+  .detail-disabled :deep(.ant-select-clear) {
+    display: none !important;
+  }
+  .detail-disabled :deep(.ant-input-password-icon) {
+    display: none !important;
+  }
 </style>