Merge remote-tracking branch 'liujiankang/master'

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachineMapper.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineMapper.xml
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/Produce.java

@@ -20,7 +20,7 @@ public class Produce implements Serializable {
     private Date produceCreateTime;         //创建时间
     private Date produceUpdateTime;         //修改时间
 
-    private Integer produceType;
+    private Integer produceType;            //产品类型  1.净水机 2.冲奶机
 
     private Integer employeeId;            //员工id
 

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachine.java

@@ -22,7 +22,6 @@ public class PtsMachine implements Serializable{
     private Integer machineProcessState;//生成流程状态
     private String machineSoftwareVersion;//软件版本
     private String machineHardwareVersion;//硬件版本
-    private String machineNfcId;//nfcId(卡片ID)
     private Date machineCreateTime;//创建时间
     private Date machineUpdateTime;//修改时间
 
@@ -153,12 +152,4 @@ public class PtsMachine implements Serializable{
     public void setMachineProduceType(Integer machineProduceType) {
         this.machineProduceType = machineProduceType;
     }
-
-    public String getMachineNfcId() {
-        return machineNfcId;
-    }
-
-    public void setMachineNfcId(String machineNfcId) {
-        this.machineNfcId = machineNfcId;
-    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/PtsEmployeeService.java

@@ -47,4 +47,12 @@ public interface PtsEmployeeService {
      * @return
      */
     Integer updateEmployee(PtsEmployee employee);
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    PtsEmployee getEmployeeByEmployeeNo(String employeeNo);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -75,7 +75,7 @@ public class ProduceServiceImpl implements ProduceService {
     //添加产品
     @Transactional
     public Integer saveProduce(Produce produce){
-        produce.setProduceNo(ProduceNoUtil.getProduceNo());
+        produce.setProduceNo(ProduceNoUtil.getProduceNo(produceMapper));
         produce.setProduceStatus(1);
         int flag = produceMapper.saveProduce(produce);
         Integer produceId = produce.getProduceId(); // 获取产品主键

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsEmployeeServiceImpl.java

@@ -63,4 +63,13 @@ public class PtsEmployeeServiceImpl implements PtsEmployeeService {
         Integer flag = ptsEmployeeMapper.updateEmployee(employee);
         return flag;
     }
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    public PtsEmployee getEmployeeByEmployeeNo(String employeeNo){
+        return ptsEmployeeMapper.getEmployeeByEmployeeNo(employeeNo);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/PtsEmployeeMapper.java

@@ -46,4 +46,12 @@ public interface PtsEmployeeMapper {
      * @return
      */
     Integer updateEmployee(PtsEmployee employee);
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    PtsEmployee getEmployeeByEmployeeNo(String employeeNo);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/equipmentMapper.xml

@@ -32,6 +32,7 @@
                 and device_id = #{deviceId}
             </if>
         </where>
+        ORDER BY device_id DESC
     </select>
 
     <resultMap type="PtsDevice" id="deviceMap">

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -6,6 +6,7 @@
         SELECT
             tb_rst_pts_produce.produce_id AS produceId,
             tb_rst_pts_produce.produce_no AS produceNo,
+             tb_rst_pts_produce.produce_type AS produceType,
             tb_rst_pts_produce.produce_name AS produceName,
             tb_rst_pts_produce.produce_status AS  produceStatus,
             tb_rst_pts_produce.produce_remake AS produceRemake,
@@ -108,12 +109,12 @@
         SELECT
         tb_rst_pts_produce.produce_id AS produceId,
         tb_rst_pts_produce.produce_no AS produceNo,
+        tb_rst_pts_produce.produce_type AS produceType,
         tb_rst_pts_produce.produce_name AS produceName,
         tb_rst_pts_produce.produce_status AS  produceStatus,
         tb_rst_pts_produce.produce_remake AS produceRemake,
         tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
-        tb_rst_pts_produce.produce_update_time AS produceUpdateTime,
-        tb_rst_pts_produce.produce_type AS produceType
+        tb_rst_pts_produce.produce_update_time AS produceUpdateTime
         FROM
         tb_rst_pts_produce
         WHERE
@@ -182,8 +183,8 @@
 
 
     <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true"  keyProperty="produceId">
-        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake)
-        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake})
+        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type)
+        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType})
     </insert>
 
     <update id="updateProduce" parameterType="Produce" >
@@ -192,6 +193,9 @@
             <if test="produceNo !=null and produceNo !=''">
                 produce_no = #{produceNo},
             </if>
+            <if test="produceType !=null and produceType !=''">
+                produce_type = #{produceType},
+            </if>
             <if test="produceName !=null and produceName !=''">
                 produce_name = #{produceName},
             </if>
@@ -201,6 +205,9 @@
             <if test="produceRemake !=null and produceRemake !=''">
                 produce_remake = #{produceRemake},
             </if>
+            <if test="produceType !=null and produceType !=''">
+                produce_type = #{produceType},
+            </if>
         </set>
         WHERE
             produce_id = #{produceId}
@@ -274,7 +281,8 @@
     <select id="getProduceByPro" parameterType="Produce" resultType="Produce">
         SELECT
             produce_id AS produceId,
-            produce_no AS  produce_no,
+            produce_no AS  produceNo,
+            produce_type AS  produceType,
             produce_name AS produceName,
             produce_status AS  produceStatus,
             produce_remake AS produceRemake,
@@ -387,4 +395,16 @@
         </where>
     </select>
 
+
+
+    <delete id="delNode"  parameterType="java.util.ArrayList">
+        delete from tb_rst_pts_process_node
+        where
+        node_id in
+        <foreach collection="array" item="nodeId" index="index" separator="," open="(" close=")">
+             #{nodeId}
+        </foreach>
+    </delete>
+
+
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -124,4 +124,23 @@
             employee_id = #{employeeId}
     </update>
 
+    <select id="getEmployeeByEmployeeNo" parameterType="String" resultType="PtsEmployee">
+        SELECT
+        employee_id AS employeeId,
+        employee_no AS employeeNo,
+        employee_name AS employeeName,
+        employee_tel AS  employeeTel,
+        employee_state AS  employeeState,
+        employee_entry_date AS  employeeEntryDate,
+        employee_departure_date AS employeeDepartureDate ,
+        employee_post AS  employeePost,
+        employee_desc AS  employeeDesc,
+        employee_clear_power AS  employeeClearPower,
+        employee_create_time AS  employeeCreateTime,
+        employee_update_time AS  employeeUpdateTime
+        FROM
+         tb_rst_pts_employee
+        WHERE
+         employee_no = #{employeeNo}
+    </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/util/ProduceNoUtil.java

@@ -1,22 +1,50 @@
 package com.iamberry.rst.util;
 
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.service.pts.mapper.ProduceMapper;
+
+import javax.print.DocFlavor;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * 用于获取  产品，工序，节点编号
  * Created by wangxiaoming on 2017/9/1.
  */
 public class ProduceNoUtil {
 
-    private final static  String[] number = {"0","1","2","3","4"};
+    //0-9，a-z,A-Z 62个编号
+    private final static  String[] NUMBER = {"0","1","2","3","4","5","6","7","8","9",
+            "A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",
+            "a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"};
+
+    //已删除的产品，工序的编号为#
+    private final static  String NO_NUMBER = "#";
 
     /**
      * 获取产品编号
      * @return
      */
-    public static String getProduceNo(){
-        String num = "A";
+    public static String getProduceNo( ProduceMapper produceMapper){
+        List<String> list = new LinkedList<String>();
+        for (String nums : NUMBER){
+            list.add(nums);
+        }
+        List<Produce> produceList = produceMapper.getProduceList();
+        for (int k=0 ; k<produceList.size(); k++) {
+            String produceNo = produceList.get(k).getProduceNo();
+            if (produceNo != null && !"".equals(produceNo) && !"#".equals(produceNo) ){
+                list.remove(produceNo);
+            }
+        }
+        String num = NO_NUMBER;
+        if(list.size() > 0 && !"".equals(list.get(0))){
+            num = list.get(0);
+        }
         return num;
     }
 
+
     /**
      * 获取工序编号
      * @return
@@ -30,15 +58,23 @@ public class ProduceNoUtil {
      * @return
      */
     public static String getProcessNo(Integer i){
-        return number[i];
+        return NUMBER[i];
     }
 
-
     /**
      * 获取节点操作
      * @return
      */
     public static String getNodeNo(Integer i){
-        return number[i];
+        return NUMBER[i];
+    }
+
+    public static void main(String[] args) {
+        String ss = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+        String s[] = ss.split("");
+        for (String x : s){
+            System.out.print("\""+x+"\",");
+        }
+        System.out.println(s.length);
     }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminProduceController.java

@@ -38,7 +38,7 @@ public class AdminProduceController {
      */
     @RequiresPermissions("produce:list_produce:produce")
     @RequestMapping("/_produce_list")
-    public ModelAndView selectOrderList(HttpServletRequest request) {
+    public ModelAndView selectProduceList(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/produce/produce_list");
         List<Produce> list = produceService.getProduceList();
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsEmployeeController.java

@@ -34,7 +34,7 @@ public class AdminPtsEmployeeController {
      */
     @RequestMapping("/_employee_list")
     @RequiresPermissions("employee:list_employee:employee")
-    public ModelAndView subMenuList(HttpServletRequest request,
+    public ModelAndView getEmployeeList(HttpServletRequest request,
                                     @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
                                     @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum) {
@@ -74,13 +74,34 @@ public class AdminPtsEmployeeController {
     }
 
     /**
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/is_employee")
+    public ResponseJson getEmployee(HttpServletRequest request){
+        String employeeNo = request.getParameter("employeeNo");
+        if(employeeNo == null  || "".equals(employeeNo)){
+            return new ResponseJson(500, "员工编号为空", 501);
+        }
+        PtsEmployee ptsEmployee = ptsEmployeeService.getEmployeeByEmployeeNo(employeeNo);
+        if (ptsEmployee != null ){
+            return new ResponseJson(200, "SUCCESS", 200);
+        }else {
+            return new ResponseJson(500, "员工不存在", 502);
+        }
+    }
+
+
+    /**
      * 跳转到添加员工页面
      *
      * @return
      */
     @RequiresPermissions("employee:add_employee:employee")
     @RequestMapping("/to_save_employee")
-    public ModelAndView goSaveProduce(HttpServletRequest request) {
+    public ModelAndView goSaveEmployee(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/employee/save_employee");
         return mv;
     }
@@ -93,7 +114,7 @@ public class AdminPtsEmployeeController {
     @ResponseBody
     @RequiresPermissions("employee:add_employee:employee")
     @RequestMapping(value="/save_employee")
-    public ResponseJson saveProduce(PtsEmployee employee, HttpServletRequest request) {
+    public ResponseJson saveEmployee(PtsEmployee employee, HttpServletRequest request) {
 
        Integer flag = ptsEmployeeService.saveEmployee(employee);
         if (flag < 1 ){
@@ -111,7 +132,7 @@ public class AdminPtsEmployeeController {
     @ResponseBody
     @RequiresPermissions("employee:update_employee:employee")
     @RequestMapping(value="/to_update_employee")
-    public ModelAndView updateProduce(String employeeId, HttpServletRequest request) {
+    public ModelAndView toUpdateEmployee(String employeeId, HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/employee/update_employee");
         if(employeeId == null || "".equals(employeeId)){
             return mv;
@@ -130,7 +151,7 @@ public class AdminPtsEmployeeController {
     @ResponseBody
     @RequiresPermissions("employee:update_employee:employee")
     @RequestMapping(value="/update_employee")
-    public ResponseJson updateProduce(PtsEmployee employee, HttpServletRequest request) {
+    public ResponseJson updateEmployee(PtsEmployee employee, HttpServletRequest request) {
         Integer flag = ptsEmployeeService.updateEmployee(employee);
         if (flag < 1 ){
             return new ResponseJson(500, "ERROR", 500);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java

@@ -119,7 +119,7 @@ public class EquipmentController {
     public ModelAndView selectDeviceList(HttpServletRequest request,
                                          @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
                                          @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                         @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize
+                                         @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize
                                          ) throws Exception {
         ModelAndView mv = new ModelAndView("pts/device/device_list");
         StringBuilder url = new StringBuilder("/admin/equipment/select_device_list?pageSize=" + pageSize);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceAppController.java

@@ -48,6 +48,8 @@ public class ProduceAppController {
         }
         //查询员工所做的产品，产品的工序，工序的节点操作
         List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
+
+        boolean flag = false;
         for(Produce produce : list ){
             produce.setEmployeeId(0);
             for(ProduceProcess produceProcess : produce.getProcess()){
@@ -55,6 +57,7 @@ public class ProduceAppController {
                 if ( emId != Integer.valueOf(employeeId)){
                     emId = 0;
                 }else{
+                    flag = true;
                     produce.setEmployeeId(emId);
                 }
                 produceProcess.setEmployeeId(emId);
@@ -63,16 +66,16 @@ public class ProduceAppController {
                 }
             }
         }
-        if(list.size() < 1){
-            rsj.setResultCode(500);
-            rsj.setResultMsg("ERROR");
-            rsj.setReturnMsg("该员工未绑定工序");
-            return rsj;
-        }else{
+        if(flag){
             rsj.setResultCode(200);
             rsj.setResultMsg("SUCCESS");
             rsj.setReturnMsg(list);
             return rsj;
+        }else{
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.setReturnMsg("该员工未绑定工序");
+            return rsj;
         }
 
     }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl

@@ -32,9 +32,9 @@
             <span class="input-dic">设备编号</span>
             <input class="my-input" type="text" value="" maxlength="10" minlength="2" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号，请输入英文、数字，2-10位"/>
         </div>
-        <div class="input-box"><span class="input-dic">设备姓名</span><input class="my-input" type="text" value="" name="deviceName" id="deviceName" placeholder="请输入设备名称，中文和英文"/> </div>
-        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="" name="device_date" id="device_date" placeholder="请选择购买日期" onClick="WdatePicker()" readonly="readonly"/> </div>
-        <div class="input-box"><span class="input-dic">设备状态</span> <input type="radio" id="radio1" name="deviceStatus" value="1" checked/><label for="radio1">正常使用</label><input type="radio" id="radio2" name="deviceStatus" value="0"/><label for="radio3">设备停用</label> </div>
+        <div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="" name="deviceName" id="deviceName" placeholder="请输入设备名称，中文和英文"/> </div>
+        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="" name="device_date" id="device_date" placeholder="请选择购买日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" readonly="readonly"/> </div>
+        <div class="input-box"><span class="input-dic">设备状态</span><label for="radio-10"><input type="radio" id="radio-10" name="deviceStatus" value="1" checked/>正常使用</label><label for="radio-11" style="margin-left: 50px;"><input type="radio" id="radio-11" name="deviceStatus" value="0"/>设备停用</label> </div>
         <#--<div class="input-box"><span class="input-dic">作用流程</span>
             <ul class="add-list">
 
@@ -90,12 +90,12 @@
         var deviceName = $('#deviceName').val();
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
-            alert("设备编号格式不正确，请重新输入!");
+            layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
-            alert("设备名称格式不正确，请重新输入!");
+            layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         return flag;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -21,19 +21,22 @@
 <div class="page-container">
 <div class="text-c">
     <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
-        <button type="button" 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>
+            <option value ="">全部</option>
             <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</option>
             <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>
         </select>
         <input class="my-input" type="text" name="deviceName" value="${deviceName!}" placeholder="请输入设备名称"/>
         <input class="my-input" type="text" name="deviceRemake" value="${deviceRemake!}" placeholder="请输入备注"/>
-        <button type="submit" class="my-btn-search">搜索</button>
+        <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
     </form>
 </div>
-<div class="mt-20">
+<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>
     <table class="table table-border table-bordered table-bg table-hover table-sort">
         <thead>
         <tr class="text-c">
@@ -92,7 +95,6 @@
         </tbody>
     </table>
 </div>
-</div>
 <div style="padding-top: 10px;"></div>
 <#include "/base/page_util.ftl">
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl

@@ -30,11 +30,11 @@
         <div class="my-title">设备信息</div>
         <input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>
         <div class="input-box"><span class="input-dic">设备编号</span><input class="my-input" type="text" value="${device.deviceNumber!}" name="deviceNumber" id="deviceNumber" placeholder="请输入设备编号"/> </div>
-        <div class="input-box"><span class="input-dic">设备姓名</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
-        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker()" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
+        <div class="input-box"><span class="input-dic">设备名称</span><input class="my-input" type="text" value="${device.deviceName!}" name="deviceName" id="deviceName" placeholder="请输入设备姓名"/> </div>
+        <div class="input-box"><span class="input-dic">购买日期</span><input class="my-input-date" type="text" value="${(device.deviceDate?string("yyyy-MM-dd"))!''}" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" name="device_date" id="device_date" placeholder="请选择购买日期" readonly="readonly"/> </div>
         <div class="input-box"><span class="input-dic">设备状态</span>
-            <input type="radio" id="radio1" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 1>checked</#if></#if> value="1"/><label for="radio1">正常使用</label>
-            <input type="radio" id="radio2" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 0>checked</#if></#if> value="0"/><label for="radio3">设备停用</label>
+            <label for="radio-10"><input type="radio" id="radio-10" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 1>checked</#if></#if> value="1"/>正常使用</label>
+            <label for="radio-11" style="margin-left: 50px;"><input type="radio" id="radio-11" name="deviceStatus" <#if device.deviceStatus??><#if device.deviceStatus == 0>checked</#if></#if> value="0"/>设备停用</label>
         </div>
         <div style="clear: both;"></div>
         <div class="input-box"><span class="input-dic">设备备注</span>
@@ -56,12 +56,12 @@
         var deviceName = $('#deviceName').val();
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
-            alert("设备编号格式不正确，请重新输入!");
+            layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
-            alert("设备名称格式不正确，请重新输入!");
+            layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
         return flag;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

@@ -153,7 +153,7 @@
         .add-title-right{position: absolute;left: 55%;top:33%;}
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
         .list-main{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
-        .list-main>li{display: table-cell;min-width: 450px;position: relative;width: 450px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
+        .list-main>li{display: table-cell;min-width: 400px;position: relative;width: 400px;margin-right: 20px;border: 1px solid rgba(0,0,0,.1);}
     </style>
 <#include "/base/list_base.ftl">
 </head>
@@ -484,7 +484,7 @@
         var id = obj.getAttribute("id");
         var value = $('#' + id + ' option:selected').val();
         var data = null;
-        if (confirm("您确定修改吗？")) {
+        layer.confirm('确认要修改吗？',function(index){
             //num=1则是修改员工信息，num=2则是修改设备信息
             if (num == 1) {
                 data = {
@@ -505,15 +505,16 @@
                 async: false,
                 success: function(dt){
                     if (dt.returnCode == 200) {
-                        alert('恭喜您，修改成功!');
+                        layer.msg('恭喜您，修改成功!',{icon: 1,time:1000});
                     } else {
-                        alert('对不起，修改失败!');
+                        layer.msg('对不起，修改失败!',{icon: 5,time:1000});
                     }
                 }
             })
-        } else {
+        }, function() {
             location.reload();
         }
+        );
     }
 </script>
 </body>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -0,0 +1,175 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>员工列表</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 员工管理
+    <span class="c-gray en">&gt;</span> 员工列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form action="${path}/admin/employee/_employee_list" method="post">
+            <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">
+        <thead>
+        <tr>
+            <th scope="col" colspan="18">员工列表</th>
+            <#--<th scope="col" colspan="2">共有数据：<strong>#{page.total}</strong> 条</th>-->
+        </tr>
+        <tr class="text-c">
+            <th width="80">员工编号</th>
+            <th width="100">员工姓名</th>
+            <th width="120">员工电话</th>
+            <th width="55">员工状态</th>
+            <th width="80">入职日期</th>
+            <th width="100">员工岗位</th>
+            <th width="80">离职日期</th>
+            <th width="150">添加时间</th>
+            <th width="100">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+        <#list page.dataList as employee>
+            <tr class="text-c">
+                <td>${employee.employeeNo!}</td>
+                <td>${employee.employeeName!}</td>
+                <td>${employee.employeeTel!}</td>
+                <td>
+                    <#if employee.employeeState == 0>
+                        离职
+                    <#elseif employee.employeeState == 1>
+                        在职
+                    </#if>
+                </td>
+                <td>${(employee.employeeEntryDate?string("yyyy-MM-dd"))!''}</td>
+                <td>${employee.employeePost!}</td>
+                <td>${(employee.employeeDepartureDate?string("yyyy-MM-dd"))!''}</td>
+                <td>${(employee.employeeCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                <td>
+                    <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>-->
+                </td>
+            </tr>
+        </#list>
+
+        </tbody>
+    </table>
+</div>
+<tfoot>
+<#include "/base/page_util.ftl">
+</tfoot>
+<script type="text/javascript">
+    /*
+        参数解释：
+        title	标题
+        url		请求的url
+        id		需要操作的数据id
+        w		弹出层宽度（缺省调默认值）
+        h		弹出层高度（缺省调默认值）
+    */
+
+    /*子页面添加完信息后回显添加结果是否成功*/
+    function admin_result(str,num) {
+        layer.msg(str,{icon:num,time:1000});
+    }
+
+    /*管理员-详情*/
+    function admin_add_filter(url){
+        window.location.href= url;
+    }
+    /*管理员-删除*/
+    function admin_del(obj,id){
+        layer.confirm('确认要删除吗？',function(index){
+            $.ajax({
+                type: 'POST',
+                url: '',
+                dataType: 'json',
+                success: function(data){
+                    $(obj).parents("tr").remove();
+                    layer.msg('已删除!',{icon:1,time:1000});
+                },
+                error:function(data) {
+                    console.log(data.msg);
+                },
+            });
+        });
+    }
+
+    /*管理员-编辑*/
+    function admin_edit(title,url,id,w,h){
+        layer_show(title,url,w,h);
+    }
+    /* 录入FAQ */
+    function add_FAQ(menuId,type) {
+        window.location.href= root_path + "/admin/faq/_add_FAQ?menuId="+menuId+"&menuType="+type;
+       // layer_show("增加FAQ", root_path + "/admin/faq/_add_FAQ?menuId="+menuId+"&menuType="+type);
+    }
+
+    /* 修改二级菜单状态 */
+    function update_FAQState(detaId) {
+        layer.confirm('确认要停用吗？',function(index){
+            $.post(root_path + "/admin/faq/updat_FAQState",{detaId:detaId}, function(result){
+                if (result.returnCode != 200 || result.returnCode != 200) {
+                    layer.msg('修改失败，请重试!',{icon: 5,time:3000});
+                } else {
+                    layer.msg('修改成功!',{icon: 1,time:2000}, function () {
+                        // 关闭当前页面，并刷新父级页面
+                        window.location.reload();
+                    });
+                }
+            });
+        });
+    }
+
+</script>
+<script>
+    /**
+     * 跳转到添加员工页面
+     */
+    function toAddEmployee(){
+        window.location.href= "${path}/admin/employee/to_save_employee";
+    }
+
+    /**
+     *跳转到编辑页面
+     * @param employee
+     */
+    function admin_update_employee(employeeId) {
+        window.location.href= "${path}/admin/employee/to_update_employee?employeeId="+employeeId;
+    }
+
+    /**
+     * 删除员工
+     * @param employeeId
+     */
+    function admin_del_employee(employeeId) {
+        window.location.href= "${path}/admin/employee/delete_employee?employeeId="+employeeId;
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

@@ -0,0 +1,126 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-input{padding: 5px 10px;width: 60%;}
+        .my-input-date{padding: 5px 10px;width: 60%;background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
+        .input-box{margin: 18px 0;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
+        .add-list>li{margin: 10px 0;}
+        .my-textarea{padding: 5px 10px;width: 60%;}
+        .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+    </style>
+    <title>添加员工- 员工管理 - RST</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 员工管理
+    <span class="c-gray en">&gt;</span> 添加员工
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-addEmployee">
+        <div style="padding: 10px;width: 600px;margin: 0 auto;">
+            <div class="my-title">员工信息</div>
+            <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" type="text" value="" placeholder="请输入员工编号"/> </div>
+            <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="" placeholder="请输入员工姓名"/> </div>
+            <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" type="text" value="" placeholder="请输入员工手机号码"/> </div>
+            <div class="input-box"><span class="input-dic">员工状态</span>&nbsp;&nbsp;
+                <input type="radio" id="employeeState1" name="employeeState" value="1"/><label for="employeeState1">在职</label>
+                <input type="radio" id="employeeState2" name="employeeState" value="0"/><label for="employeeState2">离职</label>
+            </div>
+            <div class="input-box"><span class="input-dic">清空卡权限</span>
+                <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" /><label for="employeeClearPower1">具有</label>
+                <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" /><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()" 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()" readonly="readonly"/> </div>
+            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" value="" placeholder="请输入员工岗位"/> </div>
+
+            <div style="clear: both;"></div>
+            <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
+                <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc"></textarea>
+            </div>
+            <div>
+                <button type="reset" class="my-btn-reset">重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+            </div>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+    //动态显示隐藏所属菜单
+    $(document).on('click', '.menuSubid input[type=radio]', function() {
+        isSelectShow($(this).val())
+    })
+
+    $(function(){
+        $("#form-admin-addEmployee").validate({
+            rules:{
+                subName:{
+                    required:true,
+                    minlength:4,
+                    maxlength:30
+                }
+            },
+            onkeyup:false,
+            focusCleanup:true,
+            success:"valid",
+            submitHandler:function(form){
+                $.post(root_path + "/admin/employee/save_employee", formatJSON(),function(result){
+                    if (result.returnCode != 200 || result.returnCode != 200) {
+                        layer.msg('录入失败，请重试!',{icon: 5,time:3000});
+                    } else {
+                        layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
+                            // 关闭当前页面，并刷新父级页面
+                            window.location.href= '${path}/admin/employee/list_employee';
+                        });
+                    }
+                });
+            }
+        });
+    });
+
+    /*将表单format为JSON*/
+    function formatJSON() {
+        debugger;
+        var serializeObj={};
+        $($("#form-admin-addEmployee").serializeArray()).each(function(){
+            if (this.value != "" && this.value != null) {
+                serializeObj[this.name]=this.value;
+            }
+        });
+        return serializeObj;
+    }
+
+    $(function(){
+        //隐藏离职日期
+        $("#isDeparture").hide();
+
+        //监听离职状态，离职的才有离职时间
+        $("[name='employeeState']").change(function(){
+            $("[name='employeeDepartureDate']").val("");
+            var  departureDate =  $("[name='employeeState']:checked").val();
+            if(departureDate == "0"){
+                $("#isDeparture").show();
+            }else{
+                $("#isDeparture").hide();
+            }
+        })
+    })
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -0,0 +1,123 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-input{padding: 5px 10px;width: 60%;}
+        .my-input-date{padding: 5px 10px;width: 60%;background: url(${path}/common/images/pts//rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
+        .input-box{margin: 18px 0;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
+        .add-list>li{margin: 10px 0;}
+        .my-textarea{padding: 5px 10px;width: 60%;}
+        .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+    </style>
+    <title>添加员工- 员工管理 - RST</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 员工管理
+    <span class="c-gray en">&gt;</span> 修改员工
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #58d2ea;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-addEmployee">
+        <div style="padding: 10px;width: 600px;margin: 0 auto;">
+            <div class="my-title">员工信息</div>
+            <input type="hidden" name="employeeId" value="${employee.employeeId!}">
+            <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" type="text" value="${employee.employeeNo!}" placeholder="请输入员工编号"/> </div>
+            <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入员工姓名"/> </div>
+            <div class="input-box"><span class="input-dic">员工电话</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入员工手机号码"/> </div>
+            <div class="input-box"><span class="input-dic">员工状态</span>&nbsp;&nbsp;
+                <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
+                <input type="radio" id="employeeState2" name="employeeState" value="0" <#if employee.employeeState == 0>checked</#if>/><label for="employeeState2">离职</label>
+            </div>
+            <div class="input-box"><span class="input-dic">清空卡权限</span>
+                <input type="radio" id="employeeClearPower1" name="employeeClearPower" value="1" <#if employee.employeeClearPower == 1>checked</#if>/><label for="employeeClearPower1">具有</label>
+                <input type="radio" id="employeeClearPower2" name="employeeClearPower" value="0" <#if employee.employeeClearPower == 0>checked</#if>/><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="${(employee.employeeEntryDate?string("yyyy-MM-dd"))!''}" placeholder="请选择入职日期" onClick="WdatePicker()" readonly="readonly"/> </div>
+            <div class="input-box" id="isDeparture" style="<#if employee.employeeState == 1>display: none</#if>"><span class="input-dic">离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" value="${(employee.employeeDepartureDate?string("yyyy-MM-dd"))!''}" placeholder="请选择离职日期" onClick="WdatePicker()" readonly="readonly"/> </div>
+            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" value="${employee.employeePost!}" placeholder="请输入员工岗位"/> </div>
+
+            <div style="clear: both;"></div>
+            <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
+                <textarea rows="3" cols="20" class="my-textarea" name="employeeDesc">${employee.employeeDesc!}</textarea>
+            </div>
+            <div>
+                <button type="reset" class="my-btn-reset">重置</button><button type="submit" class="my-btn-submit">确认提交</button>
+            </div>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+    //动态显示隐藏所属菜单
+    $(document).on('click', '.menuSubid input[type=radio]', function() {
+        isSelectShow($(this).val())
+    })
+
+    $(function(){
+        $("#form-admin-addEmployee").validate({
+            rules:{
+                subName:{
+                    required:true,
+                    minlength:4,
+                    maxlength:30
+                }
+            },
+            onkeyup:false,
+            focusCleanup:true,
+            success:"valid",
+            submitHandler:function(form){
+                $.post(root_path + "/admin/employee/update_employee", formatJSON(),function(result){
+                    if (result.returnCode != 200 || result.returnCode != 200) {
+                        layer.msg('录入失败，请重试!',{icon: 5,time:3000});
+                    } else {
+                        layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
+                            // 关闭当前页面，并刷新父级页面
+                            window.location.href= '${path}/admin/employee/list_employee';
+                        });
+                    }
+                });
+            }
+        });
+    });
+
+    /*将表单format为JSON*/
+    function formatJSON() {
+        var serializeObj={};
+        $($("#form-admin-addEmployee").serializeArray()).each(function(){
+            if (this.value != "" && this.value != null) {
+                serializeObj[this.name]=this.value;
+            }
+        });
+        return serializeObj;
+    }
+
+    $(function(){
+        //监听离职状态，离职的才有离职时间
+        $("[name='employeeState']").change(function(){
+            $("[name='employeeDepartureDate']").val("");
+            var  departureDate =  $("[name='employeeState']:checked").val();
+            if(departureDate == "0"){
+                $("#isDeparture").show();
+            }else{
+                $("#isDeparture").hide();
+            }
+        })
+    })
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -30,8 +30,12 @@
     <form class="form form-horizontal" id="form-admin-addProduce">
         <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
             <div class="my-title">产品信息</div>
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称" required   maxlength="20" /> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述" required  maxlength="100"/> </div>
+            <div class="input-box"><span class="input-dic">产品类型</span>
+                <label><input type="radio" name="produceType" value="1" checked>净水机</label>
+                <label><input type="radio" name="produceType" value="2">冲奶机</label>
+            </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
             <div class="my-title">节点信息</div>
 
@@ -39,18 +43,18 @@
                 <li id="1" class="processList">
                     <input type="hidden" class="processNumber" value="1">
                     <div class="input-box"><span class="input-dic process-type">节点类型</span>
-                        <label class=""><input type="radio" name="processType_p1" value="1">生产工序</label>
+                        <label><input type="radio" name="processType_p1" value="1" checked>生产工序</label>
                         <label><input type="radio" name="processType_p1" value="2">修理工序</label>
                         <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
                     </div>
-                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>
+                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称" required   maxlength="20"/> </div>
                     <div class="input-box"><span class="input-dic">节点操作</span>
                         <ul class="add-list oneTheNode" >
                             <li class="nodeList">
                                 <#--<select class="my-select"><option>1</option></select>-->
-                                <label><input type="radio" name="nodeStatus_p1_n1" value="1">正常</label>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="1" checked>正常</label>
                                 <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
-                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>
+                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文" required minlength="2"   maxlength="20" />
                                 <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                             </li>
                             <li>
@@ -75,23 +79,34 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
-    //动态显示隐藏所属菜单
-    $(document).on('click', '.menuSubid input[type=radio]', function() {
-        isSelectShow($(this).val())
-    })
-
-    $(function(){
+/*
+   $(function(){
         $("#form-admin-addProduce").validate({
             rules:{
-                subName:{
+                produceName1:{
                     required:true,
-                    minlength:4,
-                    maxlength:30
+                    minlength:2,
+                    maxlength:20
+                }
+            },
+            messages: {
+                produceName1: {
+                    required: "*必填！",
+                    rangelength: "*长度为2到20位！",
                 }
             },
-            onkeyup:false,
+            //是否在获取焦点时验证
+            //onfocusout:false,
+            //是否在敲击键盘时验证
+            //onkeyup:false,
+            //提交表单后，（第一个）未通过验证的表单获得焦点
+            focusInvalid:true,
+            //当未通过验证的元素获得焦点时，移除错误提示
             focusCleanup:true,
-            success:"valid",
+
+//            onkeyup:false,
+//            focusCleanup:true,
+//            success:"valid",
             submitHandler:function(form){
                 $.post(root_path + "/admin/produce/save_produce", formatJSON(),function(result){
                     if (result.returnCode != 200 || result.returnCode != 200) {
@@ -99,13 +114,40 @@
                     } else {
                         layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
                             // 关闭当前页面，并刷新父级页面
-                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                            window.location.href= '${path}/admin/produce/_produce_list';
                         });
                     }
                 });
             }
         });
-    });
+    });*/
+
+
+    $(function(){
+        //var validator = $("#form-admin-addProduce").validate();
+        $("#form-admin-addProduce").submit(function(){
+            ajaxReq();
+        })
+    })
+
+    function ajaxReq(){
+        var data = formatJSON();
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: data,
+            url: "${path}/admin/produce/save_produce",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    window.location.href = '${path}/admin/produce/_produce_list'
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
 
     /*将表单format为JSON*/
     function formatJSON() {
@@ -137,6 +179,7 @@
         produce.json = JSON.stringify(proessList);      //将工序变成json存入到产品对象中
         produce.produceName = $("[name='produceName']").val();//获取产品名称
         produce.produceRemake = $("[name='produceRemake']").val();//获取产品描述
+        produce.produceType = $("[name='produceType']").val();//获取产品描述
         return produce;
     }
 
@@ -148,9 +191,9 @@
         var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
         var nodeHtml = '<li class="nodeList">'
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
-                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1" checked>正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文"   required  minlength="2"  maxlength="20"/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -164,18 +207,18 @@
         var processNumber = $(".onrTheProcess").find(".processList").length + 1;  //因为是新加的工序节点所以 +1
         var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
                 + '<div class="input-box"><span class="input-dic">节点类型</span>'
-                + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1">生产工序</label>'
+                + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1" checked>生产工序</label>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
                 + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"  required   maxlength="20"/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
-                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1" checked>正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文"  required  minlength="2"  maxlength="20"/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
                 + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
@@ -225,11 +268,11 @@
     });
 
     //确认提交事件，获取每个li的id
-    $(document).on('click', '.my-btn-submit', function() {
-        $("#sortable>li").each(function(){
-            console.log($(this).attr("id"));
-        });
-    });
+//    $(document).on('click', '.my-btn-submit', function() {
+//        $("#sortable>li").each(function(){
+//            console.log($(this).attr("id"));
+//        });
+//    });
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -31,8 +31,12 @@
         <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
             <div class="my-title">产品信息</div>
             <input type="hidden" name="produceId" value="${produce.produceId!}">
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="${produce.produceName!}" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="${produce.produceRemake!}" placeholder="请输入产品描述"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="${produce.produceName!}" placeholder="请输入产品名称" maxlength="20"  required /> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="${produce.produceRemake!}" placeholder="请输入产品描述" maxlength="100"  required /> </div>
+            <div class="input-box"><span class="input-dic">产品类型</span>
+                <label><input type="radio" name="produceType" value="1" <#if produce.produceType == 1>checked</#if>>净水机</label>
+                <label><input type="radio" name="produceType" value="2" <#if produce.produceType == 2>checked</#if>>冲奶机</label>
+            </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
             <div class="my-title">节点信息</div>
 
@@ -47,7 +51,7 @@
                             <label><input type="radio" name="processType_p${process_index + 1}" value="2" <#if process.processType == 2>checked</#if>>修理工序</label>
                             <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
                         </div>
-                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称"/> </div>
+                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称" maxlength="20" required/> </div>
                         <div class="input-box"><span class="input-dic">节点操作</span>
                             <ul class="add-list oneTheNode" >
                                 <#list process.nodes as nodes>
@@ -56,7 +60,7 @@
                                         <#--<select class="my-select"><option>1</option></select>-->
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="1" <#if nodes.nodeStatus == 1>checked</#if>>正常</label>
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="0" <#if nodes.nodeStatus == 0>checked</#if>>异常</label>
-                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>
+                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>
                                         <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                                     </li>
                                 </#list>
@@ -87,11 +91,11 @@
     var delProcessIds="",delNodeIds="";
 
     //动态显示隐藏所属菜单
-    $(document).on('click', '.menuSubid input[type=radio]', function() {
-        isSelectShow($(this).val())
-    })
+//    $(document).on('click', '.menuSubid input[type=radio]', function() {
+//        isSelectShow($(this).val())
+//    })
 
-    $(function(){
+ /*   $(function(){
         $("#form-admin-addProduce").validate({
             rules:{
                 subName:{
@@ -110,13 +114,45 @@
                     } else {
                         layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
                             // 关闭当前页面，并刷新父级页面
-                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                            window.location.href= '${path}/admin/produce/_produce_list';
                         });
                     }
                 });
             }
         });
-    });
+    });*/
+
+
+
+    $(function(){
+        //var validator = $("#signupForm").validate();
+        $("#form-admin-addProduce").submit(function(){
+            ajaxReq();
+        })
+//        jQuery.validator.addMethod("processName", function(value, element) {
+//               var mobile = /[^\w\u4e00-\u9fa5]/;
+//               return this.optional(element) || (mobile.test(value));
+//            }, "请正确填写您的手机号码");
+    })
+
+    function ajaxReq(){
+        var data = formatJSON();
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: data,
+            url: "${path}/admin/produce/update_produce",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    window.location.href = '${path}/admin/produce/_produce_list'
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
 
     /*将表单format转为JSON*/
     function formatJSON() {
@@ -152,6 +188,7 @@
         produce.produceId = $("[name='produceId']").val();//获取产品id
         produce.produceName = $("[name='produceName']").val();//获取产品名称
         produce.produceRemake = $("[name='produceRemake']").val();//获取产品描述
+        produce.produceType = $("[name='produceType']").val();//获取产品描述
 
         produce.delProcessIds = delProcessIds;    //需要删除的工序id
         produce.delNodeIds = delNodeIds;           //需要删除的节点操作id
@@ -180,7 +217,7 @@
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -198,14 +235,14 @@
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
                 + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称" maxlength="20"  required/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
                 + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
@@ -225,8 +262,13 @@
         if(parseInt(processNumber) < 2){
             layer.msg('至少要有一个节点!',{icon: 5,time:3000});
         }else{
+            var processId = $(node).parents(".processList").find("[name='processId']").val();
+            delProcessIds += processId+",";
+            $(node).parents(".processList").find("[name='nodeId']").each(function(){
+                delNodeIds += $(this).val()+",";
+            });
+
             $(node).parents(".processList").remove();
-            //delProcessIds += delProcessIds+",";
         }
     }
 
@@ -239,6 +281,8 @@
         if(parseInt(nodesNumber) < 2){
             layer.msg('至少要有一个节点操作!',{icon: 5,time:3000});
         }else{
+            var nodeId = $(node).parents(".nodeList").find("[name='nodeId']").val();
+            delNodeIds += nodeId  + ",";
             $(node).parents(".nodeList").remove();
         }
     }
@@ -255,11 +299,11 @@
 
     });
 
-    //确认提交事件，获取每个li的id
-    $(document).on('click', '.my-btn-submit', function() {
-        $("#sortable>li").each(function(){
-            console.log($(this).attr("id"));
-        });
+//    //确认提交事件，获取每个li的id
+//    $(document).on('click', '.my-btn-submit', function() {
+//        $("#sortable>li").each(function(){
+//            console.log($(this).attr("id"));
+//        });
     });
 </script>
 </body>

watero-rst-web/src/main/webapp/common/css/login/login.css

@@ -1,4 +1,4 @@
-.loginWraper{background: #fff url(../../images/login/admin-login-bg.png) no-repeat top;}
+.loginWraper{background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top;}
 .loginBox{padding-top: 88px;background: url(../../images/login/admin-loginform-bg.png) top right no-repeat;background-size:90% 80%;padding-bottom: 50px;}
 .input-text, .textarea {border: 0;border-bottom: solid 1px #ddd;text-indent: 2em;}
 .user_count{background: url(../../images/login/ipt_head.png) left center no-repeat /30px !important;}
@@ -8,7 +8,7 @@
 .my-btn-login{width: 90% !important;}
 @media screen and (orientation:portrait) and (-webkit-min-device-pixel-ratio:2){
 /*mobile竖屏*/
-.loginWraper {background: #fff url(../../images/login/admin-login-bg.png) no-repeat top right;background-size: auto 50%;}
+.loginWraper {background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top right;background-size: auto 50%;}
 .loginBox {padding-top: 58px;background: url(../../images/login/admin-loginform-bg.png) top center no-repeat;background-size: 58% 78%;padding-bottom: 31px;}
 .input-text, .textarea {text-indent: 2em;}
 .validate{background: none !important;text-indent: 0; width: 160px !important;}
@@ -18,7 +18,7 @@
 }
  @media screen and (orientation:landscape) and (-webkit-min-device-pixel-ratio:2){
 /*mobile横屏*/
-.loginWraper {background: #fff url(../../images/login/admin-login-bg.png) no-repeat top right;background-size: 100% auto;}
+.loginWraper {background: #fff url(../../images/login/admin-login-bg.jpg) no-repeat top right;background-size: 100% auto;}
 .loginBox{padding-top: 88px;background: url(../../images/login/admin-loginform-bg.png) top center no-repeat;background-size:90% 80%;padding-bottom: 50px;}
 .my-btn-login{width:80% !important;}
 }