From 356fc1995e735c0cc43b8472e728d2700b2a894a Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Wed, 4 Feb 2026 13:39:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(quotation):=20=E6=9B=B4=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在表格中添加创建人列并显示创建人姓名
- 为报价金额列添加货币格式化显示
- 更新步骤组件样式，添加自定义图标和激活状态高亮
- 修改数据查询逻辑，关联用户表获取创建人姓名
- 在实体类中添加createByName字段用于接收创建人信息
---
 .../src/views/base/quotation/index.vue        | 33 +++++++++++++++++--
 .../java/com/ruoyi/sip/domain/Quotation.java  |  1 +
 .../mapper/Quotation/QuotationMapper.xml      |  2 +-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/oms_web/oms_vue/src/views/base/quotation/index.vue b/oms_web/oms_vue/src/views/base/quotation/index.vue
index 6b12fe85..462c3365 100644
--- a/oms_web/oms_vue/src/views/base/quotation/index.vue
+++ b/oms_web/oms_vue/src/views/base/quotation/index.vue
@@ -84,12 +84,13 @@
       <el-table-column label="报价单" align="center" prop="quotationName" />
       <el-table-column label="项目编号" align="center" prop="projectCode" />
 <!--      <el-table-column label="报价金额" align="center" prop="quotationAmount" />-->
-      <el-table-column label="报价金额(¥)" align="center" prop="discountAmount" />
+      <el-table-column label="报价金额(¥)" align="center" prop="discountAmount" :formatter="(row, column, cellValue)=>formatCurrency(cellValue)" />
       <el-table-column label="状态" align="center" prop="quotationStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.quotation_status" :value="scope.row.quotationStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createByName" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -147,8 +148,13 @@
     <!-- 添加或修改报价单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body  :close-on-click-modal="false" @close="cancel">
       <el-steps :active="activeStep" simple finish-status="success" style="margin-bottom: 20px; cursor: pointer;">
-        <el-step title="报价单列表" @click.native="handleStepClick(0)"></el-step>
-        <el-step title="设置基本信息" @click.native="handleStepClick(1)"></el-step>
+        <el-step icon="el-icon-caret-left"  @click.native="handleStepClick(0)">
+          <template #title>
+            <i class="el-icon-caret-left"></i>
+            报价单列表
+          </template>
+        </el-step>
+        <el-step title="设置基本信息"  @click.native="handleStepClick(1)"></el-step>
         <el-step title="配置信息" @click.native="handleStepClick(2)"></el-step>
       </el-steps>
 
@@ -571,3 +577,24 @@ export default {
   }
 };
 </script>
+<style scoped>
+  /* 只有第一步显示自定义图标，覆盖完成状态的对勾 */
+  ::v-deep .el-step:first-child .el-step__icon-inner.is-status {
+    display: none;
+  }
+  ::v-deep .el-step:first-child .el-step__icon-inner:not(.is-status) {
+    display: inline-block;
+  }
+
+  /* 当前激活步骤标题颜色鲜明 */
+  ::v-deep .el-step__title.is-process {
+    color: #1890ff;
+    font-weight: 700;
+  }
+
+  /* 当前激活步骤图标颜色鲜明 */
+  ::v-deep .el-step__head.is-process {
+    color: #1890ff;
+    border-color: #1890ff;
+  }
+</style>
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/Quotation.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/Quotation.java
index 9ab86553..f59edbe0 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/Quotation.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/Quotation.java
@@ -73,6 +73,7 @@ public class Quotation extends BaseEntity {
      * 客户名称
      */
     private String customerName;
+    private String createByName;
 //    @Excel(name = "软件")
     private List<QuotationProductInfo> softwareProjectProductInfoList;
 //    @Excel(name = "终端")
diff --git a/ruoyi-sip/src/main/resources/mapper/Quotation/QuotationMapper.xml b/ruoyi-sip/src/main/resources/mapper/Quotation/QuotationMapper.xml
index 252e9e59..5899fcdb 100644
--- a/ruoyi-sip/src/main/resources/mapper/Quotation/QuotationMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/Quotation/QuotationMapper.xml
@@ -30,7 +30,7 @@
 		select
 		t1.id, t1.quotation_code, t1.quotation_name, t1.quotation_amount, t1.discount_amount,
 		t1.quotation_status, t1.create_time, t1.create_by, t1.update_by, t1.update_time, t1.remark,
-		t1.agent_code, t1.amount_type, t1.customer_name
+		t1.agent_code, t1.amount_type, t1.customer_name,u.user_name as create_by_name
 		from oms_quotation t1
 		LEFT join sys_user u on t1.create_by = u.user_id
 		<where>