From c8a5ee7930a75f87c3cb16c587bd1b3309b475ec Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 4 Jul 2025 09:25:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(table):=20=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 设置表格列宽，优化表格布局
- 添加固定列功能，提高表格滚动体验
- 更新折扣输入格式，支持更精确的数值
- 调整表格样式，提升可读性
---
 .../src/main/resources/templates/include.html |  2 ++
 .../templates/layout/product-list.html        |  2 +-
 .../templates/manage/delivery/delivery.html   | 16 +++++++++++++
 .../templates/manage/order/order.html         | 16 ++++++++++++-
 .../templates/system/agent/agent.html         |  7 +++++-
 .../templates/system/customer/info.html       | 11 +++++----
 .../templates/system/partner/partner.html     | 17 +++++++++++++-
 .../templates/system/product/product.html     | 23 +++++++++++++++----
 8 files changed, 82 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index f146ce38..3e1a2ace 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -17,6 +17,7 @@
 
 <!-- 通用JS -->
 <div th:fragment="footer">
+
     <script th:inline="javascript"> var ctx = [[@{/}]]; var lockscreen = [[${session.lockscreen}]]; if(lockscreen){window.top.location=ctx+"lockscreen";} </script>
     <a id="scroll-up" href="javascript:;" class="btn btn-sm display"><i class="fa fa-angle-double-up"></i></a>
     <script th:src="@{/js/jquery.min.js?v=3.6.3}"></script>
@@ -39,6 +40,7 @@
 
     <script th:src="@{/ruoyi/js/common.js?v=4.8.0}"></script>
     <script th:src="@{/ruoyi/js/ry-ui.js?v=4.8.0}"></script>
+    <script th:src="@{/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js?v=1.22.6}"></script>
 </div>
 <!--layui库-->
 <div th:fragment="layui">
diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
index 0a4b0f23..8e13f427 100644
--- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html
+++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
@@ -173,7 +173,7 @@
 </td>
 <td>
 <input value="${data.guidanceDiscount || ''}" name="softwareProjectProductInfoList[${length}].guidanceDiscount" readonly type="hidden" class="form-control guidanceDiscount" >
-<label style="display: flex;align-items: center"><input style="width: calc(100% - 10px);" value="${data.guidanceDiscountFormat || ''}" readonly required type="number" min="0" max="100" step="0.1" class="form-control guidance-discount-format"  required>%
+<label style="display: flex;align-items: center"><input style="width: calc(100% - 10px);" value="${data.guidanceDiscountFormat || ''}" readonly required type="number" min="0" max="100" step="0.01" class="form-control guidance-discount-format"  required>%
 </label>
 </td>
 <td><input value="${data.discount || ''}" name="softwareProjectProductInfoList[${length}].discount" type="hidden" class="form-control discount"  required>
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index b9373b9e..18dfa558 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -3,6 +3,11 @@
 <head>
     <th:block th:include="include :: header('发货记录列表')" />
 </head>
+<style>
+    .bootstrap-table table {
+        table-layout: fixed;
+    }
+</style>
 <body class="gray-bg">
      <div class="container-div">
         <div class="row">
@@ -92,6 +97,8 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "发货记录",
+                fixedColumns: true,
+                fixedRightNumber: 1,
                 columns: [{
                     checkbox: true
                 },
@@ -101,11 +108,13 @@
                     visible: false
                 },
                 {
+                    width: 150,
                     field: 'orderCode',
                     title: '合同编号',
 
                 },
                 {
+                    width: 260,
                     field: 'orderName',
                     title: '合同名称',
                     formatter:function (value,row){
@@ -113,10 +122,12 @@
                     },
                 },
                 {
+                    width: 100,
                     field: 'deliveryCode',
                     title: '发货单号'
                 },
                 {
+                    width: 100,
                     field: 'total',
                     title: '发货数量',
                     escape:true,
@@ -129,10 +140,12 @@
                     }
                 },
                 {
+                    width: 100,
                     field: 'deliveryDate',
                     title: '发货日期'
                 },
                 {
+                    width: 100,
                     field: 'deliveryType',
                     title: '发货方式',
                     formatter: function(value, row, index) {
@@ -140,6 +153,7 @@
                     }
                 },
                 {
+                    width: 100,
                     field: 'deliveryStatus',
                     title: '发货状态',
                     formatter: function(value, row, index) {
@@ -147,10 +161,12 @@
                     }
                 },
                     {
+                        width: 100,
                         field: 'createByName',
                         title: '创建人'
                     },
                 {
+                    width: 190,
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html
index f52a38f2..edad408e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html
@@ -7,6 +7,9 @@
     .select-list li p, .select-list li label:not(.radio-box){
         width: 95px;
     }
+    .bootstrap-table table {
+        table-layout: fixed;
+    }
 </style>
 <body class="gray-bg">
      <div class="container-div">
@@ -79,6 +82,8 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "合同档案",
+                fixedColumns: true,
+                fixedRightNumber:1,
                 columns: [{
                     checkbox: true
                 },
@@ -88,26 +93,32 @@
                     visible: false
                 },
                 {
+                    width:150,
                     field: 'orderCode',
                     title: '合同编号'
                 },
                 {
+                    width:80,
                     field: 'versionCode',
                     title: '版本号'
                 },
                 {
+                    width:260,
                     field: 'orderName',
                     title: '合同名称'
                 },
                     {
+                        width:100,
                         field: 'projectCode',
                         title: '项目编号'
                 },
                 {
+                    width:170,
                     field: 'customerName',
                     title: '最终客户名称'
                 },
                 {
+                    width:100,
                     field: 'orderType',
                     title: '合同类型',
                     formatter: function(value, row, index) {
@@ -115,11 +126,13 @@
                     }
                 },
                 {
+                    width:100,
                     field: 'orderDate',
                     title: '合同签定日期'
                 },
                     {
-                    field: 'createByName',
+                        width:100,
+                        field: 'createByName',
                     title: '创建人'
                 },
                 // {
@@ -127,6 +140,7 @@
                 //     title: '合同状态'
                 // },
                 {
+                    width:150,
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
index 06466dfa..4dade174 100644
--- a/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
+++ b/ruoyi-admin/src/main/resources/templates/system/agent/agent.html
@@ -92,27 +92,32 @@
                     visible: false
                 },
                 {
+                    width: 100,
                     field: 'agentCode',
                     title: '代表处编码'
                 },
                 {
+                    width: 100,
                     field: 'agentName',
                     title: '代表处名称'
                 },
                 {
+                    width: 100,
                     field: 'province',
                     title: '所在省'
                 },
                 {
+                    width: 100,
                     field: 'city',
                     title: '所在市'
                 },
                 {
+                    width: 100,
                     field: 'createAt',
                     title: '创建时间'
                 },
                 {
-                    width: '200',
+                    width: '150',
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/info.html b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
index a242e5de..e88e374e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/info.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/info.html
@@ -9,6 +9,9 @@
     }
     .bootstrap-table table {
         table-layout: fixed;
+        th,td{
+            word-wrap: break-word;
+        }
     }
 </style>
 <body class="gray-bg">
@@ -115,17 +118,17 @@
                     title: '最终客户名称'
                 },
                 {
-                    width:100,
+                    width:80,
                     field: 'customerPostcode',
                     title: '客户邮编'
                 },
                 {
-                    width:100,
+                    width:80,
                     field: 'province',
                     title: '所在省'
                 },
                 {
-                    width:100,
+                    width:80,
                     field: 'city',
                     title: '所在市'
                 },
@@ -152,7 +155,7 @@
                 {
                     width:100,
                     field: 'bgProperty',
-                    title: '所属行业',
+                    title: 'BG',
                     formatter: (value, row) => {
                         return  $.table.selectDictLabel([[${@dict.getType('bg_type')}]], value);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index 642e8305..7fc1783c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -13,6 +13,9 @@
     .select-list li p, .select-list li label:not(.radio-box){
         width: 80px;
     }
+    .bootstrap-table table {
+        table-layout: fixed;
+    }
 </style>
 <body class="gray-bg">
      <div class="container-div">
@@ -77,7 +80,7 @@
     </div>
     <th:block th:include="include :: footer" />
      <th:block th:include="include :: jquery-cxselect-js"/>
-
+     <th:block th:include="include :: bootstrap-table-fixed-columns-js" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:partner:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:partner:remove')}]];
@@ -92,6 +95,8 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "代理商管理",
+                fixedColumns:true,
+                fixedRightNumber:1,
                 columns: [{
                     checkbox: true
                 },
@@ -101,34 +106,42 @@
                     visible: false
                 },
                 {
+                    width:100,
                     field: 'partnerCode',
                     title: '代理商编码'
                 },
                 {
+                    width: 200,
                     field: 'partnerName',
                     title: '代理商名称'
                 },
                 {
+                    width:100,
                     field: 'province',
                     title: '省'
                 },
                 {
+                    width:100,
                     field: 'city',
                     title: '市'
                 },
                 {
+                    width:100,
                     field: 'address',
                     title: '详细地址'
                 },
                 {
+                    width:100,
                     field: 'contactPerson',
                     title: '联系人'
                 },
                 {
+                    width:100,
                     field: 'contactPhone',
                     title: '联系电话'
                 },
                 {
+                    width:100,
                     field: 'level',
                     title: '认证级别',
                     formatter: function(value, row, index) {
@@ -136,10 +149,12 @@
                     }
                 },
                 {
+                    width:100,
                     field: 'createAt',
                     title: '创建时间'
                 },
                 {
+                    width:150,
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html
index ed6932de..3934c9b1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/product/product.html
+++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html
@@ -3,6 +3,11 @@
 <head>
     <th:block th:include="include :: header('产品管理列表')" />
 </head>
+<style>
+    .bootstrap-table table {
+        table-layout: fixed;
+    }
+</style>
 <body class="gray-bg">
      <div class="container-div">
         <div class="row">
@@ -49,6 +54,7 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: bootstrap-table-fixed-columns-js" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:product:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:product:remove')}]];
@@ -62,6 +68,8 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "产品管理",
+                fixedColumns:true,
+                fixedRightNumber:1,
                 columns: [{
                     checkbox: true
                 },
@@ -71,37 +79,44 @@
                     visible: false
                 },
                 {
+                    width:100,
                     field: 'productCode',
                     title: 'BOM编码'
                 },
-                    {
-                    field: 'hzCode',
+                    {width:100,
+                        field: 'hzCode',
                     title: '上架编码'
                 },
                 {
+                    width:100,
                     field: 'productName',
                     title: '产品名称'
                 },
                 {
+                    width:100,
                     field: 'model',
                     title: '产品型号'
                 },
                     {
-                    field: 'cataloguePrice',
+                        width:100,
+                        field: 'cataloguePrice',
                     title: '目录单价'
                 },
                     {
-                    field: 'guidanceDiscount',
+                        width:100,
+                        field: 'guidanceDiscount',
                     title: '指导折扣',
                         formatter: function(value, row, index) {
                             return value?(value * 100).toFixed(2) + '%' :'-';
                         }
                 },
                 {
+                    width:100,
                     field: 'createdAt',
                     title: '创建时间'
                 },
                 {
+                    width:150,
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
