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 8e90a18..3cde3fe 100644
--- a/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
+++ b/src/views/gh/improvementProposal/components/ImprovementProposalForm.vue
@@ -2,7 +2,7 @@
-
+
@@ -50,24 +50,24 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
@@ -75,6 +75,11 @@
+
+
+
+
+
@@ -204,19 +209,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(()=>{
@@ -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;
+ }