From 36da757e6beccca30dfe5f86dc5fb7f2ca6dcfa5 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 24 Oct 2024 09:49:02 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E3=80=81?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=8C=89=E9=92=AE=E9=87=87=E7=94=A8=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=A4=87=E6=B3=A8=E5=92=8C=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=BC=95=E7=94=A8$.table.tooltip=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E9=9A=90=E8=97=8F=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=20=E4=BB=93=E5=BA=93=E5=90=8E=E7=AB=AF=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=92=8Cget=E3=80=81set=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=EF=BC=9Adefalt=5F?=
 =?UTF-8?q?itemclass=E5=AD=97=E6=AE=B5=20mapper.xml=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=E5=8E=BB=E6=8E=89defalt=5Fitemclass?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?mapper.xml=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BA=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/stock/domain/StockInfo.java     | 25 +-----
 .../mapper/stock/StockInfoMapper.xml          | 21 +++--
 .../templates/stock/stockInfo/stockInfo.html  | 83 ++++++++++---------
 3 files changed, 57 insertions(+), 72 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java
index 95dbce5b..e293d326 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/domain/StockInfo.java
@@ -37,15 +37,11 @@ public class StockInfo extends BaseEntity
     @Excel(name = "仓库管理人")
     private String stockManager;
 
-    @Excel(name = "仓库管理人电话")
-    private String stockManagerPhone;
 
     /** 仓库备注 */
     @Excel(name = "仓库备注")
     private String stockMemo;
 
-    /**  */
-    private String defaltItemclass;
 
     /** 录入时间 */
     @Excel(name = "录入时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -105,16 +101,6 @@ public class StockInfo extends BaseEntity
         this.stockMemo = stockMemo;
     }
 
-    public void setDefaltItemclass(String defaltItemclass)
-    {
-        this.defaltItemclass = defaltItemclass;
-    }
-
-    public String getDefaltItemclass() 
-    {
-        return defaltItemclass;
-    }
-
     public Date getFirstAddTime() {
         return firstAddTime;
     }
@@ -131,13 +117,6 @@ public class StockInfo extends BaseEntity
         this.updateInfoTime = updateInfoTime;
     }
 
-    public String getStockManagerPhone() {
-        return stockManagerPhone;
-    }
-
-    public void setStockManagerPhone(String stockManagerPhone) {
-        this.stockManagerPhone = stockManagerPhone;
-    }
 
     @Override
     public String toString() {
@@ -146,10 +125,8 @@ public class StockInfo extends BaseEntity
             .append("stockNO", getStockNO())
             .append("stockName", getStockName())
             .append("stockAddr", getStockAddr())
-            .append("stockmanager", getStockManager())
-            .append("stockManagerPhone", getStockManagerPhone())
+            .append("stockManager", getStockManager())
             .append("stockmemo", getStockMemo())
-            .append("defaltItemclass", getDefaltItemclass())
             .append("firstAddTime", getFirstAddTime())
             .append("updateInfoTime", getUpdateInfoTime())
             .toString();
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml
index bae74704..f622ee66 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/StockInfoMapper.xml
@@ -11,15 +11,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stockAddr"            column="stockAddr"              />
         <result property="stockManager"         column="stockmanager"           />
         <result property="stockMemo"            column="stockmemo"              />
-        <result property="stockManagerPhone"    column="stock_manager_phone"    />
-        <result property="defaltItemclass"      column="defalt_itemclass"       />
         <result property="firstAddTime"         column="first_add_time"         />
         <result property="updateInfoTime"       column="update_info_time"       />
     </resultMap>
 
     <sql id="selectStockInfoVo">
-        select stock_id,StockNo, Stockname, stockAddr, stockmanager,stock_manager_phone, stockmemo,
-               defalt_itemclass, first_add_time, update_info_time from stock_info
+        select stock_id,
+               StockNo,
+               Stockname,
+               stockAddr,
+               stockmanager,
+               stockmemo,
+               first_add_time,
+               update_info_time
+        from stock_info
     </sql>
 
     <select id="selectStockInfoList" parameterType="StockInfo" resultMap="StockInfoResult">
@@ -55,19 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockName != null and stockName != ''">Stockname,</if>
             <if test="stockAddr != null and stockAddr != ''">stockAddr,</if>
             <if test="stockManager != null">stockmanager,</if>
-            <if test="stockManagerPhone != null">stock_manager_phone,</if>
             <if test="stockMemo != null">stockmemo,</if>
-            <if test="defaltItemclass != null">defalt_itemclass,</if>
             <if test="firstAddTime != null">first_add_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockNO != null and stockNO != ''">#{stockNO},</if>
             <if test="stockName != null and stockName != ''">#{stockName},</if>
             <if test="stockAddr != null and stockAddr != ''">#{stockAddr},</if>
-            <if test="stockManager != null">#{stockmanager},</if>
-            <if test="stockManagerPhone != null">#{stockManagerPhone},</if>
+            <if test="stockManager != null">#{stockManager},</if>
             <if test="stockMemo != null">#{stockMemo},</if>
-            <if test="defaltItemclass != null">#{defaltItemclass},</if>
             <if test="firstAddTime != null">#{firstAddTime},</if>
          </trim>
     </insert>
@@ -79,9 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockName != null and stockName != ''">Stockname = #{stockName},</if>
             <if test="stockAddr != null and stockAddr != ''">StockAddr = #{stockAddr},</if>
             <if test="stockManager != null">stockmanager = #{stockManager},</if>
-            <if test="stockManagerPhone != null">stock_manager_phone = #{stockManagerPhone},</if>
             <if test="stockMemo != null">stockmemo = #{stockMemo},</if>
-            <if test="defaltItemclass != null">defalt_itemclass = #{defaltItemclass},</if>
             <if test="updateInfoTime != null">update_info_time = #{updateInfoTime},</if>
         </trim>
         where stock_id = #{stockId}
diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html
index f6246ea8..687f1281 100644
--- a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html
@@ -39,13 +39,13 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="stock:stockInfo:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="stock:stockInfo:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="stock:stockInfo:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="stock:stockInfo:export">
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="stock:stockInfo:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="stock:stockInfo:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="stock:stockInfo:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -72,38 +72,47 @@
                 columns: [
                     {checkbox: true},
                     {title: '仓库id',field: 'stockId',visible: false},
-                    {title: '仓库编号',field: 'stockNO',},
-                    {title: '仓库名',field: 'stockName',},
-                    {title: '仓库地址',field: 'stockAddr',},
-                    {title: '仓库管理人',field: 'stockManager',},
-                    {title: '仓库管理人电话',field: 'stockManagerPhone',},
-                    {title: '仓库备注',field: 'stockMemo',},
-                    {title: '录入时间',field: 'firstAddTime',
-                        formatter: function (value, row, index) {
-                            // console.log(row)
-                            if (value == null) {return " ";}
-                            else {return value;}
-                        }
+                    {title: '仓库编号',field: 'stockNO', align: 'center',},
+                    {title: '仓库名',field: 'stockName',align: 'center',},
+                    {title: '仓库地址',field: 'stockAddr',align: 'center',
+                     formatter: function (value, row, index) {
+                        return $.table.tooltip(value,5,"open");
+                     }
+                    },
+                    {title: '仓库管理人',field: 'stockManager',align: 'center',},
+                    // {title: '仓库管理人电话',field: 'stockManagerPhone',align: 'center',},
+                    {title: '仓库备注',field: 'stockMemo',align: 'center',
+                     formatter: function (value, row, index){
+                        return $.table.tooltip(value,5,"open")
+                     }
                     },
-                    {title: '上次修改时间',field: 'updateInfoTime',
-                       formatter: function (value, row, index) {
-                            if (value == null) {return " ";}
-                            else {
-                                var vArr = value.split(',')
-                                return vArr[0];
-                            }
-                        }
+                    {title: '录入时间',field: 'firstAddTime',align: 'center',
+                        // formatter: function (value, row, index) {
+                        //     // console.log(row)
+                        //     if (value == null) {return " ";}
+                        //     else {return value;}
+                        // }
+                    },
+                    {title: '上次修改时间',field: 'updateInfoTime',align: 'center',
+                       // formatter: function (value, row, index) {
+                       //      if (value == null) {return " ";}
+                       //      else {
+                       //          var vArr = value.split(',')
+                       //          return vArr[0];
+                       //      }
+                       //  }
+                    },
+                    {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.stockId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.stockId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
+                    }
                     }
-                        // {
-                    //     title: '操作',
-                    //     align: 'center',
-                    //     formatter: function(value, row, index) {
-                    //         var actions = [];
-                    //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.stockNO + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                    //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.stockNO + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    //         return actions.join('');
-                    //     }
-                    // }
                 ]
             };
             $.table.init(options);