Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

liujiankang 7 years ago
parent
e401031189 841a463763
commit
f42ca43401
4 changed files with 25 additions and 20 deletions
Split View Show Diff Stats
  1. 1 0
      watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml
  2. 3 5
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
  3. 17 9
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl
  4. 4 6
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

+ 1 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml
View File 

@@ -79,6 +79,7 @@
 
                 AND employee_tel like CONCAT('%',#{employeeTel},'%')
 
             </if>
 
         </where>
 
+        ORDER BY employee_id DESC
 
     </select>

+ 3 - 5
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
View File 

@@ -21,6 +21,7 @@
 
 <div class="page-container">
 
 <div class="text-c">
 
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
 
+        <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="add_device();">添加设备</button>
 
         <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
 
         <select class="select" name="deviceStatus" style="height: 30px;width: 150px">
 
             <option value ="">全部</option>
 
@@ -32,11 +33,7 @@
 
         <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
 
     </form>
 
 </div>
 
-<div class="cl pd-5 bk-gray mt-20">
 
-        <span class="l">
 
-            <button onClick="add_device();" class="btn radius" style="background: #58d2ea;color: #fff;" type="button"><i class="Hui-iconfont">&#xe604;</i>添加设备</button>
 
-        </span>
 
-</div>
 
+<div class="mt-20">
 
     <table class="table table-border table-bordered table-bg table-hover table-sort">
 
         <thead>
 
         <tr class="text-c">
 
@@ -94,6 +91,7 @@
 
         </#list>
 
         </tbody>
 
     </table>
 
+    </div>
 
 </div>
 
 <div style="padding-top: 10px;"></div>
 
 <#include "/base/page_util.ftl">

+ 17 - 9
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl
View File 

@@ -10,6 +10,9 @@
 
     <link rel="Shortcut Icon" href="/favicon.ico" />
 
 <#include "/base/list_base.ftl">
 
     <title>员工列表</title>
 
+    <style>
 
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
 
+    </style>
 
 </head>
 
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
@@ -20,18 +23,16 @@
 
 <div class="page-container">
 
     <div class="text-c">
 
         <form action="${path}/admin/employee/_employee_list" method="post">
 
+            <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="toAddEmployee();">增加员工</button>
 
             <input type="text" class="input-text" style="width:150px" value="${employeeNo!}" placeholder="员工编号" id="employeeNo" name="employeeNo">
 
             <input type="text" class="input-text" style="width:150px" value="${employeeName!}" placeholder="员工姓名" id="employeeName" name="employeeName">
 
             <input type="text" class="input-text" style="width:150px" value="${employeeTel!}" placeholder="员工电话" id="employeeTel" name="employeeTel">
 
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
 
         </form>
 
     </div>
 
-    <div class="cl pd-5 bk-gray mt-20">
 
-            <span class="l">
 
-                <button onClick="toAddEmployee()" class="btn radius" style="background: #58d2ea;color: #fff;" type="button"><i class="Hui-iconfont">&#xe604;</i>增加员工</button>
 
-            </span>
 
-    </div>
 
-    <table class="table table-border table-bordered table-hover">
 
+
 
+    <div class="mt-20">
 
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
 
         <thead>
 
         <tr>
 
             <th scope="col" colspan="18">员工列表</th>
 
@@ -70,15 +71,17 @@
 
                     <a style="text-decoration:none" href="javascript:void(0);" title="编辑" onclick="admin_update_employee(${employee.employeeId!});">
 
                         <i class="Hui-iconfont">&#xe6df;</i>
 
                     </a>
 
-                    <#--<a style="text-decoration:none" href="javascript:void(0);" title="删除" onclick="admin_del_employee(${employee.employeeId!});">
 
-                        <i class="Hui-iconfont">&#xe60b;</i>
 
-                    </a>-->
 
+                    <a style="text-decoration:none" href="javascript:;" title="查看"
 
+                       onclick="edit_process('${path}/admin/equipment/_update_process?deviceId=0');">
 
+                        <i class="Hui-iconfont">&#xe665;</i>
 
+                    </a>
 
                 </td>
 
             </tr>
 
         </#list>
 
 
         </tbody>
 
     </table>
 
+    </div>
 
 </div>
 
 <tfoot>
 
 <#include "/base/page_util.ftl">
 
@@ -93,11 +96,16 @@
 
         h		弹出层高度（缺省调默认值）
 
     */
 
 
+
 
     /*子页面添加完信息后回显添加结果是否成功*/
 
     function admin_result(str,num) {
 
         layer.msg(str,{icon:num,time:1000});
 
     }
 
 
+    function edit_process(url) {
 
+        window.location.href = url
 
+    }
 
+
 
     /*管理员-详情*/
 
     function admin_add_filter(url){
 
         window.location.href= url;

+ 4 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl
View File 

@@ -46,8 +46,8 @@
 
                 <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" checked /><label for="employeeClearPower2">不具有</label>
 
             </div>
 
 
-            <div class="input-box"><span class="input-dic">入职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeEntryDate" value="" placeholder="请选择入职日期" onclick="WdatePicker({skin:'whyGreen'})"  readonly="readonly" /> </div>
 
-            <div class="input-box" id="isDeparture"><span class="input-dic">离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" value="" placeholder="请选择离职日期"  onclick="WdatePicker({skin:'whyGreen'})" readonly="readonly"/> </div>
 
+            <div class="input-box"><span class="input-dic">入职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeEntryDate" id="employeeEntryDate" value="" placeholder="请选择入职日期" onclick="WdatePicker({skin:'whyGreen'})"  readonly="readonly" /> </div>
 
+            <div class="input-box" id="isDeparture"><span class="input-dic">离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" id="employeeDepartureDate" value="" placeholder="请选择离职日期"  onclick="WdatePicker({ dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'employeeEntryDate\')||\'%y-%M-%d\'}' })"  readonly="readonly"/> <span style="color: red;" id="employeeDepartureDateMsg"></span></div>
 
             <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" value="" placeholder="请输入员工岗位" required   maxlength="100"/> </div>
 
 
             <div style="clear: both;"></div>
 
@@ -123,16 +123,15 @@
 
     }
 
 
 
-    //实时监听文本框-- 员工编号
 
+    /*实时监听文本框-- 员工编号*/
 
     document.getElementById("employeeNo").addEventListener("input", function(){
 
         ptsValiDataEmNo(this.value);
 
     });
 
-    //实时监听文本框-- 手机号码
 
+    /*实时监听文本框-- 手机号码*/
 
     document.getElementById("employeeTel").addEventListener("input", function(){
 
         ptsValiDataTel(this.value);
 
     });
 
 
-
 
     /*验证编号*/
 
     function ptsValiDataEmNo(thVal) {
 
         $.ajax({
 
@@ -169,7 +168,6 @@
 
         }
 
     }
 
 
-
 
     /*将表单format为JSON*/
 
     function formatJSON() {
 
         debugger;