diff --git a/src/main/java/com/pro/bus/controller/PretreatmentController.java b/src/main/java/com/pro/bus/controller/PretreatmentController.java
new file mode 100644
index 0000000000000000000000000000000000000000..c574bab543235a752bcb8e82ca7322d81a848db9
--- /dev/null
+++ b/src/main/java/com/pro/bus/controller/PretreatmentController.java
@@ -0,0 +1,59 @@
+package com.pro.bus.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pro.bus.entity.Process;
+import com.pro.bus.service.PretreatmentService;
+import com.pro.utils.Utils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.xml.soap.SAAJResult;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/bus")
+public class PretreatmentController {
+    @Autowired
+    private PretreatmentService pretreatmentService;
+
+    /***
+     * 去前处理页面
+     * @return
+     */
+    @RequiresPermissions("/bus/pretreatment")
+    @RequestMapping("pretreatment")
+    public String toPretreatment(@RequestHeader(value="Via",required=false)  String via , @RequestHeader("user-agent")  String userAgent) {//返回值为视图名称（不一定直接对应路径）){
+        boolean is = Utils.isMobileDevice(via, userAgent);
+        if(is) {
+            return "mobile/pretreatment";
+        }
+        return "bus/pretreatment";
+    }
+
+    /***
+     * 获取前处理信息
+     * @param page
+     * @param limit
+     * @param process
+     * @return
+     */
+    @RequiresPermissions("/bus/pretreatment")
+    @RequestMapping(value = "getPretreatment", method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String, Object> getPretreatment(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, Process process) {
+        PageHelper.startPage(page, limit);
+        List<Process> processes = pretreatmentService.getPretreatment(process);
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageInfo<Process> pageInfo = new PageInfo<Process>(processes);
+        map.put("code", 0);
+        map.put("data", pageInfo.getList());
+        map.put("count", pageInfo.getTotal());
+        map.put("msg", "");
+        return map;
+    }
+}
diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java
index 2ca501e527fc4a0c9eb7552b77876adae7305e71..c61c6d01ff95c65bd21fed9f9ed9ba9dc7134b22 100644
--- a/src/main/java/com/pro/bus/controller/ProcessController.java
+++ b/src/main/java/com/pro/bus/controller/ProcessController.java
@@ -10,12 +10,17 @@ import com.pro.info.entity.Customer;
 import com.pro.info.entity.Standard;
 import com.pro.sys.entity.Result;
 import com.pro.sys.entity.User;
+import javafx.scene.input.DataFormat;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -107,7 +112,7 @@ public class ProcessController {
     }
 
     /***
-     * 修改坯布准备状态
+     * 修改坯布准备状态,并且添加日期和登记人
      * @param process_id
      * @param process_status
      * @return
@@ -117,10 +122,62 @@ public class ProcessController {
             value="updateProcessStatus/{process_id}/{process_status}",
             method=RequestMethod.PUT)
     @ResponseBody
-    public Result updateProcessStatus(@PathVariable Integer process_id, @PathVariable String process_status){
+    public Result updateStatus(@PathVariable Integer process_id, @PathVariable String process_status){
         Process process = new Process();
+        Subject subject = SecurityUtils.getSubject();
+        User user = (User) subject.getSession().getAttribute("user");
+        SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd");
         process.setProcess_id(process_id);
        process.setProcess_status(process_status);
+       process.setGroup_person(user.getU_name());
+        process.setGroup_date(dataFormat.format(new Date()));
+        return processService.save(process);
+    }
+    /***
+     * 完成前处理
+     * @param process_id
+     * @param process_status
+     * @return
+     */
+    @RequiresPermissions("/bus/rawcloth")
+    @RequestMapping(
+            value="cfmProcessStatus/{process_id}/{process_status}",
+            method=RequestMethod.PUT)
+    @ResponseBody
+    public Result cfmStatus(@PathVariable Integer process_id, @PathVariable String process_status){
+        Process process = new Process();
+        Process process1 = processService.getProcessById(process_id);
+        Double pretreat_num = process1.getGroup_num();
+        Subject subject = SecurityUtils.getSubject();
+        User user = (User) subject.getSession().getAttribute("user");
+        SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd");
+        process.setProcess_id(process_id);
+        process.setProcess_status(process_status);
+        process.setPretreat_num(pretreat_num);
+
+        process.setPretreat_person(user.getU_name());
+        process.setPretreat_date(dataFormat.format(new Date()));
+        return processService.save(process);
+    }
+
+    /***
+     * 取消前处理
+     * @param process_id
+     * @param process_status
+     * @return
+     */
+    @RequiresPermissions("/bus/rawcloth")
+    @RequestMapping(
+            value="removeProcessStatus/{process_id}/{process_status}",
+            method=RequestMethod.PUT)
+    @ResponseBody
+    public Result updateProcessStatus(@PathVariable Integer process_id, @PathVariable String process_status){
+        Process process = new Process();
+        process.setProcess_id(process_id);
+        process.setProcess_status(process_status);
+        process.setPretreat_date("");
+        process.setPretreat_num(null);
+        process.setPretreat_person("");
         return processService.save(process);
     }
 }
diff --git a/src/main/java/com/pro/bus/entity/Process.java b/src/main/java/com/pro/bus/entity/Process.java
index 71e5bc754f264a6409a4a5eef82ffbc8778893ba..848d0b5f1b1a28a7a82bd04d856766a8328d1e52 100644
--- a/src/main/java/com/pro/bus/entity/Process.java
+++ b/src/main/java/com/pro/bus/entity/Process.java
@@ -1,7 +1,7 @@
 package com.pro.bus.entity;
 
 public class Process {
-
+    private Integer plan_type;          //计划类型
     private Integer process_id;         //组号
     private Integer plan_id;             //计划编号
     private String process_cus;         //格式：客户编号|客户名称
@@ -29,6 +29,14 @@ public class Process {
     //35已质检 40包装中 50已包装 55已部分入库 60已入库 65已部分交货 70已交货
     private String process_status;                 //格式： 状态编号
 
+    public Integer getPlan_type() {
+        return plan_type;
+    }
+
+    public void setPlan_type(Integer plan_type) {
+        this.plan_type = plan_type;
+    }
+
     public Integer getProcess_id() {
         return process_id;
     }
diff --git a/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java b/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..c76b6eac24661c9785c9e4ec993ac2dc1e546316
--- /dev/null
+++ b/src/main/java/com/pro/bus/mapper/PretreatmentMapper.java
@@ -0,0 +1,18 @@
+package com.pro.bus.mapper;
+
+import com.pro.bus.entity.Process;
+import org.mybatis.spring.annotation.MapperScan;
+
+import java.util.List;
+
+@MapperScan
+public interface PretreatmentMapper {
+    /**
+     * 获取前处理信息
+     * @param process
+     * @return
+     */
+    List<Process> getPretreatment(Process process);
+
+    int doPretreatment(Process process);
+}
diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
index b98f74c5341f633258b1dee0af9766a82b639a8f..1f30358652df3485c496a34ad95798b2a2e186d4 100644
--- a/src/main/java/com/pro/bus/mapper/ProcessMapper.java
+++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java
@@ -68,4 +68,5 @@ public interface ProcessMapper {
      * @return
      */
     Plan getInfoByPlan(@Param("plan_id") Integer plan_id, @Param("process_id") Integer process_id);
+
 }
diff --git a/src/main/java/com/pro/bus/service/PretreatmentService.java b/src/main/java/com/pro/bus/service/PretreatmentService.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0128b4724dfa74e2affbab84bab652ea4a09ede
--- /dev/null
+++ b/src/main/java/com/pro/bus/service/PretreatmentService.java
@@ -0,0 +1,19 @@
+package com.pro.bus.service;
+
+import com.pro.bus.entity.Process;
+import com.pro.sys.entity.Result;
+
+import java.util.List;
+
+public interface PretreatmentService {
+    /**
+     * 获取前处理信息
+     * @param process
+     * @return
+     */
+    List<Process> getPretreatment(Process process);
+    /***
+     * 前处理
+     */
+    Result doPretreatment(Process process);
+}
diff --git a/src/main/java/com/pro/bus/service/ProcessService.java b/src/main/java/com/pro/bus/service/ProcessService.java
index a6cc14b34e52324f6ada02e0089e66d194ae618d..80bf70ee0d7cadaf900971ee204f254795813831 100644
--- a/src/main/java/com/pro/bus/service/ProcessService.java
+++ b/src/main/java/com/pro/bus/service/ProcessService.java
@@ -25,7 +25,6 @@ public interface ProcessService {
      * @return
      */
     Result save(Process process);
-
     /***
      * 根据id获得单条坯布准备信息
      * @param process_id
diff --git a/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java b/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..9df222f7e3962223a0ed5034b7868b80489e9329
--- /dev/null
+++ b/src/main/java/com/pro/bus/service/impl/PretreatmentServiceImpl.java
@@ -0,0 +1,34 @@
+package com.pro.bus.service.impl;
+
+import com.pro.bus.entity.Process;
+import com.pro.bus.mapper.PretreatmentMapper;
+import com.pro.bus.service.PretreatmentService;
+import com.pro.sys.entity.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PretreatmentServiceImpl implements PretreatmentService {
+    @Autowired
+    private PretreatmentMapper pretreatmentMapper;
+
+    /**
+     * 获得前处理信息
+     * @param process
+     * @return
+     */
+    @Override
+    public List<Process> getPretreatment(Process process) {
+        return pretreatmentMapper.getPretreatment(process);
+    }
+
+    @Override
+    public Result doPretreatment(Process process) {
+        if(pretreatmentMapper.doPretreatment(process)>0){
+            return  Result.successResult("前处理成功");
+        }
+        return Result.failResult("前处理失败");
+    }
+}
diff --git a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
index 8d63ba222b292b400b5daaaf4424d7b3033f6a3a..e86712d3fa14842ac5705f265612323fd435144c 100644
--- a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
+++ b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java
@@ -55,6 +55,7 @@ public class ProcessServiceImpl implements ProcessService {
 
     }
 
+
     /***
      * 根据id获得单条坯布准备信息
      * @param process_id
diff --git a/src/main/resources/mapper/bus/Pretreatment.xml b/src/main/resources/mapper/bus/Pretreatment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b746ee474ccbd88981ff2b6c1b46737899a5a63a
--- /dev/null
+++ b/src/main/resources/mapper/bus/Pretreatment.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pro.bus.mapper.PretreatmentMapper">
+    <select id="getPretreatment" resultType="com.pro.bus.entity.Process">
+        SELECT
+        `bus_plan`.`plan_type` AS `plan_type`,
+        `bus_process`.`process_id` AS `process_id`,
+        `bus_process`.`plan_id` AS `plan_id`,
+        `bus_process`.`process_cus` AS `process_cus`,
+        `bus_process`.`process_std` AS `process_std`,
+        `bus_process`.`process_color` AS `process_color`,
+        `bus_process`.`group_num` AS `group_num`,
+        `bus_process`.`group_date` AS `group_date`,
+        `bus_process`.`group_person` AS `group_person`,
+        `bus_process`.`pretreat_num` AS `pretreat_num`,
+        `bus_process`.`pretreat_date` AS `pretreat_date`,
+        `bus_process`.`pretreat_person` AS `pretreat_person`,
+        `bus_process`.`process_status` AS `process_status`
+        FROM
+        (
+        `bus_plan`
+        JOIN `bus_process` ON (
+        (
+        `bus_process`.`plan_id` = `bus_plan`.`plan_id`
+        )
+        )
+        )
+        <where>
+            process_status='05' or process_status='10'
+            <if test="plan_type != null">
+                and plan_type = #{plan_type}
+            </if>
+        </where>
+    </select>
+
+    <update id="doPretreatment" parameterType="com.pro.bus.entity.Process">
+        update bus_process
+        <set>
+                pretreat_num = #{pretreat_num},
+        </set>
+        where process_id = #{process_id}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml
index f3d0739d69a806555b976af06f0ffe20bcdc8654..4e904708a881e741e3bb6e1e881fee2cb4e45925 100644
--- a/src/main/resources/mapper/bus/ProcessMapper.xml
+++ b/src/main/resources/mapper/bus/ProcessMapper.xml
@@ -21,7 +21,19 @@
         select * from bus_process
         <where>
             <if test="process_status != null and process_status != ''">
-                and process_status = #{process_status}
+               and  process_status = #{process_status}
+            </if>
+            <if test="plan_id != null">
+                and plan_id = #{plan_id}
+            </if>
+            <if test="process_cus != null and process_cus != ''">
+                and  process_cus like concat('%',#{process_cus},'%')
+            </if>
+            <if test="process_std != null and process_std != ''">
+                and  process_std like concat('%',#{process_std},'%')
+            </if>
+            <if test="process_color != null and process_color != ''">
+                and  process_color like concat('%',#{process_color},'%')
             </if>
         </where>
     </select>
@@ -61,19 +73,17 @@
             <if test="group_num != null and group_num != ''">
                 group_num = #{group_num},
             </if>
-            <if test="group_date != null and group_date != ''">
+            <if test="group_date != null">
                 group_date = #{group_date},
             </if>
-            <if test="group_person != null and group_person != ''">
+            <if test="group_person != null">
                 group_person = #{group_person},
             </if>
-            <if test="pretreat_num != null and pretreat_num != ''">
                 pretreat_num = #{pretreat_num},
-            </if>
-            <if test="pretreat_date != null and pretreat_date != ''">
+            <if test="pretreat_date != null">
                 pretreat_date = #{pretreat_date},
             </if>
-            <if test="pretreat_person != null and pretreat_person != ''">
+            <if test="pretreat_person != null">
                 pretreat_person = #{pretreat_person},
             </if>
             <if test="dye_num != null and dye_num != ''">
diff --git a/src/main/web/WEB-INF/views/bus/pretreatment.jsp b/src/main/web/WEB-INF/views/bus/pretreatment.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..5e4be0e43903a28e048071484cbc0469ff99b683
--- /dev/null
+++ b/src/main/web/WEB-INF/views/bus/pretreatment.jsp
@@ -0,0 +1,298 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: longda
+  Date: 2018/8/10
+  Time: 10:30
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css">
+</head>
+<style type="text/css">
+    .layui-form-label {
+        width: auto;
+    }
+</style>
+<body>
+<!-- 查询表单 -->
+<form class="layui-form" id="form-pre-query">
+    <div class="layui-form-item" style="margin-top: 15px;">
+
+        <div class="layui-inline">
+
+            <label class="layui-form-label">生产类型</label>
+            <div class="layui-input-inline">
+                <select name="plan_type" lay-verify="required" lay-filter="select-pre-query-pre-type">
+                    <option value="">全部</option>
+                    <option value="1">白布产品</option>
+                    <option value="2">染色产品</option>
+                    <option value="3">无底色印花产品</option>
+                    <option value="4">有底色印花产品</option>
+                </select>
+            </div>
+            <button class="layui-btn" id="bn-pre-query"><i class="layui-icon layui-icon-search"></i> 查询</button>
+
+        </div>
+    </div>
+</form>
+<!-- 新增窗口内容 -->
+<div style="display: none;" id="dom-win-pre-add">
+
+    <form class="layui-form" lay-filter="form-pre-add">
+        <input hidden name="process_id"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">计划编号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" placeholder="计划编号" id="plan_id" name="plan_id" value="" readonly
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">客户名称</label>
+            <div class="layui-input-block">
+                <input class="layui-input" placeholder="客户名称" id="process_cus" name="process_cus" value="" readonly
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"/>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">规格名称</label>
+            <div class="layui-input-block">
+                <input class="layui-input" placeholder="规格名称" id="process_std" name="process_std" value="" readonly
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">花色名称</label>
+            <div class="layui-input-block">
+                <input class="layui-input" placeholder="花色名称" id="process_color" name="process_color" value="" readonly
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">布匹数量</label>
+            <div class="layui-input-block">
+                <input type="number" id="group_num" readonly="readonly" name="group_num" required lay-verify="required"
+                       placeholder="布匹数量" autocomplete="off" class="layui-input"
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">分组时间</label>
+            <div class="layui-input-block">
+                <input type="text" name="group_date" placeholder="yyyy-MM-dd" readonly="readonly"
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"
+                       placeholder="分组（投坯）时间" autocomplete="off" class="layui-input test-item">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label" style="padding-top: 0px;">坯布车间<br/>登记人</label>
+            <div class="layui-input-block">
+                <input type="text" name="group_person" readonly
+                       onclick="layer.tips('不可编辑。', this,{tips:[4,'#6f6f6f'],time: 1500});"
+                       placeholder="坯布车间登记人" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">前处理产量</label>
+            <div class="layui-input-block">
+                <input type="text" name="pretreat_num"
+                       placeholder="前处理产量" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="bn-pre-do-add" lay-submit lay-filter="bn-pre-do-add">提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+<table id="pretreatment-table" lay-filter="preTable"></table>
+<!-- 工具条定义 -->
+<script type="text/html" id="barDemo">
+    <!--  laytpl 语法， d指数据，在这里指当前行数据 -->
+    {{#  if(d.process_status == '05' ){ }}
+    <a class="layui-btn layui-btn-xs" lay-event="pre_edit"><i class="layui-icon">&#xe608;</i> 完成处理</a>
+    {{#  }else if(d.process_status == '10' ){  }}
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="pre_quxiao"><i class="layui-icon layui-icon-left"></i>
+        取消处理</a>
+    {{#  }  }}
+</script>
+
+
+<script src="../../../static/layui-2.3.0/layui.js"></script>
+<script src="../../../static/js/jquery-3.3.1.min.js"></script>
+<script src="../../../static/js/sweetalert-2.1.0.min.js"></script>
+<script src="../../../static/js/common.js"></script>
+
+
+<script>
+
+
+    layui.use(['element', 'table', 'layer', 'form', 'laydate'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        // var g_group_num;
+        //日历插件
+        lay('.test-item').each(function () {
+            laydate.render({
+                elem: this
+                , trigger: 'click'
+            });
+        });
+        //第一个实例
+        var preTable = table.render({
+            elem: '#pretreatment-table'
+            , url: 'getPretreatment' //数据接口
+            , page: true
+            , limit: 5
+            , limits: [5, 10, 15]
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , {field: 'process_id', title: '组号', width: "6%"}
+                , {field: 'plan_id', title: '计划编号', width: "7%"}
+                , {field: 'process_cus', title: '客户名称'}
+                , {field: 'process_std', title: '产品规格名称'}
+                , {field: 'process_color', title: '花色名称'}
+                , {field: 'group_num', title: '布匹数量'}
+                , {field: 'group_date', title: '分组时间'}
+                , {field: 'group_person', title: '坯布车间登记人'}
+                , {field: 'pretreat_num', title: '前处理产量'}
+                , {field: 'pretreat_date', title: '前处理时间'}
+                , {field: 'pretreat_person', title: '前处理登记人'}
+                , {
+                    field: 'process_status', title: '状态', templet: function (d) {
+                        if (d.process_status == '00') {
+                            return '未投坯';
+                        } else if (d.process_status == '05') {
+                            return '已投坯';
+                        }
+                        else if (d.process_status == '10') {
+                            return '已前处理';
+                        }
+                        else if (d.process_status == '15') {
+                            return '已染色';
+                        }
+                        else if (d.process_status == '20') {
+                            return '已印花';
+                        }
+                        else if (d.process_status == '25') {
+                            return '已整理';
+                        }
+                        else if (d.process_status == '30') {
+                            return '质检中';
+                        }
+                        else if (d.process_status == '35') {
+                            return '已质检';
+                        }
+                        else if (d.process_status == '40') {
+                            return '包装中';
+                        }
+                        else if (d.process_status == '50') {
+                            return '已包装';
+                        }
+                        else if (d.process_status == '55') {
+                            return '已部分入库';
+                        }
+                        else if (d.process_status == '60') {
+                            return '已入库';
+                        }
+                        else if (d.process_status == '65') {
+                            return '已部分交货';
+                        }
+                        else if (d.process_status == '70') {
+                            return '已交货';
+                        }
+                    }
+                }
+                , {toolbar: '#barDemo', width: "19%"}
+            ]]
+        });//table结束
+        // 监听工具条。注：tool是工具条事件名，proTable是table原始容器的属性 lay-filter属性的值
+        table.on('tool(preTable)', function (obj) {
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            var tr = obj.tr; //获得当前行 tr 的DOM对象
+            if (layEvent === 'pre_edit') { //编辑
+
+                opr.ajaxWithConfirm({
+                    title: "您确定完成前处理吗?",
+                    url: 'cfmProcessStatus/' + data.process_id + '/10',
+                    method: 'put',
+                    layer: layer,
+                    layuiTableIns: preTable
+                });
+            } else if (layEvent === 'pre_quxiao') { //
+                opr.ajaxWithConfirm({
+                    title: "您确定取消处理吗?",
+                    text: "一旦取消将无法处理!",
+                    url: 'removeProcessStatus/' + data.process_id + '/05',
+                    method: 'put',
+                    layer: layer,
+                    layuiTableIns: preTable
+                });
+            }
+        });//监听工具条结束
+        //
+        //查询
+        $('#bn-pre-query').click(function () {
+            //将表单参数封装为json对象
+            var arr = $("#form-pre-query").serializeArray();
+            var params = {};
+            for (var i = 0; i < arr.length; i++) {
+                params[arr[i].name] = arr[i].value;
+            }
+
+            //传递查询参数重载表格（内部为ajax请求）
+            preTable.reload({
+                where: params,
+                page: {
+                    curr: 1
+                    //重新从第 1 页开始
+                }
+            });
+            // showBns();//重新显示按钮
+            return false;
+        });
+
+        //监听select选择
+        form.on('select(select-pre-query-pre-type)', function (data) {
+            //console.log(data.elem); //得到select原始DOM对象
+            //console.log(data.value); //得到被选中的值
+            //console.log(data.othis); //得到美化后的DOM对象
+            $('#bn-pre-query').click();
+        });
+
+        //监听新增表单提交。bn-pro-do-add是新增表单中提交按钮的lay-filter值
+        form.on('submit(bn-pre-do-add)', function (data) {
+            //console.log(data.elem) //被执行事件的元素DOM对象，一般为button对象
+            //console.log(data.form) //被执行提交的form对象，一般在存在form标签时才会返回
+            //console.log(data.field) //当前容器的全部表单字段，名值对形式：{name: value}
+
+
+            opr.ajax({
+                url: 'save',
+                data: data.field,
+                method: 'post',
+                layer: layer,
+                layuiTableIns: preTable,
+                responseOkHandler: function (result) {
+                    layer.close(layerIdx);
+                    return true;//返回true,继续默认后续行为
+                }
+            });
+
+            return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
+        });
+    });//layui use结束
+</script>
+
+</body>
+</html>
diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp
index ed4c8b11921e132f7cd841d6b6337f0d45452098..8b4479cfef40f4addf311d774f040189f06aa54f 100644
--- a/src/main/web/WEB-INF/views/bus/process.jsp
+++ b/src/main/web/WEB-INF/views/bus/process.jsp
@@ -11,7 +11,6 @@
 <head>
     <title>Title</title>
     <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css">
-    <link rel="stylesheet" href="../../../static/bootstrap-4.1.1/bootstrap.min.css">
 </head>
 <style type="text/css">
     .layui-form-label {
@@ -28,11 +27,32 @@
             <label class="layui-form-label">状态</label>
             <div class="layui-input-inline">
                 <select name="process_status" lay-verify="required" lay-filter="select-pro-query-pro-status">
-                    <option value="">全部</option>
                     <option value="00">未投坯</option>
                     <option value="05">已投坯</option>
                 </select>
             </div>
+            <label class="layui-form-label">计划编号</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="plan_id" autocomplete="off"
+                       class="layui-input">
+            </div>
+
+            <label class="layui-form-label">客户名称</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="process_cus" autocomplete="off"
+                       class="layui-input">
+            </div>
+
+            <label class="layui-form-label">规格名称</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="process_std" autocomplete="off"
+                       class="layui-input">
+            </div>
+            <label class="layui-form-label">花色名称</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="process_color" autocomplete="off"
+                       class="layui-input">
+            </div>
             <button class="layui-btn" id="bn-pro-query"><i class="layui-icon layui-icon-search"></i> 查询</button>
 
         </div>
@@ -40,7 +60,7 @@
 </form>
 <%--选择计划--%>
 <div style="display: none;" id="dom-select-plan">
-    <table id="planTable" class="table">
+    <table id="planTable" class="layui-table">
         <tr>
             <td>计划编号</td>
             <td>客户名称</td>
@@ -69,7 +89,7 @@
 <div style="display: none;" id="dom-win-pro-add">
 
     <form class="layui-form" lay-filter="form-pro-add">
-        <input hidden name="process_id"/>
+        <input hidden name="process_id" id="process_id"/>
         <div class="layui-form-item" style="margin-top: 10px;">
             <label class="layui-form-label">计划编号</label>
             <div class="layui-input-block">
@@ -106,21 +126,6 @@
                        placeholder="布匹数量" autocomplete="off" class="layui-input">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">分组时间</label>
-            <div class="layui-input-block">
-                <input type="text" name="group_date" placeholder="yyyy-MM-dd"
-                       placeholder="分组（投坯）时间" autocomplete="off" class="layui-input test-item">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">坯布车间登记人</label>
-            <div class="layui-input-block">
-                <input type="text" name="group_person"
-                       placeholder="坯布车间登记人" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-
         <div class="layui-form-item">
             <div class="layui-input-block">
                 <button class="layui-btn" id="bn-pro-do-add" lay-submit lay-filter="bn-pro-do-add">提交</button>
@@ -162,9 +167,7 @@
     var showBns = function(){
         var _pro_status = $('#form-pro-query select[name=process_status]').val();
         console.log("_pro_status="+_pro_status);
-        if(_pro_status==''){
-            $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',false).removeClass("layui-btn-disabled");
-        }else if(_pro_status=='00'){
+        if(_pro_status=='00'){
             $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',false).removeClass("layui-btn-disabled");
         }else if(_pro_status=='05'){
             $('#bn-pro-add,#bn-pro-del-multi').prop('disabled',true).addClass("layui-btn-disabled");
@@ -199,6 +202,8 @@
                 , {field: 'process_std', title: '产品规格名称'}
                 , {field: 'process_color', title: '花色名称'}
                 , {field: 'group_num', title: '布匹数量'}
+                , {field: 'group_date', title: '分组时间'}
+                , {field: 'group_person', title: '坯布车间登记人'}
                 , {
                     field: 'process_status', title: '状态', templet: function (d) {
                         if (d.process_status == '00') {
@@ -273,7 +278,6 @@
 
                     }
                 });
-
                 $.ajax({
                     url:"getInfoByPlan/"+data.plan_id+"/"+data.process_id,
                     method:"get",
@@ -389,10 +393,13 @@
                     $("#process_std").val(result.process_std);
                     g_group_num = result.group_num;
                     $("#group_num").prop("max",g_group_num);
+                    $("#group_num").prop("min",g_group_num);
                     $("#group_num").prop("readonly","");
                     $("#group_num").prop("placeholder","现在剩余布匹数量为"+g_group_num+"米");
-                    if(g_group_num==0){
+                    if(g_group_num<=0){
                         $('#bn-pro-do-add').prop('disabled',true).addClass("layui-btn-disabled");
+                    }else{
+                        $('#bn-pro-do-add').prop('disabled',false).removeClass("layui-btn-disabled");
                     }
                 }
             });
diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp
index fe2cae45aedb67450e7cb535d697e2d8b469fecc..43ebb3edf18fc4d76bc1f898c0e7f4baa396f7c5 100644
--- a/src/main/web/WEB-INF/views/sys/home.jsp
+++ b/src/main/web/WEB-INF/views/sys/home.jsp
@@ -41,14 +41,14 @@
             <label class="layui-form-label">输入新密码:</label>
             <div class="layui-input-block">
                 <input type="password" name="u_pwd" id="u_new_pwd" required lay-verify="required"
-                       placeholder="请输入原密码" autocomplete="off" class="layui-input">
+                       placeholder="请输入新密码" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">确认新密码:</label>
             <div class="layui-input-block">
                 <input type="password" name="u_cfm_pwd" id="u_cfm_pwd" required lay-verify="required"
-                       placeholder="请输入原密码" autocomplete="off" class="layui-input">
+                       placeholder="请确认新密码" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">