!126 Merge branch 'refs/heads/master' into wsq-20260727

Merge pull request !126 from 王淑勤/wsq-20260727

src/views/gh/improvementProposal/ImprovementProposal.data.ts

@@ -9,13 +9,21 @@ export const columns: BasicColumn[] = [
    {
     title: '提案编号',
     align:"center",
-    dataIndex: 'proposalNo'
+    dataIndex: 'proposalNo',
+     width:150
+
    },
    {
     title: '提案名称',
     align:"center",
     dataIndex: 'proposalName'
    },
+  {
+    title: '最终奖项',
+    align:"center",
+    dataIndex: 'finalAward_dictText',
+      width:90
+  },
    {
     title: '提出日期',
     align:"center",
@@ -24,6 +32,7 @@ export const columns: BasicColumn[] = [
       text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
       return text;
     },
+     width:120
    },
    // {
     //   title: '提案部门ID',
@@ -33,7 +42,8 @@ export const columns: BasicColumn[] = [
    {
     title: '提案部门名称',
     align:"center",
-    dataIndex: 'proposalDeptName'
+    dataIndex: 'proposalDeptName',
+     width:110
    },
    // {
     //   title: '申请人ID',
@@ -43,17 +53,22 @@ export const columns: BasicColumn[] = [
    {
     title: '申请人姓名',
     align:"center",
-    dataIndex: 'applicantName'
+    dataIndex: 'applicantName',
+     width:90
    },
    {
     title: '团队名称',
     align:"center",
-    dataIndex: 'teamName'
+    dataIndex: 'teamName',
+     width:110
+
    },
    {
     title: '提案类别',
     align:"center",
-    dataIndex: 'proposalCategory_dictText'
+    dataIndex: 'proposalCategory_dictText',
+     width:110
+
    },
    {
     title: '问题描述',
@@ -66,8 +81,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'improvementMethod'
    },
    {
-    title: '最终奖项',
+    title: '业务状态',
     align:"center",
+    dataIndex: 'bpmStatus_dictText',
+     width:90
+
     dataIndex: 'finalAward_dictText'
    },
    {

src/views/gh/improvementProposal/ImprovementProposalList.vue

@@ -18,6 +18,8 @@
         </a-col>
         <a-col v-if="toggleSearchStatus" :lg="6">
         <a-form-item name="bpmStatus">
+        <template #label><span title="业务状态">业务状态</span></template>
+            <JDictSelectTag v-model:value="queryParam.bpmStatus" dictCode="super_status" placeholder="请选择业务状态" allow-clear />
         <template #label><span title="流程状态">流程状态</span></template>
             <JDictSelectTag v-model:value="queryParam.bpmStatus" dictCode="super_status" placeholder="请选择流程状态" allow-clear />
         </a-form-item>