From 8286c61455496dbcadd3940b473190bfa618e6c8 Mon Sep 17 00:00:00 2001
From: endl2017 <834853355@qq.com>
Date: Tue, 22 Sep 2020 14:52:55 +0800
Subject: [PATCH] cz

---
 src/main/resources/templates/fragment.html | 48 +++++++++++++++++++++-
 src/main/resources/templates/product.html  |  1 +
 src/main/resources/templates/user.html     | 12 ++++--
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/fragment.html b/src/main/resources/templates/fragment.html
index 328f955..121b6d0 100644
--- a/src/main/resources/templates/fragment.html
+++ b/src/main/resources/templates/fragment.html
@@ -324,7 +324,6 @@
                 </div>
               </div>
             </div>
-
             <!--详细用户信息模态框-->
             <div id="query_user_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="userModalLabel">
               <div class="modal-dialog" role="document">
@@ -503,7 +502,7 @@
                 <div class="modal-content" >
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="productModalLabel">修改产品信息</h4>
+                    <h4 class="modal-title" id="uproductModalLabel">修改产品信息</h4>
                   </div>
                   <div class="modal-body">
                     <form id="updateProductFrom" th:action="@{/templates/product}" method="post">
@@ -561,5 +560,50 @@
                     </div>
                   </div>
                 </div>
+                <!--编辑产品模态框-->
+                <div id="add_product_model" class="modal fade"  tabindex="-1" role="dialog" aria-labelledby="productModalLabel">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content" >
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title" id="aproductModalLabel">修改产品信息</h4>
+                      </div>
+                      <div class="modal-body">
+                        <form id="addProductFrom" th:action="@{/templates/product}" method="post">
+                          <input type="hidden" name="_method" value="PUT">
+                          <label class="control-label" for="add_product_id">id</label>
+                          <div class="controls">
+                            <input class="input-xlarge disabled" id="add_product_id" type="text" name="id"  disabled>
+                            <input  type="hidden" id="add_products_id" name="id">
+                          </div>
+                          <div class="form-group">
+                            <label for="add_product_pname">产品名称</label>
+                            <input type="text" name="pname" class="form-control" id="add_product_pname" placeholder="产品名称">
+                          </div>
+                          <div class="form-group">
+                            <label for="add_product_ptype">类别</label>
+                            <input type="text" name="ptype" class="form-control" id="add_product_ptype" placeholder="类别">
+                          </div>
+                          <div class="form-group">
+                            <label for="add_product_pnum">数量</label>
+                            <input type="text" name="pnum" class="form-control" id="add_product_pnum" placeholder="数量">
+                          </div>
+                          <div class="form-group">
+                            <label for="add_product_price">单价</label>
+                            <input type="text" name="price" class="form-control" id="add_product_price" placeholder="单价">
+                          </div>
+                          <div class="form-group">
+                            <label for="add_product_introduction">简介</label>
+                            <input type="text" name="introduction" class="form-control" id="add_product_introduction" placeholder="简介">
+                          </div>
+                        </form>
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                        <button type="button" id="addProduct" onclick="javascript:$('#addProductFrom').submit()" class="btn btn-primary">修改</button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/product.html b/src/main/resources/templates/product.html
index f4eae08..0a143b1 100644
--- a/src/main/resources/templates/product.html
+++ b/src/main/resources/templates/product.html
@@ -175,6 +175,7 @@
         });
     });
 </script>
+<div th:replace="~{fragment :: #add_product_model}"></div>
 <div th:replace="~{fragment :: #query_product_model}"></div>
 <div th:replace="~{fragment :: #update_product_model}"></div>
 <div th:replace="~{fragment :: #delete_product_model}"></div>
diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html
index 1c0f53c..8ffe824 100644
--- a/src/main/resources/templates/user.html
+++ b/src/main/resources/templates/user.html
@@ -77,7 +77,11 @@
                     <div class="col-md-12">
                         <div class="panel panel-default">
                             <div class="panel-heading">
-                                <h3 class="panel-title">用户列表</h3>
+                                <h3 class="panel-title">用户列表
+                                    <div class="muted pull-right">
+                                        <button type="button" class="me_btn_addUser btn btn-info" data-toggle="modal" data-target="#out_user_model">导出用户</button>
+                                    </div>
+                                </h3>
                             </div>
                             <div class="panel-body">
                                 <div class="row">
@@ -151,9 +155,9 @@
                 {field: 'state', title: '权限'},
                 {field: 'edit', title: '操作',
                     formatter: function(value, row, index){
-                        return '<a><button type="button" onclick="userInfo(' + row.id + ')" class="btn btn-primary" data-toggle="modal" data-target="#query_user_model"><span class="glyphicon glyphicon-search"></span>详情</button></a>&nbsp;&nbsp;' +
-                            '<a><button type="button" onclick="userUpdate(' + row.id + ')" class="btn btn-primary" data-toggle="modal" data-target="#update_user_model"><span class="glyphicon glyphicon-pencil"></span>编辑</button></a>&nbsp;&nbsp;' +
-                            '<a><button type="button" onclick="userDelete(' + row.id + ')" class="btn btn-primary" data-toggle="modal" data-target="#delete_user_model"><span class="glyphicon glyphicon-remove"></span>删除</button></a>';
+                        return '<a><button type="button" onclick="userInfo(' + row.id + ')" class="btn btn-success" data-toggle="modal" data-target="#query_user_model"><span class="glyphicon glyphicon-search"></span>详情</button></a>&nbsp;&nbsp;' +
+                            '<a><button type="button" onclick="userUpdate(' + row.id + ')" class="btn btn-warning" data-toggle="modal" data-target="#update_user_model"><span class="glyphicon glyphicon-pencil"></span>编辑</button></a>&nbsp;&nbsp;' +
+                            '<a><button type="button" onclick="userDelete(' + row.id + ')" class="btn btn-danger" data-toggle="modal" data-target="#delete_user_model"><span class="glyphicon glyphicon-remove"></span>删除</button></a>';
                     }
                 }
             ],
-- 
Gitee