diff --git a/src/main/resources/mapper/bus/PlanMapper.xml b/src/main/resources/mapper/bus/PlanMapper.xml
index 03d1862a2cfd1a6efa10e54e65113004cbe7c683..456003fefb758dfb47ace1c0de93070fa9e8a4aa 100644
--- a/src/main/resources/mapper/bus/PlanMapper.xml
+++ b/src/main/resources/mapper/bus/PlanMapper.xml
@@ -21,7 +21,7 @@ INNER JOIN info_color ON bus_plan.co_id = info_color.co_id
 INNER JOIN info_customer ON bus_plan.cus_id = info_customer.cus_id
 INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
 <where> info_color.co_status='55' AND info_customer.cus_status='55' AND info_standard.standard_status='55'
-    ORDER BY plan_date DESC
+
 
        <if test="plan_status != null  ">
            and plan_status=#{plan_status}
@@ -39,7 +39,7 @@ INNER JOIN info_standard ON bus_plan.standard_id = info_standard.standard_id
         and co_name like concat('%',#{co_name},'%')
     </if>
 </where>
-
+        ORDER BY plan_date DESC
     </select>
 
     <delete id="deleteById">
diff --git a/src/main/web/WEB-INF/views/bus/plan.jsp b/src/main/web/WEB-INF/views/bus/plan.jsp
index 3112f0ce34ff065ba7bb728745cbed30cd33e93c..1be56b11af6e3102637d439a9469817337cc1166 100644
--- a/src/main/web/WEB-INF/views/bus/plan.jsp
+++ b/src/main/web/WEB-INF/views/bus/plan.jsp
@@ -11,6 +11,11 @@
 <head>
     <title>Title</title>
     <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css" media="all">
+    <style>
+        .layui-form-label {
+            width: auto;
+        }
+    </style>
 </head>
 <body>
 <!-- 查询表单 -->
@@ -71,7 +76,7 @@
     <form class="layui-form" lay-filter="form-cus-add">
 
         <div class="layui-form-item">
-            <label class="layui-form-label">standard</label>
+            <label class="layui-form-label">规格名称</label>
             <div class="layui-input-block">
                 <select name="standard_id" lay-verify="required">
                     <option value=""></option>
@@ -82,7 +87,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">customer</label>
+            <label class="layui-form-label">客户名称</label>
             <div class="layui-input-block">
                 <select name="cus_id" lay-verify="required">
                     <option value=""></option>
@@ -93,7 +98,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">color</label>
+            <label class="layui-form-label">花色名称</label>
             <div class="layui-input-block">
                 <select name="co_id" lay-verify="required">
                     <option value=""></option>
@@ -104,28 +109,28 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_xh</label>
+            <label class="layui-form-label">生产顺序号</label>
             <div class="layui-input-block">
                 <input type="text" name="plan_xh" required lay-verify="required"
-                       placeholder="请输入plan_xh" autocomplete="off" class="layui-input">
+                       placeholder="请输入生产顺序号" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_month</label>
+            <label class="layui-form-label">计划月份</label>
             <div class="layui-input-block">
                 <input id="test3" type="text" name="plan_month" required lay-verify="required"
-                       placeholder="请输入plan_month" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划月份" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-        <label class="layui-form-label">plan_num</label>
+        <label class="layui-form-label">计划产量</label>
         <div class="layui-input-block">
             <input type="text" name="plan_num" required lay-verify="required"
-                   placeholder="请输入plan_num" autocomplete="off" class="layui-input">
+                   placeholder="请输入计划产量" autocomplete="off" class="layui-input">
         </div>
     </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_type</label>
+            <label class="layui-form-label">计划类型</label>
             <div class="layui-input-block">
                 <select name="plan_type" lay-verify="required">
                     <option value=""></option>
@@ -137,17 +142,17 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_date</label>
+            <label class="layui-form-label">计划下达<br/>日期</label>
             <div class="layui-input-block">
                 <input id="plan_date1" type="text" name="plan_date" required lay-verify="required"
-                       placeholder="请输入plan_date" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划下达日期" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_person</label>
+            <label class="layui-form-label">计划登记人</label>
             <div class="layui-input-block">
                 <input type="text" name="plan_person" required lay-verify="required"
-                       placeholder="请输入plan_person" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划登记人" autocomplete="off" class="layui-input">
             </div>
         </div>
 
@@ -166,7 +171,7 @@
     <form class="layui-form" lay-filter="form-cus-upd">
 
         <div class="layui-form-item">
-            <label class="layui-form-label">standard</label>
+            <label class="layui-form-label">规格名称</label>
             <div class="layui-input-block">
                 <select name="standard_id" lay-verify="required">
                     <option value=""></option>
@@ -177,7 +182,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">customer</label>
+            <label class="layui-form-label">客户名称</label>
             <div class="layui-input-block">
                 <select name="cus_id" lay-verify="required">
                     <option value=""></option>
@@ -188,7 +193,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">color</label>
+            <label class="layui-form-label">花色名称</label>
             <div class="layui-input-block">
                 <select name="co_id" lay-verify="required">
                     <option value=""></option>
@@ -199,28 +204,28 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_xh</label>
+            <label class="layui-form-label">生产顺序号</label>
             <div class="layui-input-block">
                 <input type="text" name="plan_xh" required lay-verify="required"
-                       placeholder="请输入plan_xh" autocomplete="off" class="layui-input">
+                       placeholder="请输入生产顺序号" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_month</label>
+            <label class="layui-form-label">计划月份</label>
             <div class="layui-input-block">
                 <input id="test4" type="text" name="plan_month" required lay-verify="required"
-                       placeholder="请输入plan_month" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划月份" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_num</label>
+            <label class="layui-form-label">计划产量</label>
             <div class="layui-input-block">
                 <input type="text" name="plan_num" required lay-verify="required"
-                       placeholder="请输入plan_num" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划产量" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_type</label>
+            <label class="layui-form-label">计划类型</label>
             <div class="layui-input-block">
                 <select name="plan_type" lay-verify="required">
                     <option value=""></option>
@@ -232,24 +237,24 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_date</label>
+            <label class="layui-form-label">计划下达<br/>日期</label>
             <div class="layui-input-block">
                 <input id="plan_date" type="text" name="plan_date" required lay-verify="required"
-                       placeholder="请输入plan_date" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划下达日期" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_person</label>
+            <label class="layui-form-label">计划登记人</label>
             <div class="layui-input-block">
                 <input type="text" name="plan_person" required lay-verify="required"
-                       placeholder="请输入plan_person" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划登记人" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">plan_status</label>
+            <label class="layui-form-label">计划状态</label>
             <div class="layui-input-block">
                 <input type="0" name="plan_status" required lay-verify="required"
-                       placeholder="请输入plan_status" autocomplete="off" class="layui-input">
+                       placeholder="请输入计划状态" autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
