bf

yiming
1 parent d8bb7d0f
Showing 10 changed files with 1530 additions and 2214 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
@@ -103,6 +103,7 @@ public class BsthTLineAddController extends BaseController
             ajaxResult.put("msg","线路已存在或提交申请");
             return ajaxResult;
         }
+        bsthTLine.setLineUpdateType("3");
         return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
     }
@@ -130,9 +131,8 @@ public class BsthTLineAddController extends BaseController
     {
         User loginUser = ShiroUtils.getSysUser();
-
         bsthTLine.setUpdateBy(loginUser.getUserName());
-
+        bsthTLine.setLineUpdateType("3");
         return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
     }
@@ -149,4 +149,16 @@ public class BsthTLineAddController extends BaseController
     }
+    @PostMapping( "/isExist")
+    @ResponseBody
+    public AjaxResult isExist(String lineName)
+    {
+        BsthTLine bsthTLine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
+        AjaxResult ajaxResult=new AjaxResult();
+        Long id=bsthTLine!=null?bsthTLine.getId():null;
+        ajaxResult.put("id",id);
+        return ajaxResult;
+    }
+
+
 }
@@ -350,9 +350,7 @@ public class BsthTLine extends BaseEntity
     private String revenueType;
-    private String start_reason;
-    private String line_update_type;
     public void setId(Long id)
     {
@@ -1149,21 +1147,6 @@ public class BsthTLine extends BaseEntity
         this.revenueType = revenueType;
     }
-    public String getStart_reason() {
-        return start_reason;
-    }
-
-    public void setStart_reason(String start_reason) {
-        this.start_reason = start_reason;
-    }
-
-    public String getLine_update_type() {
-        return line_update_type;
-    }
-
-    public void setLine_update_type(String line_update_type) {
-        this.line_update_type = line_update_type;
-    }
     @Override
     public String toString() {
@@ -1254,7 +1237,6 @@ public class BsthTLine extends BaseEntity
                 ", examineStatus='" + examineStatus + '\'' +
                 ", examineType='" + examineType + '\'' +
                 ", revenueType='" + revenueType + '\'' +
-                ", start_reason='" + start_reason + '\'' +
                 '}';
     }
 }
@@ -964,14 +964,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="persons != null">persons = #{persons},</if>
 			<if test="mileages != null">mileages = #{mileages},</if>
 			<if test="personAvg != null">person_avg = #{personAvg},</if>
-			<if test="startDate != null">start_date = #{startDate},</if>
 			<if test="nightParking != null">night_parking = #{nightParking},</if>
 			<if test="files != null">files = #{files},</if>
-			<if test="revenueType != null">revenue_type = #{revenueType},</if>
-			<if test="examineStatus != null">examine_status = #{examineStatus},</if>
+			<if test="startDate != null">start_date = #{startDate},</if>
 			<if test="startReason != null">start_reason = #{startReason},</if>
 			<if test="lineUpdateType != null">line_update_type = #{lineUpdateType},</if>
-			<if test="startReason != null">start_reason = #{startReason},</if>
+			<if test="revenueType != null">revenue_type = #{revenueType},</if>
+			<if test="examineType != null">examine_type = #{examineType},</if>
+			<if test="examineStatus != null">examine_status = #{examineStatus},</if>
 		</trim>
 		where id = #{id}
 	</update>
@@ -4,128 +4,103 @@
     <th:block th:include="include :: header('添加线路档案信息')" />
     <th:block th:include="include :: datetimepicker-css" />
     <th:block th:include="include :: bootstrap-fileinput-css" />
+    <th:block th:include="include :: bootstrap-select-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-line-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">线路名称：</label>
-                <div class="col-sm-8">
-                    <input name="lineName" class="form-control" type="text">
+                <label class="col-sm-1 control-label">线路名称：</label>
+                <div class="col-sm-2">
+                    <input name="lineName" class="form-control" type="text" onblur="isExist(this.value)">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">主线路id：</label>
+                <div class="col-sm-2">
+                    <input name="pLineId" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">公司：</label>
+                <div class="col-sm-2">
                     <input name="company" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">分公司：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">分公司：</label>
+                <div class="col-sm-2">
                     <input name="fCompany" class="form-control" type="text">
                 </div>
+
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">主线路id：</label>
-                <div class="col-sm-8">
-                    <input name="pLineId" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">营运方式：</label>
-                <div class="col-sm-8">
-                    <select name="serviceType"
-                            th:with="type=${@dict.getType('serviceType')}"
-                            class="form-control m-b">
+            
+            <div class="form-group">
+                <label class="col-sm-1 control-label">营运方式：</label>
+                <div class="col-sm-2">
+                    <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
-
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label">线路属性：</label>
-                <div class="col-sm-8">
-                    <select name="lineLevel"
-                            th:with="type=${@dict.getType('lineLevel')}"
-                            class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">线路属性：</label>
+                <div class="col-sm-2">
+                    <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">线路类型：</label>
-                <div class="col-sm-8">
-                    <select name="lineType" th:with="type=${@dict.getType('lineType')}"
-                            class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">线路类型：</label>
+                <div class="col-sm-2">
+                    <select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">区属：</label>
-                <div class="col-sm-8">
-                    <select name="district" th:with="type=${@dict.getType('district')}"
-                            class="form-control m-b">
-                        <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">道路类型：</label>
+                <div class="col-sm-2" th:with="type=${@dict.getType('roadType')}">
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"  multiple title=""  >
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否区内：</label>
-                <div class="col-sm-8">
-                    <select name="inoutDistrict"
-                            th:with="type=${@dict.getType('trueFalse')}"
-                            class="form-control m-b">
+            
+            <div class="form-group">
+                <label class="col-sm-1 control-label">区属：</label>
+                <div class="col-sm-2">
+                    <select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
-
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">营运状态：</label>
-                <div class="col-sm-8">
-                    <select name="serviceState"
-                            th:with="type=${@dict.getType('serviceState')}"
-                            class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">是否区内：</label>
+                <div class="col-sm-2">
+                    <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">车辆类型 多选：</label>
-                <div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
-                    <label class="checkbox-inline" th:each="dict : ${type}"
-                           style="display: block"> <input type="checkbox"
-                           name="busType"
-                           th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">车辆类型：</label>
+                <div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title=""  >
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
+                        </option>
+                    </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否空调：</label>
-                <div class="col-sm-8">
-                    <select name="airConditionerType"
-                            th:with="type=${@dict.getType('airConditionerType')}"
-                            class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">是否空调：</label>
+                <div class="col-sm-2">
+                    <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
                         <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}">
@@ -133,460 +108,391 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">售票类型：</label>
-                <div class="col-sm-8">
-                    <select name="sellTicketType"
-                            th:with="type=${@dict.getType('sellTicketType')}"
-                            class="form-control m-b">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">售票类型：</label>
+                <div class="col-sm-2">
+                    <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
                         <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">运营时间：</label>
-                <div class="col-sm-8">
-                    <select name="serviceTime"
-                            th:with="type=${@dict.getType('serviceTime')}"
-                            class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">票价：</label>
+                <div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control"  multiple title=""  >
+                        <option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
+                        </option>
+                    </select>
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">运营时间：</label>
+                <div class="col-sm-2">
+                    <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
                         <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                 th:value="${dict.dictValue}">
                         </option>
                     </select>
                 </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">线路编码：</label>
+                <div class="col-sm-2">
+                    <input name="lineCode" class="form-control" type="text">
+                </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">线路长度：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">线路长度：</label>
+                <div class="col-sm-2">
                     <input name="lineDistance" class="form-control" type="text">
                 </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">首站：</label>
+                <div class="col-sm-2">
+                    <input name="firstStation" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">末站：</label>
+                <div class="col-sm-2">
+                    <input name="lastStation" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">起讫站：</label>
+                <div class="col-sm-2">
+                    <input name="startEnd" class="form-control" type="text">
+                </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">线路编码：</label>
-                <div class="col-sm-8">
-                    <input name="lineCode" class="form-control" type="text">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">站点名称：</label>
+                <div class="col-sm-2">
+                        <textarea name="halfwayStation" class="form-control"></textarea>
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">线路走向：</label>
+                <div class="col-sm-2">
+                    <textarea name="directions" class="form-control"></textarea>
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">首战时间：</label>
+                <div class="col-sm-2">
+                    <input name="firstTime" class="form-control" type="text">
+                </div>
+                <label class="col-sm-1 control-label">末站首战时间：</label>
+                <!---------------------------------->
+                <div class="col-sm-2">
+                    <input name="lastTime" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">授权年限：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">停车场：</label>
+                <div class="col-sm-2">
+                    <input name="park" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">授权年限：</label>
+                <div class="col-sm-2">
                     <input name="warrantYear" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">授权起始日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">授权起始日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="warrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">授权结束日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">授权结束日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="warrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">撤销日期：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">撤销日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="planCancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">实际撤销日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">实际撤销日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="cancelTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">撤销原因：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">撤销原因：</label>
+                <div class="col-sm-2">
                     <textarea name="cancelReason" class="form-control"></textarea>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <textarea name="remark" class="form-control"></textarea>
-                </div>
-            </div>
-            <!--<div class="form-group">
-                <label class="col-sm-3 control-label">是否逻辑删除：</label>
-                <div class="col-sm-8">
-                    <select name="isLogicDelete"
-                            th:with="type=${@dict.getType('trueFalse')}"
-                            class="form-control m-b">
-                        <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
-                        </option>
-                    </select>
-                </div>
-            </div>-->
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">更新人：</label>
-                <div class="col-sm-8">
-                    <input name="updateBy" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">更新时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="updateTime" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="timeSchedule" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">停车场：</label>
-                <div class="col-sm-8">
-                    <input name="park" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否权证：</label>
-                <div class="col-sm-8">
-                    <select name="isWarrant" id="isWarrant"
-                            th:with="type=${@dict.getType('trueFalse')}"
-                            class="form-control m-b">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">是否权证：</label>
+                <div class="col-sm-2">
+                    <select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue=='1'}">
                         </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">权证开通日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">权证开通日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
-                        <input name="isWarrantStartTime" id="isWarrantStartTime"
-                               class="form-control" placeholder="yyyy-MM-dd" type="text"
-                               autocomplete="off"> <span class="input-group-addon"><i
-                            class="fa fa-calendar"></i></span>
+                        <input name="isWarrantStartTime" id="isWarrantStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
+                               autocomplete="off">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
-
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">权证到期日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">权证到期日期：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
-                        <input name="isWarrantEndTime" id="isWarrantEndTime"
-                               class="form-control" placeholder="yyyy-MM-dd" type="text"
-                               autocomplete="off"> <span class="input-group-addon"><i
-                            class="fa fa-calendar"></i></span>
+                        <input name="isWarrantEndTime" id="isWarrantEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"
+                               autocomplete="off">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
-
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">道路类型：</label>
-                <div class="col-sm-8">
-                    <div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
-                    <label class="checkbox-inline" th:each="dict : ${type}"
-                           style="display: block"> <input type="checkbox"
-                           name="roadType"
-                           th:text="${dict.dictLabel}" th:value="${dict.dictValue}" />
-                    </label>
-                </div>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">票价(多级票价用  -  隔开)：</label>
-                <div class="col-sm-8">
-                    <input name="ticketPrice" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">首站：</label>
-                <div class="col-sm-8">
-                    <input name="firstStation" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">经营权证（大巴）：</label>
+                <div class="col-sm-2">
+                        <input name="warrantVehiclesLarge" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">起讫站：</label>
-                <div class="col-sm-8">
-                    <input name="startEnd" class="form-control" type="text">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">经营权证（中巴）：</label>
+                <div class="col-sm-2">
+                        <input name="warrantVehiclesMiddle" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">首战时间：</label>
-                <div class="col-sm-8">
-                    <input name="firstTime" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">实际配车数：</label>
+                <div class="col-sm-2">
+                    <input name="vehiclesNumber" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">末站：</label>
-                <div class="col-sm-8">
-                    <input name="lastStation" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">实际车辆数（大）：</label>
+                <div class="col-sm-2">
+                    <input name="numberVehiclesLarge" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">末站首战时间：</label>
-                <div class="col-sm-8">
-                    <input name="lastTime" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">实际车辆数（中）：</label>
+                <div class="col-sm-2">
+                    <input name="numberVehiclesMiddle" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">上行里程数：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">上行里程数：</label>
+                <div class="col-sm-2">
                     <input name="mileageUp" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">下行里程数：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">下行里程数：</label>
+                <div class="col-sm-2">
                     <input name="mileageDown" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">平均里程数：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">平均里程数：</label>
+                <div class="col-sm-2">
                     <input name="averageMileage" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">站级数(上行)：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">站级数(上行)：</label>
+                <div class="col-sm-2">
                     <input name="stationUp" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">站级数(下行)：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">站级数(下行)：</label>
+                <div class="col-sm-2">
                     <input name="stationDown" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">行驶时间(上行)：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">行驶时间(上行)：</label>
+                <div class="col-sm-2">
                     <input name="travelTimeUp" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">行驶时间(下行)：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">行驶时间(下行)：</label>
+                <div class="col-sm-2">
                     <input name="travelTimeDown" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+                <div class="col-sm-2">
                     <input name="travelIntervalUp" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
+                <div class="col-sm-2">
                     <input name="travelIntervalDown" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经营权证（大巴）：</label>
-                <div class="col-sm-8">
-                    <input name="warrantVehiclesLarge" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经营权证（中巴）：</label>
-                <div class="col-sm-8">
-                    <input name="warrantVehiclesMiddle" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">实际配车数：</label>
-                <div class="col-sm-8">
-                    <input name="vehiclesNumber" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">高峰系数：</label>
+                <div class="col-sm-2">
+                    <input name="fullCustomerPercent" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">实际车辆数（大）：</label>
-                <div class="col-sm-8">
-                    <input name="numberVehiclesLarge" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">低谷系数：</label>
+                <div class="col-sm-2">
+                    <input name="lowCustomerPercent" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">实际车辆数（中）：</label>
-                <div class="col-sm-8">
-                    <input name="numberVehiclesMiddle" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">间隔等级：</label>
+                <div class="col-sm-2">
+                    <input name="divideLevel" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">车辆自编号：</label>
-                <div class="col-sm-8">
+
+            <div class="form-group">
+                <label class="col-sm-1 control-label">车辆自编号：</label>
+                <div class="col-sm-2">
                     <input name="carPlate" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">线路总配人数：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">线路总配人数：</label>
+                <div class="col-sm-2">
                     <input name="numberPerson" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">人数司机：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">人数司机：</label>
+                <div class="col-sm-2">
                     <input name="numberPersonDriver" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">售票员数：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">售票员数：</label>
+                <div class="col-sm-2">
                     <input name="numberPersonSales" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">新能源车数：</label>
-                <div class="col-sm-8">
-                    <input name="busEvNumber" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">线路走向：</label>
-                <div class="col-sm-8">
-                    <textarea name="directions" class="form-control"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">经营权证数：</label>
-                <div class="col-sm-8">
-                    <input name="numberOfManage" class="form-control" type="text">
-                </div>
-            </div>
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">站点名称：</label>
-                <div class="col-sm-8">
-                    <textarea name="halfwayStation" class="form-control"></textarea>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">高峰系数：</label>
-                <div class="col-sm-8">
-                    <input name="fullCustomerPercent" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">低谷系数：</label>
-                <div class="col-sm-8">
-                    <input name="lowCustomerPercent" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">间隔等级：</label>
-                <div class="col-sm-8">
-                    <input name="divideLevel" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否挂牌：</label>
-                <div class="col-sm-8">
-                    <select name="hasTimelists"
-                            th:with="type=${@dict.getType('trueFalse')}"
-                            class="form-control m-b">
-                        <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}">
-                        </option>
-                    </select>
+                <label class="col-sm-1 control-label">新能源车数：</label>
+                <div class="col-sm-2">
+                    <input name="busEvNumber" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
-                <div class="col-sm-8">
-                    <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
-                        class="form-control m-b">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+                <div class="col-sm-2">
+                    <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                            th:value="${dict.dictValue}"></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">轨交时间：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">轨交时间：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
-                        <input name="metroTime" class="form-control"
-                               placeholder="HH:mm:ss" > <span
-                            class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="metroTime" class="form-control" placeholder="HH:mm:ss" >
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
-                <div class="col-sm-8">
-                    <input name="coldBonusType" class="form-control" type="text">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">是否挂牌：</label>
+                <div class="col-sm-2">
+                    <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+                        <option value=""></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
+                        </option>
+                    </select>
                 </div>
             </div>
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">性质：</label>
-                <div class="col-sm-8">
-                    <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b">
+                <label class="col-sm-1 control-label">经营权证数：</label>
+                <div class="col-sm-2">
+                    <input name="numberOfManage" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">营运状态：</label>
+                <div class="col-sm-2">
+                    <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
                         <option value=""></option>
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}">
+                        </option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">营收类型：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+                <div class="col-sm-2">
+                    <input name="coldBonusType" class="form-control" type="text">
+                </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">营收类型：</label>
+                <div class="col-sm-2">
                     <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
                         <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">附件：</label>
-                <div class="col-sm-8">
-                    <div class="file-loading" id="uploadDiv">
-                        <input id="fileinput" type="file" multiple>
-                    </div>
+                <label class="col-sm-1 control-label">性质：</label>
+                <div class="col-sm-2">
+                    <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled="">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                th:selected="${dict.dictValue=='3'}" ></option>
+                    </select>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">开通日期：</label>
-                <div class="col-sm-8">
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">启用时间：</label>
+                <div class="col-sm-2">
                     <div class="input-group date">
                         <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     </div>
                 </div>
+                <!---------------------------------->
+                <label class="col-sm-1 control-label">备注：</label>
+                <div class="col-sm-2">
+                    <textarea name="remark" class="form-control"></textarea>
+                </div>
+            </div>
+
+            <div class="form-group">
+            <label class="col-sm-1 control-label">附件：</label>
+            <div class="col-sm-5">
+                <div class="file-loading" id="uploadDiv">
+                    <input id="fileinput" type="file" multiple>
+                </div>
+            </div>
             </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <th:block th:include="include :: bootstrap-fileinput-js" />
+    <th:block th:include="include :: bootstrap-select-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/lineAdd"
         $(function() {
-
             $("#fileinput").fileinput({
                 'theme' : 'explorer-fas',
                 'uploadUrl' : '/common/upload',
@@ -693,6 +599,73 @@
             autoclose: true
         });
+        function isExist(lineName){
+            var data={'lineName':lineName};
+            $.post(prefix + "/isExist",data,function (result){
+                if(result.id!=null){
+                    layer.confirm("是否修改上一次的申请记录",{
+                        btn: ['是', '否']
+                    },function (index, layero) {
+                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                        parent.layer.close(index); //再执行关闭
+                        edit(result.id);
+                    });
+                }
+
+            })
+        }
+
+        function edit(id) {
+            open(id,"修改线路档案信息",(prefix + "/edit/{id}").replace("{id}", id));
+        }
+
+        function open(id,title, url, width, height, callback) {
+            console.log(id)
+            // 如果是移动端，就使用自适应大小弹窗
+            if ($.common.isMobile()) {
+                width = 'auto';
+                height = 'auto';
+            }
+            if ($.common.isEmpty(title)) {
+                title = false;
+            }
+            if ($.common.isEmpty(url)) {
+                url = "/404.html";
+            }
+            if ($.common.isEmpty(width)) {
+                width = 800;
+            }
+            if ($.common.isEmpty(height)) {
+                height = ($(window).height() - 50);
+            }
+            if ($.common.isEmpty(callback)) {
+                callback = function(index, layero) {
+                    var iframeWin = layero.find('iframe')[0];
+                    iframeWin.contentWindow.submitHandler(index, layero);
+                }
+            }
+
+            var index =parent.layer.open({
+                type: 2,
+                area: [width + 'px', height + 'px'],
+                fix: false,
+                //不固定
+                maxmin: true,
+                shade: 0.3,
+                title: title,
+                content: url,
+                btn: ['修改', '删除'],
+                // 弹层外区域关闭
+                shadeClose: true,
+                yes: callback,
+                btn2: function(index, layero){
+                    $.operate.remove(id)
+                }
+            });
+            parent.layer.full(index);
+        }
+
+
     </script>
 </body>
 </html>
 \ No newline at end of file
@@ -4,297 +4,271 @@
 <th:block th:include="include :: header('修改【请填写功能名称】')" />
 <th:block th:include="include :: datetimepicker-css" />
 <th:block th:include="include :: bootstrap-fileinput-css" />
+<th:block th:include="include :: bootstrap-select-css" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-line-edit"
-			th:object="${bsthTLine}">
+		<form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
 			<input name="id" th:field="*{id}" type="hidden">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路名称：</label>
-				<div class="col-sm-8">
-					<input name="lineName" th:field="*{lineName}" class="form-control"
-						type="text">
+				<label class="col-sm-1 control-label">线路名称：</label>
+				<div class="col-sm-2">
+					<input name="lineName" th:field="*{lineName}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">公司：</label>
-				<div class="col-sm-8">
-					<input name="company" th:field="*{company}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">主线路id：</label>
+				<div class="col-sm-2">
+					<input name="pLineId" th:field="*{pLineId}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">分公司：</label>
-				<div class="col-sm-8">
-					<input name="fCompany" th:field="*{fCompany}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">公司：</label>
+				<div class="col-sm-2">
+					<input name="company" th:field="*{company}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">主线路id：</label>
-				<div class="col-sm-8">
-					<input name="pLineId" th:field="*{pLineId}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">分公司：</label>
+				<div class="col-sm-2">
+					<input name="fCompany" th:field="*{fCompany}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">营运方式：</label>
-				<div class="col-sm-8">
-					<select name="serviceType"
-						th:with="type=${@dict.getType('serviceType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">营运方式：</label>
+				<div class="col-sm-2">
+					<select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路属性：</label>
-				<div class="col-sm-8">
-					<select name="lineLevel"
-						th:with="type=${@dict.getType('lineLevel')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路属性：</label>
+				<div class="col-sm-2">
+					<select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路类型：</label>
-				<div class="col-sm-8">
-					<select name="lineType" th:with="type=${@dict.getType('lineType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路类型：</label>
+				<div class="col-sm-2">
+					<select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">区属：</label>
-				<div class="col-sm-8">
-
-					<select name="district" th:with="type=${@dict.getType('district')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">道路类型：</label>
+				<div class="col-sm-2" >
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">是否区内：</label>
-				<div class="col-sm-8">
-					<select name="inoutDistrict"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">区属：</label>
+				<div class="col-sm-2">
+					<select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营运状态：</label>
-				<div class="col-sm-8">
-
-					<select name="serviceState"
-						th:with="type=${@dict.getType('serviceState')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否区内：</label>
+				<div class="col-sm-2">
+					<select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆类型：</label>
-				<div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
-					<label class="checkbox-inline" th:each="dict : ${type}"
-						style="display: block"> <input type="checkbox"
-						name="busType"
-						th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
-						th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">车辆类型：</label>
+				<div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否空调：</label>
-				<div class="col-sm-8">
-
-					<select name="airConditionerType"
-						th:with="type=${@dict.getType('airConditionerType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否空调：</label>
+				<div class="col-sm-2">
+					<select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">售票类型：</label>
-				<div class="col-sm-8">
-					<select name="sellTicketType"
-						th:with="type=${@dict.getType('sellTicketType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">售票类型：</label>
+				<div class="col-sm-2">
+					<select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">运营时间：</label>
-				<div class="col-sm-8">
-					<select name="serviceTime"
-						th:with="type=${@dict.getType('serviceTime')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">票价：</label>
+				<div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">运营时间：</label>
+				<div class="col-sm-2">
+					<select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路长度：</label>
-				<div class="col-sm-8">
-					<input name="lineDistance" th:field="*{lineDistance}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路编码：</label>
+				<div class="col-sm-2">
+					<input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路编码：</label>
-				<div class="col-sm-8">
-					<input name="lineCode" th:field="*{lineCode}" class="form-control"
-						type="text">
+				<label class="col-sm-1 control-label">线路长度：</label>
+				<div class="col-sm-2">
+					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首站：</label>
+				<div class="col-sm-2">
+					<input name="firstStation" th:field="*{firstStation}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站：</label>
+				<div class="col-sm-2">
+					<input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">起讫站：</label>
+				<div class="col-sm-2">
+					<input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权年限：</label>
-				<div class="col-sm-8">
-					<input name="warrantYear" th:field="*{warrantYear}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">站点名称：</label>
+				<div class="col-sm-2">
+					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路走向：</label>
+				<div class="col-sm-2">
+					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首战时间：</label>
+				<div class="col-sm-2">
+					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站首战时间：</label>
+				<div class="col-sm-2">
+					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权起始日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">停车场：</label>
+				<div class="col-sm-2">
+					<input name="park" th:field="*{park}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权年限：</label>
+				<div class="col-sm-2">
+					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权起始日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantStartTime"
-							th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
+						   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">授权结束日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权结束日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantEndTime"
-							th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="planCancelTime"
-							th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际撤销日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="cancelTime"
-							th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销原因：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">撤销原因：</label>
+				<div class="col-sm-2">
 					<textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">备注：</label>
-				<div class="col-sm-8">
-					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否逻辑删除：</label>
-				<div class="col-sm-8">
-
-					<select name="isLogicDelete"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete== null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="timeSchedule"
-							th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
+							   th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text"
+							   autocomplete="off"> <span class="input-group-addon"><i
 							class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">停车场：</label>
-				<div class="col-sm-8">
-					<input name="park" th:field="*{park}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否权证：</label>
-				<div class="col-sm-8">
-					<select name="isWarrant" id="isWarrant"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
+				<label class="col-sm-1 control-label">是否权证：</label>
+				<div class="col-sm-2">
+					<select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">权证开通日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证开通日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="isWarrantStartTime" id="isWarrantStartTime"
 							   th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
@@ -302,12 +276,10 @@
 							   autocomplete="off"> <span class="input-group-addon"><i
 							class="fa fa-calendar"></i></span>
 					</div>
-
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">权证到期日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证到期日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="isWarrantEndTime" id="isWarrantEndTime"
 							   th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
@@ -315,352 +287,182 @@
 							   autocomplete="off"> <span class="input-group-addon"><i
 							class="fa fa-calendar"></i></span>
 					</div>
-
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">道路类型：</label>
-				<div class="col-sm-8">
-					<div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
-						<label class="checkbox-inline" th:each="dict : ${type}"
-							style="display: block"> <input type="checkbox"
-							name="roadType"
-							th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
-							th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
-				<div class="col-sm-8">
-					<input name="ticketPrice" th:field="*{ticketPrice}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首站：</label>
-				<div class="col-sm-8">
-					<input name="firstStation" th:field="*{firstStation}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">起讫站：</label>
-				<div class="col-sm-8">
-					<input name="startEnd" th:field="*{startEnd}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首战时间：</label>
-				<div class="col-sm-8">
-					<input name="firstTime" th:field="*{firstTime}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站：</label>
-				<div class="col-sm-8">
-					<input name="lastStation" th:field="*{lastStation}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站首战时间：</label>
-				<div class="col-sm-8">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">上行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageUp" th:field="*{mileageUp}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">下行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageDown" th:field="*{mileageDown}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">平均里程数：</label>
-				<div class="col-sm-8">
-					<input name="averageMileage" th:field="*{averageMileage}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(上行)：</label>
-				<div class="col-sm-8">
-					<input name="stationUp" th:field="*{stationUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">经营权证（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(下行)：</label>
-				<div class="col-sm-8">
-					<input name="stationDown" th:field="*{stationDown}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">经营权证（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(上行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeUp" th:field="*{travelTimeUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际配车数：</label>
+				<div class="col-sm-2">
+					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(下行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeDown" th:field="*{travelTimeDown}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalUp" th:field="*{travelIntervalUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalDown" th:field="*{travelIntervalDown}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">上行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesLarge"
-						th:field="*{warrantVehiclesLarge}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">下行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesMiddle"
-						th:field="*{warrantVehiclesMiddle}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">平均里程数：</label>
+				<div class="col-sm-2">
+					<input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际配车数：</label>
-				<div class="col-sm-8">
-					<input name="vehiclesNumber" th:field="*{vehiclesNumber}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">站级数(上行)：</label>
+				<div class="col-sm-2">
+					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">站级数(下行)：</label>
+				<div class="col-sm-2">
+					<input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesMiddle"
-						th:field="*{numberVehiclesMiddle}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆自编号：</label>
-				<div class="col-sm-8">
-					<input name="carPlate" th:field="*{carPlate}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路总配人数：</label>
-				<div class="col-sm-8">
-					<input name="numberPerson" th:field="*{numberPerson}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">人数司机：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonDriver" th:field="*{numberPersonDriver}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">售票员数：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonSales" th:field="*{numberPersonSales}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">高峰系数：</label>
+				<div class="col-sm-2">
+					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">新能源车数：</label>
-				<div class="col-sm-8">
-					<input name="busEvNumber" th:field="*{busEvNumber}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">低谷系数：</label>
+				<div class="col-sm-2">
+					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路走向：</label>
-				<div class="col-sm-8">
-					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">间隔等级：</label>
+				<div class="col-sm-2">
+					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证数：</label>
-				<div class="col-sm-8">
-					<input name="numberOfManage" th:field="*{numberOfManage}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">车辆自编号：</label>
+				<div class="col-sm-2">
+					<input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站点名称：</label>
-				<div class="col-sm-8">
-					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路总配人数：</label>
+				<div class="col-sm-2">
+					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">高峰系数：</label>
-				<div class="col-sm-8">
-					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">人数司机：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">低谷系数：</label>
-				<div class="col-sm-8">
-					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">售票员数：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">间隔等级：</label>
-				<div class="col-sm-8">
-					<input name="divideLevel" th:field="*{divideLevel}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">新能源车数：</label>
+				<div class="col-sm-2">
+					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否挂牌：</label>
-				<div class="col-sm-8">
-					<select name="hasTimelists"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+				<div class="col-sm-2">
+					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
-				<div class="col-sm-8">
-					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">轨交时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">轨交时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="metroTime" class="form-control"
-							placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
-							class="input-group-addon"><i class="fa fa-calendar"></i></span>
+						<input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
-				<div class="col-sm-8">
-					<input name="coldBonusType" th:field="*{coldBonusType}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<!--<div class="form-group">
-				<label class="col-sm-3 control-label">月度营收：</label>
-				<div class="col-sm-8">
-					<input name="revenuesMonth" th:field="*{revenuesMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">月度人次：</label>
-				<div class="col-sm-8">
-					<input name="personMonth" th:field="*{personMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">月度里程：</label>
-				<div class="col-sm-8">
-					<input name="mileageMonth" th:field="*{mileageMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">百公里人次：</label>
-				<div class="col-sm-8">
-					<input name="personMonthAvg" th:field="*{personMonthAvg}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营收：</label>
-				<div class="col-sm-8">
-					<input name="revenues" th:field="*{revenues}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">人次：</label>
-				<div class="col-sm-8">
-					<input name="persons" th:field="*{persons}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">里程：</label>
-				<div class="col-sm-8">
-					<input name="mileages" th:field="*{mileages}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">百公里人次：</label>
-				<div class="col-sm-8">
-					<input name="personAvg" th:field="*{personAvg}"
-						class="form-control" type="text">
-				</div>
-			</div>-->
-			<div class="form-group">
-				<label class="col-sm-3 control-label">性质：</label>
-				<div class="col-sm-8">
-					<select name="lineUpdateType"
-							th:with="type=${@dict.getType('lineUpdateType')}"
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否挂牌：</label>
+				<div class="col-sm-2">
+					<select name="hasTimelists"
+							th:with="type=${@dict.getType('trueFalse')}"
 							class="form-control m-b">
+						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
 								th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">营收类型：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">经营权证数：</label>
+				<div class="col-sm-2">
+					<input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营运状态：</label>
+				<div class="col-sm-2">
+					<select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+				<div class="col-sm-2">
+					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营收类型：</label>
+				<div class="col-sm-2">
 					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
@@ -668,37 +470,45 @@
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">启用时间：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">性质：</label>
+				<div class="col-sm-2">
+					<select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled="">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${dict.dictValue=='3'}" ></option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">启用时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="startDate"
-							th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-
-			<div class="form-group">
-				<label class="col-sm-3 control-label">启用原因：</label>
-				<div class="col-sm-8">
-					<textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">备注：</label>
+				<div class="col-sm-2">
+					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">附件：</label>
-				<div class="col-sm-8">
-					<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}">
-						<input name="files" type="hidden" th:value="${path}">
-						<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
-						</a>
-						<button onclick="deleteFile(this);">删除</button>
-					</div>
-					<div class="file-loading" id="uploadDiv">
-						<input id="fileinput" type="file" multiple>
+				<div class="form-group">
+					<label class="col-sm-1 control-label">附件：</label>
+					<div class="col-sm-5">
+						<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
+							<input name="files" type="hidden" th:value="${path}" >
+							<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
+							</a>
+							<button onclick="deleteFile(this);">删除</button>
+						</div>
+						<div class="file-loading" id="uploadDiv">
+							<input id="fileinput" type="file" multiple>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -707,6 +517,7 @@
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: datetimepicker-js" />
 	<th:block th:include="include :: bootstrap-fileinput-js" />
+	<th:block th:include="include :: bootstrap-select-js" />
 	<script th:inline="javascript">
 		var prefix = ctx + "system/lineAdd";
 		function deleteFile(obj){
@@ -69,7 +69,7 @@
 		function add(obj){
 			if($(obj)[0].className.indexOf("disabled") == -1)
-				$.operate.add();
+				$.operate.addFull();
 		}
 		new Vue({
@@ -219,10 +219,6 @@
 					title: '分公司'
 				},
 				{
-					field: 'pLineId',
-					title: '主线路id'
-				},
-				{
 					field: 'serviceType',
 					title: '营运方式'
 				},
@@ -239,106 +235,10 @@
 					title: '区属'
 				},
 				{
-					field: 'inoutDistrict',
-					title: '是否区内'
-				},
-				{
-					field: 'serviceState',
-					title: '营运状态'
-				},
-				{
-					field: 'busType',
-					title: '车辆类型'
-				},
-				{
-					field: 'airConditionerType',
-					title: '是否空调'
-				},
-				{
-					field: 'sellTicketType',
-					title: '售票类型'
-				},
-				{
-					field: 'serviceTime',
-					title: '运营时间'
-				},
-				{
 					field: 'lineDistance',
 					title: '线路长度'
 				},
 				{
-					field: 'lineCode',
-					title: '线路编码'
-				},
-				{
-					field: 'warrantYear',
-					title: '授权年限'
-				},
-				{
-					field: 'warrantStartTime',
-					title: '授权起始日期'
-				},
-				{
-					field: 'warrantEndTime',
-					title: '授权结束日期'
-				},
-				{
-					field: 'planCancelTime',
-					title: '撤销日期'
-				},
-				{
-					field: 'cancelTime',
-					title: '实际撤销日期'
-				},
-				{
-					field: 'cancelReason',
-					title: '撤销原因'
-				},
-				{
-					field: 'remark',
-					title: '备注'
-				},
-				{
-					field: 'isLogicDelete',
-					title: '是否逻辑删除'
-				},
-				{
-					field: 'updateBy',
-					title: '更新人'
-				},
-				{
-					field: 'updateTime',
-					title: '更新时间'
-				},
-				{
-					field: 'timeSchedule',
-					title: '行车作业计划表报备时间'
-				},
-				{
-					field: 'park',
-					title: '停车场'
-				},
-				{
-					field: 'isWarrant',
-					title: '是否权证'
-				},
-				{
-					field: 'isWarrantStartTime',
-					title: '权证开通日期'
-				},
-				{
-					field: 'isWarrantEndTime',
-					title: '权证到期日期'
-				},
-				{
-					field: 'roadType',
-					title: '道路类型'
-				},
-				{
-					field: 'ticketPrice',
-					title: '票价'
-				},
-				{
 					field: 'firstStation',
 					title: '首站'
 				},
@@ -347,108 +247,8 @@
 					title: '起讫站'
 				},
 				{
-					field: 'firstTime',
-					title: '首战时间'
-				},
-				{
 					field: 'lastStation',
 					title: '末站'
-				},
-				{
-					field: 'lastTime',
-					title: '末站首战时间'
-				},
-				{
-					field: 'mileageUp',
-					title: '上行里程数'
-				},
-				{
-					field: 'mileageDown',
-					title: '下行里程数'
-				},
-				{
-					field: 'averageMileage',
-					title: '平均里程数'
-				},
-				{
-					field: 'stationUp',
-					title: '站级数(上行)'
-				},
-				{
-					field: 'stationDown',
-					title: '站级数(下行)'
-				},{
-					field: 'travelTimeUp',
-					title: '行驶时间(上行)'
-				},{
-					field: 'travelTimeDown',
-					title: '行驶时间(下行)'
-				},{
-					field: 'travelIntervalUp',
-					title: '行驶间隔(高峰)'
-				},{
-					field: 'travelIntervalDown',
-					title: '行驶间隔(低谷)'
-				},{
-					field: 'warrantVehiclesLarge',
-					title: '经营权证(大巴)'
-				}, {
-					field: 'warrantVehiclesMiddle',
-					title: '经营权证(中巴)'
-				},{
-					field: 'vehiclesNumber',
-					title: '实际配车数'
-				}, {
-					field: 'numberVehiclesLarge',
-					title: '实际车辆数(大巴)'
-				}, {
-					field: 'numberVehiclesMiddle',
-					title: '实际车辆数(中巴)'
-				},{
-					field: 'carPlate',
-					title: '车辆自编号'
-				},{
-					field: 'numberPerson',
-					title: '线路总配人数'
-				},{
-					field: 'numberPersonDriver',
-					title: '人数司机'
-				}, {
-					field: 'numberPersonSales',
-					title: '售票员数'
-				},{
-					field: 'busEvNumber',
-					title: '新能源车数'
-				},{
-					field: 'directions',
-					title: '线路走向'
-				},{
-					field: 'numberOfManage',
-					title: '经营权证数'
-				},{
-					field: 'halfwayStation',
-					title: '站点名称'
-				},{
-					field: 'fullCustomerPercent',
-					title: '高峰系数'
-				},{
-					field: 'lowCustomerPercent',
-					title: '低谷系数'
-				}, {
-					field: 'divideLevel',
-					title: '间隔等级'
-				},{
-					field: 'hasTimelists',
-					title: '是否挂牌'
-				},{
-					field: 'isMetro',
-					title: '是否轨交末班车衔接'
-				},{
-					field: 'metroTime',
-					title: '轨交时间'
-				},{
-					field: 'coldBonusType',
-					title: '冷僻线路补贴类型'
 				}];
@@ -493,7 +293,7 @@
 				}
 			}
-			layer.open({
+			var index=layer.open({
 				type: 2,
 				area: [width + 'px', height + 'px'],
 				fix: false,
@@ -510,6 +310,7 @@
 					$.operate.remove(id)
 				}
 			});
+			layer.full(index);
 		}
 	</script>
 	<style>
@@ -4,645 +4,501 @@
 <th:block th:include="include :: header('修改【请填写功能名称】')" />
 <th:block th:include="include :: datetimepicker-css" />
 <th:block th:include="include :: bootstrap-fileinput-css" />
+<th:block th:include="include :: bootstrap-select-css" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-line-edit"
-			th:object="${bsthTLine}">
+		<form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
 			<input name="id" th:field="*{id}" type="hidden">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路名称：</label>
-				<div class="col-sm-8">
-					<input name="lineName" th:field="*{lineName}" class="form-control" disabled
-						type="text">
+				<label class="col-sm-1 control-label">线路名称：</label>
+				<div class="col-sm-2">
+					<input name="lineName" th:field="*{lineName}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">公司：</label>
-				<div class="col-sm-8">
-					<input name="company" th:field="*{company}" class="form-control" disabled
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">主线路id：</label>
+				<div class="col-sm-2">
+					<input name="pLineId" th:field="*{pLineId}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">分公司：</label>
-				<div class="col-sm-8">
-					<input name="fCompany" th:field="*{fCompany}" class="form-control" disabled
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">公司：</label>
+				<div class="col-sm-2">
+					<input name="company" th:field="*{company}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">主线路id：</label>
-				<div class="col-sm-8">
-					<input name="pLineId" th:field="*{pLineId}" class="form-control" disabled
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">分公司：</label>
+				<div class="col-sm-2">
+					<input name="fCompany" th:field="*{fCompany}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">营运方式：</label>
-				<div class="col-sm-8">
-					<select name="serviceType" disabled
-						th:with="type=${@dict.getType('serviceType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">营运方式：</label>
+				<div class="col-sm-2">
+					<select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路属性：</label>
-				<div class="col-sm-8">
-					<select name="lineLevel" disabled
-						th:with="type=${@dict.getType('lineLevel')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路属性：</label>
+				<div class="col-sm-2">
+					<select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路类型：</label>
-				<div class="col-sm-8">
-					<select name="lineType" disabled th:with="type=${@dict.getType('lineType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路类型：</label>
+				<div class="col-sm-2">
+					<select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">区属：</label>
-				<div class="col-sm-8">
-
-					<select name="district" th:with="type=${@dict.getType('district')}" disabled
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">道路类型：</label>
+				<div class="col-sm-2" >
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"  multiple title=""  disabled>
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">是否区内：</label>
-				<div class="col-sm-8">
-					<select name="inoutDistrict" disabled
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">区属：</label>
+				<div class="col-sm-2">
+					<select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营运状态：</label>
-				<div class="col-sm-8">
-
-					<select name="serviceState" disabled
-						th:with="type=${@dict.getType('serviceState')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否区内：</label>
+				<div class="col-sm-2">
+					<select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆类型：</label>
-				<div class="col-sm-8" th:with="type=${@dict.getType('busType')}">
-					<label class="checkbox-inline" th:each="dict : ${type}"
-						style="display: block"> <input type="checkbox" disabled
-						name="busType"
-						th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
-						th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">车辆类型：</label>
+				<div class="col-sm-2" th:with="type=${@dict.getType('busType')}">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title="" disabled >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否空调：</label>
-				<div class="col-sm-8">
-
-					<select name="airConditionerType" disabled
-						th:with="type=${@dict.getType('airConditionerType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否空调：</label>
+				<div class="col-sm-2">
+					<select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">售票类型：</label>
-				<div class="col-sm-8">
-					<select name="sellTicketType" disabled
-						th:with="type=${@dict.getType('sellTicketType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">售票类型：</label>
+				<div class="col-sm-2">
+					<select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">运营时间：</label>
-				<div class="col-sm-8">
-					<select name="serviceTime" disabled
-						th:with="type=${@dict.getType('serviceTime')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">票价：</label>
+				<div class="col-sm-2" th:with="type=${@dict.getType('ticketPrice')}">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control"  multiple title="" disabled >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">运营时间：</label>
+				<div class="col-sm-2">
+					<select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路长度：</label>
-				<div class="col-sm-8">
-					<input name="lineDistance" th:field="*{lineDistance}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路编码：</label>
+				<div class="col-sm-2">
+					<input name="lineCode" th:field="*{lineCode}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路编码：</label>
-				<div class="col-sm-8">
-					<input name="lineCode" th:field="*{lineCode}" class="form-control" disabled
-						type="text">
+				<label class="col-sm-1 control-label">线路长度：</label>
+				<div class="col-sm-2">
+					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首站：</label>
+				<div class="col-sm-2">
+					<input name="firstStation" th:field="*{firstStation}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站：</label>
+				<div class="col-sm-2">
+					<input name="lastStation" th:field="*{lastStation}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">起讫站：</label>
+				<div class="col-sm-2">
+					<input name="startEnd" th:field="*{startEnd}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权年限：</label>
-				<div class="col-sm-8">
-					<input name="warrantYear" th:field="*{warrantYear}" disabled
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">站点名称：</label>
+				<div class="col-sm-2">
+					<textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路走向：</label>
+				<div class="col-sm-2">
+					<textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首战时间：</label>
+				<div class="col-sm-2">
+					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站首战时间：</label>
+				<div class="col-sm-2">
+					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权起始日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">停车场：</label>
+				<div class="col-sm-2">
+					<input name="park" th:field="*{park}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权年限：</label>
+				<div class="col-sm-2">
+					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权起始日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantStartTime"
-							th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}" disabled
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">授权结束日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权结束日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantEndTime"
-							th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}" disabled
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="planCancelTime"
-							th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}" disabled
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际撤销日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="cancelTime"
-							th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}" disabled
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销原因：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">撤销原因：</label>
+				<div class="col-sm-2">
 					<textarea name="cancelReason" class="form-control" disabled>[[*{cancelReason}]]</textarea>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">备注：</label>
-				<div class="col-sm-8">
-					<textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否逻辑删除：</label>
-				<div class="col-sm-8">
-
-					<select name="isLogicDelete" disabled
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete== null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="timeSchedule" disabled
-							th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">停车场：</label>
-				<div class="col-sm-8">
-					<input name="park" th:field="*{park}" class="form-control" disabled
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否权证：</label>
-				<div class="col-sm-8">
-					<select name="isWarrant" id="isWarrant" disabled
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
+				<label class="col-sm-1 control-label">是否权证：</label>
+				<div class="col-sm-2">
+					<select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">权证开通日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证开通日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="isWarrantStartTime" id="isWarrantStartTime" disabled
-							   th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
-							   class="form-control" placeholder="yyyy-MM-dd" type="text"
-							   autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="isWarrantStartTime" id="isWarrantStartTime" th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
-
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">权证到期日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证到期日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="isWarrantEndTime" id="isWarrantEndTime" disabled
-							   th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
-							   class="form-control" placeholder="yyyy-MM-dd" type="text"
-							   autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="isWarrantEndTime" id="isWarrantEndTime" th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
-
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">道路类型：</label>
-				<div class="col-sm-8">
-					<div class="col-sm-8" th:with="type=${@dict.getType('roadType')}">
-						<label class="checkbox-inline" th:each="dict : ${type}"
-							style="display: block"> <input type="checkbox"
-							name="roadType" disabled
-							th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
-							th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
-				<div class="col-sm-8">
-					<input name="ticketPrice" th:field="*{ticketPrice}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首站：</label>
-				<div class="col-sm-8">
-					<input name="firstStation" th:field="*{firstStation}" disabled
-						class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">起讫站：</label>
-				<div class="col-sm-8">
-					<input name="startEnd" th:field="*{startEnd}" class="form-control" disabled
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首战时间：</label>
-				<div class="col-sm-8">
-					<input name="firstTime" th:field="*{firstTime}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站：</label>
-				<div class="col-sm-8">
-					<input name="lastStation" th:field="*{lastStation}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站首战时间：</label>
-				<div class="col-sm-8">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control" disabled
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">上行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageUp" th:field="*{mileageUp}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">下行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageDown" th:field="*{mileageDown}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">平均里程数：</label>
-				<div class="col-sm-8">
-					<input name="averageMileage" th:field="*{averageMileage}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(上行)：</label>
-				<div class="col-sm-8">
-					<input name="stationUp" th:field="*{stationUp}" disabled
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(下行)：</label>
-				<div class="col-sm-8">
-					<input name="stationDown" th:field="*{stationDown}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">经营权证（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(上行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeUp" th:field="*{travelTimeUp}" disabled
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">经营权证（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(下行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeDown" th:field="*{travelTimeDown}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际配车数：</label>
+				<div class="col-sm-2">
+					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesLarge"
-						th:field="*{warrantVehiclesLarge}" class="form-control" disabled
-						type="text">
+				<label class="col-sm-1 control-label">上行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesMiddle"
-						th:field="*{warrantVehiclesMiddle}" class="form-control" disabled
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">下行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text"disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际配车数：</label>
-				<div class="col-sm-8">
-					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">平均里程数：</label>
+				<div class="col-sm-2">
+					<input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">站级数(上行)：</label>
+				<div class="col-sm-2">
+					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesMiddle"
-						th:field="*{numberVehiclesMiddle}" class="form-control" disabled
-						type="text">
+				<label class="col-sm-1 control-label">站级数(下行)：</label>
+				<div class="col-sm-2">
+					<input name="stationDown" th:field="*{stationDown}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆自编号：</label>
-				<div class="col-sm-8">
-					<input name="carPlate" th:field="*{carPlate}" class="form-control" disabled
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路总配人数：</label>
-				<div class="col-sm-8">
-					<input name="numberPerson" th:field="*{numberPerson}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">人数司机：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">售票员数：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonSales" th:field="*{numberPersonSales}" disabled
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">新能源车数：</label>
-				<div class="col-sm-8">
-					<input name="busEvNumber" th:field="*{busEvNumber}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">高峰系数：</label>
+				<div class="col-sm-2">
+					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路走向：</label>
-				<div class="col-sm-8">
-					<textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">低谷系数：</label>
+				<div class="col-sm-2">
+					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证数：</label>
-				<div class="col-sm-8">
-					<input name="numberOfManage" th:field="*{numberOfManage}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">间隔等级：</label>
+				<div class="col-sm-2">
+					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">站点名称：</label>
-				<div class="col-sm-8">
-					<textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
+				<label class="col-sm-1 control-label">车辆自编号：</label>
+				<div class="col-sm-2">
+					<input name="carPlate" th:field="*{carPlate}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">高峰系数：</label>
-				<div class="col-sm-8">
-					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路总配人数：</label>
+				<div class="col-sm-2">
+					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">低谷系数：</label>
-				<div class="col-sm-8">
-					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">人数司机：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">间隔等级：</label>
-				<div class="col-sm-8">
-					<input name="divideLevel" th:field="*{divideLevel}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">售票员数：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text" disabled>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">是否挂牌：</label>
-				<div class="col-sm-8">
-					<select name="hasTimelists"
-						th:with="type=${@dict.getType('trueFalse')}" disabled
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
-					</select>
+				<label class="col-sm-1 control-label">新能源车数：</label>
+				<div class="col-sm-2">
+					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text" disabled>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
-				<div class="col-sm-8">
-					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" disabled
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+				<div class="col-sm-2">
+					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">轨交时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">轨交时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="metroTime" class="form-control" disabled
-							placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
-							class="input-group-addon"><i class="fa fa-calendar"></i></span>
+						<input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
-				<div class="col-sm-8">
-					<input name="coldBonusType" th:field="*{coldBonusType}" disabled
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否挂牌：</label>
+				<div class="col-sm-2">
+					<select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b" disabled>
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">性质：</label>
-				<div class="col-sm-8">
-					<select name="lineUpdateType"
-							th:with="type=${@dict.getType('lineUpdateType')}" disabled
-							class="form-control m-b">
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-								th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
+				<label class="col-sm-1 control-label">经营权证数：</label>
+				<div class="col-sm-2">
+					<input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营运状态：</label>
+				<div class="col-sm-2">
+					<select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b" disabled>
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营收类型：</label>
-				<div class="col-sm-8">
-					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" disabled class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+				<div class="col-sm-2">
+					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text" disabled>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营收类型：</label>
+				<div class="col-sm-2">
+					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b" disabled>
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">启用时间：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">性质：</label>
+				<div class="col-sm-2">
+					<select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" class="form-control m-b" disabled>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">启用时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="startDate"
-							th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}" disabled
-							class="form-control" placeholder="yyyy-MM-dd" type="text"
-							autocomplete="off"> <span class="input-group-addon"><i
-							class="fa fa-calendar"></i></span>
+						<input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">启用原因：</label>
-				<div class="col-sm-8">
-					<textarea name="startReason" class="form-control" disabled>[[*{startReason}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">备注：</label>
+				<div class="col-sm-2">
+					<textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">附件：</label>
-				<div class="col-sm-8">
-					<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
-						<input name="files" type="hidden" th:value="${path}" >
-						<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
-						</a>
-						<button onclick="deleteFile(this);">删除</button>
-					</div>
-					<div class="file-loading" id="uploadDiv">
-						<input id="fileinput" type="file" multiple>
+				<div class="form-group">
+					<label class="col-sm-1 control-label">附件：</label>
+					<div class="col-sm-5" >
+						<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
+							<input name="files" type="hidden" th:value="${path}"  >
+							<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}"></a>
+							<button onclick="deleteFile(this);" disabled>删除</button>
+						</div>
+						<div class="file-loading" id="uploadDiv">
+							<input id="fileinput" type="file" multiple disabled>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -651,6 +507,7 @@
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: datetimepicker-js" />
 	<th:block th:include="include :: bootstrap-fileinput-js" />
+	<th:block th:include="include :: bootstrap-select-js" />
 	<script th:inline="javascript">
 		var prefix = ctx + "system/line";
 		function deleteFile(obj){
@@ -108,8 +108,6 @@
 				if(!objs)continue;
-				console.log(objs[i]);
-
 				var col = {
 					field: objs[i].field,
 					title: objs[i].title,
@@ -462,18 +460,50 @@
-	function detail(id,examineType,width, height) {
-		table.set();
-		var url=prefix+'/examine'
-		var _url = $.operate.detailUrl(id);
-		var options = {
-			title: table.options.modalName + "详细",
-			width: width,
-			height: height,
-			url: _url,
-			skin: 'layui-layer-gray',
-			btn: ['通过','未通过'],
+
+	function detail(id,examineType) {
+		open(examineType,id,table.options.modalName,(table.options.detailUrl).replace("{id}", id));
+	}
+
+	function open(examineType,id,title, url, width, height, callback) {
+		// 如果是移动端，就使用自适应大小弹窗
+		if ($.common.isMobile()) {
+			width = 'auto';
+			height = 'auto';
+		}
+		if ($.common.isEmpty(title)) {
+			title = false;
+		}
+		if ($.common.isEmpty(url)) {
+			url = "/404.html";
+		}
+		if ($.common.isEmpty(width)) {
+			width = 800;
+		}
+		if ($.common.isEmpty(height)) {
+			height = ($(window).height() - 50);
+		}
+		if ($.common.isEmpty(callback)) {
+			callback = function(index, layero) {
+				var iframeWin = layero.find('iframe')[0];
+				iframeWin.contentWindow.submitHandler(index, layero);
+			}
+		}
+
+		var index =layer.open({
+			type: 2,
+			area: [width + 'px', height + 'px'],
+			fix: false,
+			//不固定
+			maxmin: true,
+			shade: 0.3,
+			title: title,
+			content: url,
+			btn:  ['通过','未通过'],
+			// 弹层外区域关闭
+			shadeClose: true,
 			yes: function () {
+				var url=prefix+'/examine'
 				var data={'id':id,'examineType':examineType,'examineStatus':'2'}
 				$.post(url, data, function(result) {
 					if (result.code == web_status.SUCCESS) {
@@ -486,6 +516,7 @@
 				});
 			},
 			btn2:function () {
+				var url=prefix+'/examine'
 				var data={'id':id,'examineType':examineType,'examineStatus':'1'}
 				$.post(url, data, function(result) {
 					if (result.code == web_status.SUCCESS) {
@@ -496,10 +527,9 @@
 					}
 				});
 			}
-		};
-		$.modal.openOptions(options);
+		});
+		layer.full(index);
 	}
-
 	</script>
 	<style>
 .col_checkbox {
@@ -4,675 +4,515 @@
 <th:block th:include="include :: header('修改【请填写功能名称】')" />
 <th:block th:include="include :: datetimepicker-css" />
 <th:block th:include="include :: bootstrap-fileinput-css" />
+<th:block th:include="include :: bootstrap-select-css" />
 </head>
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-		<form class="form-horizontal m" id="form-line-edit"
-			th:object="${bsthTLine}">
+		<form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
 			<input name="id" th:field="*{id}" type="hidden">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路名称：</label>
-				<div class="col-sm-8">
-					<input id="lineName" name="lineName" th:field="*{lineName}"
-						class="form-control" type="text" readonly>
+				<label class="col-sm-1 control-label">线路名称：</label>
+				<div class="col-sm-2">
+					<input name="lineName" th:field="*{lineName}" class="form-control" type="text" readonly>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">公司：</label>
-				<div class="col-sm-8">
-					<input name="company" th:field="*{company}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">主线路id：</label>
+				<div class="col-sm-2">
+					<input name="pLineId" th:field="*{pLineId}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">分公司：</label>
-				<div class="col-sm-8">
-					<input name="fCompany" th:field="*{fCompany}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">公司：</label>
+				<div class="col-sm-2">
+					<input name="company" th:field="*{company}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">主线路id：</label>
-				<div class="col-sm-8">
-					<input name="pLineId" th:field="*{pLineId}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">分公司：</label>
+				<div class="col-sm-2">
+					<input name="fCompany" th:field="*{fCompany}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">营运方式：</label>
-				<div class="col-sm-8">
-					<select name="serviceType"
-						th:with="type=${@dict.getType('serviceType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">营运方式：</label>
+				<div class="col-sm-2">
+					<select name="serviceType" th:with="type=${@dict.getType('serviceType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路属性：</label>
-				<div class="col-sm-8">
-					<select name="lineLevel"
-						th:with="type=${@dict.getType('lineLevel')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路属性：</label>
+				<div class="col-sm-2">
+					<select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineLevel== null ? '' : bsthTLine.lineLevel),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路类型：</label>
-				<div class="col-sm-8">
-					<select name="lineType" th:with="type=${@dict.getType('lineType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路类型：</label>
+				<div class="col-sm-2">
+					<select name="lineType" th:with="type=${@dict.getType('lineType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">区属：</label>
-				<div class="col-sm-8">
-
-					<select name="district" th:with="type=${@dict.getType('district')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">道路类型：</label>
+				<div class="col-sm-2" name="roadType">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#strings.toString(dict.dictValue))}">
+						</option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">是否区内：</label>
-				<div class="col-sm-8">
-					<select name="inoutDistrict"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">区属：</label>
+				<div class="col-sm-2">
+					<select name="district" th:with="type=${@dict.getType('district')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营运状态：</label>
-				<div class="col-sm-8">
-
-					<select name="serviceState"
-						th:with="type=${@dict.getType('serviceState')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否区内：</label>
+				<div class="col-sm-2">
+					<select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆类型：</label>
-				<div class="col-sm-8" th:with="type=${@dict.getType('busType')}" name="busType">
-					<label class="checkbox-inline" th:each="dict : ${type}"
-						style="display: block"> <input type="checkbox"
-						name="busType"
-						th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.busType == null ? '' : bsthTLine.busType ,','),#strings.toString(dict.dictValue))}"
-						th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">车辆类型：</label>
+				<div class="col-sm-2" name="busType">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否空调：</label>
-				<div class="col-sm-8">
-
-					<select name="airConditionerType"
-						th:with="type=${@dict.getType('airConditionerType')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否空调：</label>
+				<div class="col-sm-2">
+					<select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType== null ? '' : bsthTLine.airConditionerType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.airConditionerType == null ? '' : bsthTLine.airConditionerType ),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">售票类型：</label>
-				<div class="col-sm-8">
-					<select name="sellTicketType"
-						th:with="type=${@dict.getType('sellTicketType')}"
-						class="form-control m-b">
+				<label class="col-sm-1 control-label">售票类型：</label>
+				<div class="col-sm-2" >
+					<select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType== null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.sellTicketType == null ? '' : bsthTLine.sellTicketType),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">运营时间：</label>
-				<div class="col-sm-8">
-					<select name="serviceTime"
-						th:with="type=${@dict.getType('serviceTime')}"
-						class="form-control m-b">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">票价：</label>
+				<div class="col-sm-2" name="ticketPrice">
+					<!--data-max-options="2" 限制多选数量-->
+					<select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker form-control"  multiple title=""  >
+						<option th:each="dict : ${type}"  th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.ticketPrice== null ? '' : bsthTLine.ticketPrice),#strings.toString(dict.dictValue))}">
+						</option>
+					</select>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">运营时间：</label>
+				<div class="col-sm-2">
+					<select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" class="form-control m-b">
 						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceTime== null ? '' : bsthTLine.serviceTime),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路长度：</label>
-				<div class="col-sm-8">
-					<input name="lineDistance" th:field="*{lineDistance}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路编码：</label>
+				<div class="col-sm-2">
+					<input name="lineCode" th:field="*{lineCode}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">线路编码：</label>
-				<div class="col-sm-8">
-					<input name="lineCode" th:field="*{lineCode}" class="form-control"
-						type="text">
+				<label class="col-sm-1 control-label">线路长度：</label>
+				<div class="col-sm-2">
+					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首站：</label>
+				<div class="col-sm-2">
+					<input name="firstStation" th:field="*{firstStation}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站：</label>
+				<div class="col-sm-2">
+					<input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">起讫站：</label>
+				<div class="col-sm-2">
+					<input name="startEnd" th:field="*{startEnd}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权年限：</label>
-				<div class="col-sm-8">
-					<input name="warrantYear" th:field="*{warrantYear}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">站点名称：</label>
+				<div class="col-sm-2">
+					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路走向：</label>
+				<div class="col-sm-2">
+					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">首战时间：</label>
+				<div class="col-sm-2">
+					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">末站首战时间：</label>
+				<div class="col-sm-2">
+					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">授权起始日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">停车场：</label>
+				<div class="col-sm-2">
+					<input name="park" th:field="*{park}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权年限：</label>
+				<div class="col-sm-2">
+					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权起始日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantStartTime"
-							th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">授权结束日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">授权结束日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="warrantEndTime"
-							th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销日期：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="planCancelTime"
-							th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际撤销日期：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际撤销日期：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="cancelTime"
-							th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
+						<input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">撤销原因：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">撤销原因：</label>
+				<div class="col-sm-2">
 					<textarea name="cancelReason" class="form-control">[[*{cancelReason}]]</textarea>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">备注：</label>
-				<div class="col-sm-8">
-					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否逻辑删除：</label>
-				<div class="col-sm-8">
-
-					<select name="isLogicDelete"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isLogicDelete == null ? '' : bsthTLine.isLogicDelete),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行车作业计划表报备时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行车作业计划表报备时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
 						<input name="timeSchedule"
-							th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
-							class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+							   th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text"
+							   autocomplete="off"> <span class="input-group-addon"><i
+							class="fa fa-calendar"></i></span>
 					</div>
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">停车场：</label>
-				<div class="col-sm-8">
-					<input name="park" th:field="*{park}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否权证：</label>
-				<div class="col-sm-8">
-					<select name="isWarrant"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
+				<label class="col-sm-1 control-label">是否权证：</label>
+				<div class="col-sm-2">
+					<select name="isWarrant" id="isWarrant" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">道路类型：</label>
-				<div class="col-sm-8">
-					<div class="col-sm-8" th:with="type=${@dict.getType('roadType')}" name="roadType">
-						<label class="checkbox-inline" th:each="dict : ${type}"
-							style="display: block"> <input type="checkbox"
-							name="roadType"
-							th:checked="${#arrays.contains(#strings.arraySplit(bsthTLine.roadType == null ? '' : bsthTLine.roadType ,','),#strings.toString(dict.dictValue))}"
-							th:text="${dict.dictLabel}" th:value="${dict.dictValue}" /></label>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证开通日期：</label>
+				<div class="col-sm-2">
+					<div class="input-group date">
+						<input name="isWarrantStartTime" id="isWarrantStartTime"
+							   th:value="${#dates.format(bsthTLine.isWarrantStartTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text"
+							   autocomplete="off"> <span class="input-group-addon"><i
+							class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
-				<div class="col-sm-8">
-					<input name="ticketPrice" th:field="*{ticketPrice}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首站：</label>
-				<div class="col-sm-8">
-					<input name="firstStation" th:field="*{firstStation}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">起讫站：</label>
-				<div class="col-sm-8">
-					<input name="startEnd" th:field="*{startEnd}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">首战时间：</label>
-				<div class="col-sm-8">
-					<input name="firstTime" th:field="*{firstTime}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站：</label>
-				<div class="col-sm-8">
-					<input name="lastStation" th:field="*{lastStation}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">末站首战时间：</label>
-				<div class="col-sm-8">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">上行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageUp" th:field="*{mileageUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">权证到期日期：</label>
+				<div class="col-sm-2">
+					<div class="input-group date">
+						<input name="isWarrantEndTime" id="isWarrantEndTime"
+							   th:value="${#dates.format(bsthTLine.isWarrantEndTime, 'yyyy-MM-dd')}"
+							   class="form-control" placeholder="yyyy-MM-dd" type="text"
+							   autocomplete="off"> <span class="input-group-addon"><i
+							class="fa fa-calendar"></i></span>
+					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">下行里程数：</label>
-				<div class="col-sm-8">
-					<input name="mileageDown" th:field="*{mileageDown}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">经营权证（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">平均里程数：</label>
-				<div class="col-sm-8">
-					<input name="averageMileage" th:field="*{averageMileage}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">经营权证（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(上行)：</label>
-				<div class="col-sm-8">
-					<input name="stationUp" th:field="*{stationUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际配车数：</label>
+				<div class="col-sm-2">
+					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站级数(下行)：</label>
-				<div class="col-sm-8">
-					<input name="stationDown" th:field="*{stationDown}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(上行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeUp" th:field="*{travelTimeUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">实际车辆数（中巴）：</label>
+				<div class="col-sm-2">
+					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶时间(下行)：</label>
-				<div class="col-sm-8">
-					<input name="travelTimeDown" th:field="*{travelTimeDown}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">上行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(高峰)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalUp" th:field="*{travelIntervalUp}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">下行里程数：</label>
+				<div class="col-sm-2">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">行驶间隔(低谷)：</label>
-				<div class="col-sm-8">
-					<input name="travelIntervalDown" th:field="*{travelIntervalDown}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">平均里程数：</label>
+				<div class="col-sm-2">
+					<input name="averageMileage" th:field="*{averageMileage}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesLarge"
-						th:field="*{warrantVehiclesLarge}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">站级数(上行)：</label>
+				<div class="col-sm-2">
+					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="warrantVehiclesMiddle"
-						th:field="*{warrantVehiclesMiddle}" class="form-control"
-						type="text">
+				<label class="col-sm-1 control-label">站级数(下行)：</label>
+				<div class="col-sm-2">
+					<input name="stationDown" th:field="*{stationDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际配车数：</label>
-				<div class="col-sm-8">
-					<input name="vehiclesNumber" th:field="*{vehiclesNumber}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（大巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
+				<div class="col-sm-2">
+					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">实际车辆数（中巴）：</label>
-				<div class="col-sm-8">
-					<input name="numberVehiclesMiddle"
-						th:field="*{numberVehiclesMiddle}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">车辆自编号：</label>
-				<div class="col-sm-8">
-					<input name="carPlate" th:field="*{carPlate}" class="form-control"
-						type="text">
+				<label class="col-sm-1 control-label">行驶间隔(低谷)：</label>
+				<div class="col-sm-2">
+					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路总配人数：</label>
-				<div class="col-sm-8">
-					<input name="numberPerson" th:field="*{numberPerson}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">高峰系数：</label>
+				<div class="col-sm-2">
+					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">人数司机：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonDriver" th:field="*{numberPersonDriver}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">低谷系数：</label>
+				<div class="col-sm-2">
+					<input name="lowCustomerPercent" th:field="*{lowCustomerPercent}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">售票员数：</label>
-				<div class="col-sm-8">
-					<input name="numberPersonSales" th:field="*{numberPersonSales}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">间隔等级：</label>
+				<div class="col-sm-2">
+					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">新能源车数：</label>
-				<div class="col-sm-8">
-					<input name="busEvNumber" th:field="*{busEvNumber}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">车辆自编号：</label>
+				<div class="col-sm-2">
+					<input name="carPlate" th:field="*{carPlate}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">线路走向：</label>
-				<div class="col-sm-8">
-					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">线路总配人数：</label>
+				<div class="col-sm-2">
+					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">经营权证数：</label>
-				<div class="col-sm-8">
-					<input name="numberOfManage" th:field="*{numberOfManage}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">人数司机：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">站点名称：</label>
-				<div class="col-sm-8">
-					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">售票员数：</label>
+				<div class="col-sm-2">
+					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
 				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">高峰系数：</label>
-				<div class="col-sm-8">
-					<input name="fullCustomerPercent" th:field="*{fullCustomerPercent}"
-						class="form-control" type="text">
+				<label class="col-sm-1 control-label">新能源车数：</label>
+				<div class="col-sm-2">
+					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">低谷系数：</label>
-				<div class="col-sm-8">
-					<input name="lowCustomerPercent" id="lowCustomerPercent" th:field="*{lowCustomerPercent}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+				<div class="col-sm-2">
+					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro== null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">间隔等级：</label>
-				<div class="col-sm-8">
-					<input name="divideLevel" th:field="*{divideLevel}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">轨交时间：</label>
+				<div class="col-sm-2">
+					<div class="input-group date">
+						<input name="metroTime" class="form-control" placeholder="HH:mm:ss" th:value="*{metroTime}">
+						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+					</div>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否挂牌：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">是否挂牌：</label>
+				<div class="col-sm-2">
 					<select name="hasTimelists"
-						th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
+							th:with="type=${@dict.getType('trueFalse')}"
+							class="form-control m-b">
 						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists == null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
+								th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
 					</select>
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">是否轨交末班车衔接：</label>
-				<div class="col-sm-8">
-					<select name="isMetro" th:with="type=${@dict.getType('trueFalse')}"
-						class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-							th:value="${dict.dictValue}"
-							th:selected="${#arrays.contains(#strings.toString(bsthTLine.isMetro  == null ? '' : bsthTLine.isMetro),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">轨交时间：</label>
-				<div class="col-sm-8">
-					<div class="input-group date">
-						<input name="metroTime" class="form-control"
-							placeholder="HH:mm:ss" th:value="*{metroTime}"> <span
-							class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
+				<label class="col-sm-1 control-label">经营权证数：</label>
+				<div class="col-sm-2">
+					<input name="numberOfManage" th:field="*{numberOfManage}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">冷僻线路补贴类型：</label>
-				<div class="col-sm-8">
-					<input name="coldBonusType" th:field="*{coldBonusType}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<!--<div class="form-group">
-				<label class="col-sm-3 control-label">月度营收：</label>
-				<div class="col-sm-8">
-					<input name="revenuesMonth" th:field="*{revenuesMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">月度人次：</label>
-				<div class="col-sm-8">
-					<input name="personMonth" th:field="*{personMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">月度里程：</label>
-				<div class="col-sm-8">
-					<input name="mileageMonth" th:field="*{mileageMonth}"
-						class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">百公里人次：</label>
-				<div class="col-sm-8">
-					<input name="personMonthAvg" th:field="*{personMonthAvg}"
-						class="form-control" type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营运状态：</label>
+				<div class="col-sm-2">
+					<select name="serviceState" th:with="type=${@dict.getType('serviceState')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceState== null ? '' : bsthTLine.serviceState),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营收：</label>
-				<div class="col-sm-8">
-					<input name="revenues" th:field="*{revenues}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+				<div class="col-sm-2">
+					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">人次：</label>
-				<div class="col-sm-8">
-					<input name="persons" th:field="*{persons}" class="form-control"
-						type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">里程：</label>
-				<div class="col-sm-8">
-					<input name="mileages" th:field="*{mileages}" class="form-control"
-						type="text">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">营收类型：</label>
+				<div class="col-sm-2">
+					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
+						<option value=""></option>
+						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
+					</select>
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">百公里人次：</label>
-				<div class="col-sm-8">
-					<input name="personAvg" th:field="*{personAvg}"
-						class="form-control" type="text">
-				</div>
-			</div>-->
-
-
 			<div class="form-group">
-				<label class="col-sm-3 control-label">性质：</label>
-				<div class="col-sm-8">
+				<label class="col-sm-1 control-label">性质：</label>
+				<div class="col-sm-2">
 					<select name="lineUpdateType"
 							th:with="type=${@dict.getType('lineUpdateType')}"
 							class="form-control m-b">
-						<option value=""></option>
 						<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
 								th:value="${dict.dictValue}"
 								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
 					</select>
 				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">营收类型：</label>
-				<div class="col-sm-8">
-					<select name="revenueType" th:with="type=${@dict.getType('revenueType')}" class="form-control m-b">
-						<option value=""></option>
-						<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.revenueType== null ? '' : bsthTLine.revenueType),#strings.toString(dict.dictValue))}"></option>></option>></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label" name="files">附件：</label>
-				<div class="col-sm-8">
-					<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" disabled>
-						<input name="files" type="hidden" th:value="${path}" >
-						<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
-						</a>
-						<button onclick="deleteFile(this);">删除</button>
-					</div>
-					<div class="file-loading" id="uploadDiv">
-						<input id="fileinput" type="file" multiple>
-					</div>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">启用时间：</label>
-				<div class="col-sm-8">
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">启用时间：</label>
+				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="startDate"
-							   th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
+						<input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
 							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
 						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
 					</div>
 				</div>
+				<!---------------------------------->
+				<label class="col-sm-1 control-label">备注：</label>
+				<div class="col-sm-2">
+					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
+				</div>
 			</div>
+
 			<div class="form-group">
-				<label class="col-sm-3 control-label">启用原因：</label>
-				<div class="col-sm-8">
-					<textarea name="startReason" class="form-control">[[*{startReason}]]</textarea>
+				<div class="form-group">
+					<label class="col-sm-1 control-label" name="files">附件：</label>
+					<div class="col-sm-5">
+						<div th:each="path: ${#strings.arraySplit(bsthTLine.files,',')}" >
+							<input name="files" type="hidden" th:value="${path}"  >
+							<a th:href="${#strings.replace(path,#strings.arraySplit(path,':')[0]+':','')}" th:text="${#strings.arraySplit(path,':')[0]}">
+							</a>
+							<button onclick="deleteFile(this);">删除</button>
+						</div>
+						<div class="file-loading" id="uploadDiv">
+							<input id="fileinput" type="file" multiple >
+						</div>
+					</div>
 				</div>
 			</div>
 		</form>
@@ -680,8 +520,12 @@
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: datetimepicker-js" />
 	<th:block th:include="include :: bootstrap-fileinput-js" />
+	<th:block th:include="include :: bootstrap-select-js" />
 	<script th:inline="javascript">
 		var prefix = ctx + "system/lineHistory";
+		function deleteFile(obj){
+			$(obj).parent().remove();
+		}
 		var f=[[${flag}]];
 		$(function() {
 			/* $.get("/system/line/getUserLineInfo",function(data){
@@ -740,9 +584,7 @@
 						});
 			})
-			function deleteFile(obj){
-				$(obj).parent().remove();
-			}
+
 			$.post("/system/line/findByName",
 							{
 								name : $("#lineName").val()
@@ -880,8 +722,16 @@
 			minView : "month",
 			autoclose : true
 		});
-
-
+		$("input[name='isWarrantStartTime']").datetimepicker({
+			format : "yyyy-mm-dd",
+			minView : "month",
+			autoclose : true
+		});
+		$("input[name='isWarrantEndTime']").datetimepicker({
+			format : "yyyy-mm-dd",
+			minView : "month",
+			autoclose : true
+		});
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -482,7 +482,7 @@
 				}
 			}
-			layer.open({
+			var index=layer.open({
 				type: 2,
 				area: [width + 'px', height + 'px'],
 				fix: false,
@@ -508,7 +508,7 @@
 					}
 				},
 			});
-
+			layer.full(index);
 		}
 	</script>