From b64fff55bc35d81e5f9660837f137be12c463bb3 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 15:02:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?wsq-=E5=89=8D=E7=AB=AF-20260728-fix-?=
=?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD=E3=80=81=E9=A2=84=E8=A7=88?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ImprovementProposalForm.vue | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
index 8e90a18..7fb40e1 100644
--- a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
@@ -50,24 +50,24 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
@@ -204,19 +204,19 @@
};
const longLabelCol = {
xs: {span: 24},
- sm: {span: 4},
+ sm: {span: 5},
};
const longWrapperCol = {
xs: {span: 24},
- sm: {span: 20},
+ sm: {span: 16},
};
const halfLabelCol = {
xs: {span: 24},
- sm: {span: 8},
+ sm: {span: 5},
};
const halfWrapperCol = {
xs: {span: 24},
- sm: {span: 16},
+ sm: {span: 18},
};
const disabled = computed(()=>{
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 2/2] =?UTF-8?q?wsq-=E5=89=8D=E7=AB=AF-20260729-feat-?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=80=E7=BB=88=E5=A5=96?=
=?UTF-8?q?=E9=A1=B9=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 @@
提案部门
+
+
+
+ 最终奖项
+
+
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 @@
-
+
@@ -75,6 +75,11 @@
+
+
+
+
+
@@ -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;
+ }