From 7f8ccb76cbfabbcb448e21f8bf1d1b69711cbc05 Mon Sep 17 00:00:00 2001
From: chabai <14799297+dhasjklhdfjkasfbhfasfj@user.noreply.gitee.com>
Date: Fri, 1 Aug 2025 15:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=B6=E5=BA=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       |  2 +-
 src/utils/pdfGenerator.ts               | 10 +++++-----
 src/views/regulation/confirm.vue        |  2 +-
 src/views/regulation/proposal/index.vue |  8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 129cefb..9de5c1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -765,7 +765,7 @@
     },
     "node_modules/@clack/prompts/node_modules/is-unicode-supported": {
       "version": "1.3.0",
-      "extraneous": true,
+      "dev": true,
       "inBundle": true,
       "license": "MIT",
       "engines": {
diff --git a/src/utils/pdfGenerator.ts b/src/utils/pdfGenerator.ts
index e29baac..6b0bdfc 100644
--- a/src/utils/pdfGenerator.ts
+++ b/src/utils/pdfGenerator.ts
@@ -37,7 +37,7 @@ export class PDFGenerator {
           z-index: 0;
           pointer-events: none;
           white-space: nowrap;
-        ">制度管理系统</div>
+        ">迪特聚能科技</div>
         
         <!-- 标题 -->
         <h1 style="
@@ -51,10 +51,10 @@ export class PDFGenerator {
         <!-- 基本信息 -->
         <div style="margin-bottom: 30px;">
           <table style="width: 100%; border-collapse: collapse;">
-            <tr>
-              <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>制度类型：</strong>${regulation.regulationType || '-'}</td>
-              <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>发布人：</strong>${regulation.createBy || '-'}</td>
-            </tr>
+                         <tr>
+               <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>制度类型：</strong>${regulation.regulationType || '-'}</td>
+               <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>发布人：</strong>${regulation.createByName || regulation.createBy || '-'}</td>
+             </tr>
             <tr>
               <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>发布时间：</strong>${regulation.publishTime || '-'}</td>
               <td style="padding: 8px 0; border-bottom: 1px solid #eee;"><strong>生效日期：</strong>${regulation.effectiveTime || '-'}</td>
diff --git a/src/views/regulation/confirm.vue b/src/views/regulation/confirm.vue
index 53d4244..fac5923 100644
--- a/src/views/regulation/confirm.vue
+++ b/src/views/regulation/confirm.vue
@@ -105,7 +105,7 @@
               size="small" 
               disabled
             >
-              已公示
+              已公告
             </a-button>
           </a-space>
         </template>
diff --git a/src/views/regulation/proposal/index.vue b/src/views/regulation/proposal/index.vue
index 9cb3f11..5dff23c 100644
--- a/src/views/regulation/proposal/index.vue
+++ b/src/views/regulation/proposal/index.vue
@@ -25,7 +25,7 @@
           
           <a-form-item label="提案人">
             <a-input 
-              v-model="searchForm.createByName" 
+              v-model="searchForm.ByNamecreate" 
               placeholder="请输入提案人" 
               allow-clear
               style="width: 150px"
@@ -59,7 +59,7 @@
             >
               <a-option value="">全部</a-option>
               <a-option value="DRAFT">草稿</a-option>
-              <a-option value="PUBLISHED">已公示</a-option>
+              <a-option value="PUBLISHED">已公告</a-option>
             </a-select>
           </a-form-item>
           
@@ -435,8 +435,8 @@ const getStatusText = (status: RegulationStatus) => {
     [RegulationStatus.DRAFT]: '草稿',
     [RegulationStatus.VOTING]: '投票中',
     [RegulationStatus.REJECTED]: '已否决',
-    [RegulationStatus.PUBLISHED]: '已公示',
-    [RegulationStatus.APPROVED]: '已通过',
+    [RegulationStatus.PUBLISHED]: '已公告',
+    [RegulationStatus.APPROVED]: '已公示',
     [RegulationStatus.ARCHIVED]: '已归档'
   }
   return texts[status] || '草稿'