bf

yiming
1 parent df14b31c
Showing 5 changed files with 1452 additions and 940 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLineKFK.java
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
@@ -96,6 +96,8 @@ public class BsthTLineHistoryController extends BaseController
         boolean flag=bsthTLineService.selectHistoryByLineNameAndUpdateStatus(bsthTLine)!=null?true:false;
         mmap.put("flag",flag);
         mmap.put("bsthTLine", bsthTLine);
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mmap.put("companyList",companyList);
         return prefix + "/edit";
     }
+package com.ruoyi.project.system.line.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 【请填写功能名称】对象 bsth_t_line
+ * 
+ * @author ruoyi
+ * @date 2021-08-17
+ */
+public class BsthTLineKFK extends BaseEntity
+{
+    /** 线路名称 */
+    private String lineName;
+
+    /** 公司 */
+    private String company;
+
+    /** 公司编号 */
+    private String companyID;
+
+    /** 分公司 */
+    private String fCompany;
+
+    /** 公司编号 */
+    private String fCompanyID;
+
+    /** 营运方式 全程/区间/大站/定班/跨线/B线 */
+    private String serviceType;
+
+    /** 线路属性 */
+    private String lineLevel;
+
+    /** 线路类型 */
+    private String lineType;
+
+    /** 道路类型 */
+    private String roadType;
+
+    /** 区属 */
+    private String district;
+
+    /** 是否区内 */
+    private String inoutDistrict;
+
+    /** 车辆类型 多选 */
+    private String busType;
+
+    /** 是否空调 */
+    private String airConditionerType;
+
+    /** 售票类型 */
+    private String sellTicketType;
+
+    /** 票价(多级票价用,隔开) */
+    private String ticketPrice;
+
+    /** 运营时间 */
+    private String serviceTime;
+
+    /** 线路长度 */
+    private String lineDistance;
+
+    /** 首站 */
+    private String firstStation;
+
+    /** 末站 */
+    private String lastStation;
+
+    /** 站点名称 */
+    private String halfwayStation;
+
+    /** 线路走向 */
+    private String directions;
+
+    /** 起点站首末班 */
+    private String firstTime;
+
+    /** 终点站首末班 */
+    private String lastTime;
+
+    /** 授权年限 */
+    private Long warrantYear;
+
+    /** 授权起始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date warrantStartTime;
+
+    /** 授权结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date warrantEndTime;
+
+    /** 是否权证 0-否 1-是*/
+    private String isWarrant;
+
+    /** 线路暂停日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planCancelTime;
+
+    /** 实际撤销日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date cancelTime;
+
+    /** 实施时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date timeSchedule;
+
+    /** 经营权证（大巴） */
+    private Long warrantVehiclesLarge;
+
+    /** 经营权证（中巴） */
+    private Long warrantVehiclesMiddle;
+
+    /** 实际配车数 */
+    private Long vehiclesNumber;
+
+    /** 实际车辆数（大） */
+    private Long numberVehiclesLarge;
+
+    /** 实际车辆数（中） */
+    private Long numberVehiclesMiddle;
+
+    /** 上行里程数 */
+    private String mileageUp;
+
+    /** 下行里程数 */
+    private String mileageDown;
+
+    /** 站级数(上行) */
+    private String stationUp;
+
+    /** 站级数(下行) */
+    private String stationDown;
+
+    /** 行驶时间(上行) */
+    private String travelTimeUp;
+
+    /** 行驶时间(下行) */
+    private String travelTimeDown;
+
+    /** 行驶间隔(高峰) */
+    private String travelIntervalUp;
+
+    /** 行驶间隔(低谷) */
+    private String travelIntervalDown;
+
+    /** 间隔等级 */
+    private String divideLevel;
+
+    /** 车辆自编号（无） */
+    private String carPlate;
+
+    /** 线路配档数 */
+    private Long numberPerson;
+
+    /** 司机数 */
+    private Long numberPersonDriver;
+
+    /** 售票员数 */
+    private Long numberPersonSales;
+
+    /** 新能源车数 */
+    private Long busEvNumber;
+
+    /** 是否挂牌 */
+    private String hasTimelists;
+
+    /** 是否轨交末班车衔接 */
+    private String isMetro;
+
+    /** 轨交时间 */
+    private String metroTime;
+
+    /** 冷僻线路补贴类型 */
+    private String coldBonusType;
+
+    /** 营收类型 */
+    private String revenueType;
+
+    /** 类型 */
+    private String operationType;
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getCompanyID() {
+        return companyID;
+    }
+
+    public void setCompanyID(String companyID) {
+        this.companyID = companyID;
+    }
+
+    public String getfCompany() {
+        return fCompany;
+    }
+
+    public void setfCompany(String fCompany) {
+        this.fCompany = fCompany;
+    }
+
+    public String getfCompanyID() {
+        return fCompanyID;
+    }
+
+    public void setfCompanyID(String fCompanyID) {
+        this.fCompanyID = fCompanyID;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getLineLevel() {
+        return lineLevel;
+    }
+
+    public void setLineLevel(String lineLevel) {
+        this.lineLevel = lineLevel;
+    }
+
+    public String getLineType() {
+        return lineType;
+    }
+
+    public void setLineType(String lineType) {
+        this.lineType = lineType;
+    }
+
+    public String getRoadType() {
+        return roadType;
+    }
+
+    public void setRoadType(String roadType) {
+        this.roadType = roadType;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getInoutDistrict() {
+        return inoutDistrict;
+    }
+
+    public void setInoutDistrict(String inoutDistrict) {
+        this.inoutDistrict = inoutDistrict;
+    }
+
+    public String getBusType() {
+        return busType;
+    }
+
+    public void setBusType(String busType) {
+        this.busType = busType;
+    }
+
+    public String getAirConditionerType() {
+        return airConditionerType;
+    }
+
+    public void setAirConditionerType(String airConditionerType) {
+        this.airConditionerType = airConditionerType;
+    }
+
+    public String getSellTicketType() {
+        return sellTicketType;
+    }
+
+    public void setSellTicketType(String sellTicketType) {
+        this.sellTicketType = sellTicketType;
+    }
+
+    public String getTicketPrice() {
+        return ticketPrice;
+    }
+
+    public void setTicketPrice(String ticketPrice) {
+        this.ticketPrice = ticketPrice;
+    }
+
+    public String getServiceTime() {
+        return serviceTime;
+    }
+
+    public void setServiceTime(String serviceTime) {
+        this.serviceTime = serviceTime;
+    }
+
+    public String getLineDistance() {
+        return lineDistance;
+    }
+
+    public void setLineDistance(String lineDistance) {
+        this.lineDistance = lineDistance;
+    }
+
+    public String getFirstStation() {
+        return firstStation;
+    }
+
+    public void setFirstStation(String firstStation) {
+        this.firstStation = firstStation;
+    }
+
+    public String getLastStation() {
+        return lastStation;
+    }
+
+    public void setLastStation(String lastStation) {
+        this.lastStation = lastStation;
+    }
+
+    public String getHalfwayStation() {
+        return halfwayStation;
+    }
+
+    public void setHalfwayStation(String halfwayStation) {
+        this.halfwayStation = halfwayStation;
+    }
+
+    public String getDirections() {
+        return directions;
+    }
+
+    public void setDirections(String directions) {
+        this.directions = directions;
+    }
+
+    public String getFirstTime() {
+        return firstTime;
+    }
+
+    public void setFirstTime(String firstTime) {
+        this.firstTime = firstTime;
+    }
+
+    public String getLastTime() {
+        return lastTime;
+    }
+
+    public void setLastTime(String lastTime) {
+        this.lastTime = lastTime;
+    }
+
+    public Long getWarrantYear() {
+        return warrantYear;
+    }
+
+    public void setWarrantYear(Long warrantYear) {
+        this.warrantYear = warrantYear;
+    }
+
+    public Date getWarrantStartTime() {
+        return warrantStartTime;
+    }
+
+    public void setWarrantStartTime(Date warrantStartTime) {
+        this.warrantStartTime = warrantStartTime;
+    }
+
+    public Date getWarrantEndTime() {
+        return warrantEndTime;
+    }
+
+    public void setWarrantEndTime(Date warrantEndTime) {
+        this.warrantEndTime = warrantEndTime;
+    }
+
+    public String getIsWarrant() {
+        return isWarrant;
+    }
+
+    public void setIsWarrant(String isWarrant) {
+        this.isWarrant = isWarrant;
+    }
+
+    public Date getPlanCancelTime() {
+        return planCancelTime;
+    }
+
+    public void setPlanCancelTime(Date planCancelTime) {
+        this.planCancelTime = planCancelTime;
+    }
+
+    public Date getCancelTime() {
+        return cancelTime;
+    }
+
+    public void setCancelTime(Date cancelTime) {
+        this.cancelTime = cancelTime;
+    }
+
+    public Date getTimeSchedule() {
+        return timeSchedule;
+    }
+
+    public void setTimeSchedule(Date timeSchedule) {
+        this.timeSchedule = timeSchedule;
+    }
+
+    public Long getWarrantVehiclesLarge() {
+        return warrantVehiclesLarge;
+    }
+
+    public void setWarrantVehiclesLarge(Long warrantVehiclesLarge) {
+        this.warrantVehiclesLarge = warrantVehiclesLarge;
+    }
+
+    public Long getWarrantVehiclesMiddle() {
+        return warrantVehiclesMiddle;
+    }
+
+    public void setWarrantVehiclesMiddle(Long warrantVehiclesMiddle) {
+        this.warrantVehiclesMiddle = warrantVehiclesMiddle;
+    }
+
+    public Long getVehiclesNumber() {
+        return vehiclesNumber;
+    }
+
+    public void setVehiclesNumber(Long vehiclesNumber) {
+        this.vehiclesNumber = vehiclesNumber;
+    }
+
+    public Long getNumberVehiclesLarge() {
+        return numberVehiclesLarge;
+    }
+
+    public void setNumberVehiclesLarge(Long numberVehiclesLarge) {
+        this.numberVehiclesLarge = numberVehiclesLarge;
+    }
+
+    public Long getNumberVehiclesMiddle() {
+        return numberVehiclesMiddle;
+    }
+
+    public void setNumberVehiclesMiddle(Long numberVehiclesMiddle) {
+        this.numberVehiclesMiddle = numberVehiclesMiddle;
+    }
+
+    public String getMileageUp() {
+        return mileageUp;
+    }
+
+    public void setMileageUp(String mileageUp) {
+        this.mileageUp = mileageUp;
+    }
+
+    public String getMileageDown() {
+        return mileageDown;
+    }
+
+    public void setMileageDown(String mileageDown) {
+        this.mileageDown = mileageDown;
+    }
+
+    public String getStationUp() {
+        return stationUp;
+    }
+
+    public void setStationUp(String stationUp) {
+        this.stationUp = stationUp;
+    }
+
+    public String getStationDown() {
+        return stationDown;
+    }
+
+    public void setStationDown(String stationDown) {
+        this.stationDown = stationDown;
+    }
+
+    public String getTravelTimeUp() {
+        return travelTimeUp;
+    }
+
+    public void setTravelTimeUp(String travelTimeUp) {
+        this.travelTimeUp = travelTimeUp;
+    }
+
+    public String getTravelTimeDown() {
+        return travelTimeDown;
+    }
+
+    public void setTravelTimeDown(String travelTimeDown) {
+        this.travelTimeDown = travelTimeDown;
+    }
+
+    public String getTravelIntervalUp() {
+        return travelIntervalUp;
+    }
+
+    public void setTravelIntervalUp(String travelIntervalUp) {
+        this.travelIntervalUp = travelIntervalUp;
+    }
+
+    public String getTravelIntervalDown() {
+        return travelIntervalDown;
+    }
+
+    public void setTravelIntervalDown(String travelIntervalDown) {
+        this.travelIntervalDown = travelIntervalDown;
+    }
+
+    public String getDivideLevel() {
+        return divideLevel;
+    }
+
+    public void setDivideLevel(String divideLevel) {
+        this.divideLevel = divideLevel;
+    }
+
+    public String getCarPlate() {
+        return carPlate;
+    }
+
+    public void setCarPlate(String carPlate) {
+        this.carPlate = carPlate;
+    }
+
+    public Long getNumberPerson() {
+        return numberPerson;
+    }
+
+    public void setNumberPerson(Long numberPerson) {
+        this.numberPerson = numberPerson;
+    }
+
+    public Long getNumberPersonDriver() {
+        return numberPersonDriver;
+    }
+
+    public void setNumberPersonDriver(Long numberPersonDriver) {
+        this.numberPersonDriver = numberPersonDriver;
+    }
+
+    public Long getNumberPersonSales() {
+        return numberPersonSales;
+    }
+
+    public void setNumberPersonSales(Long numberPersonSales) {
+        this.numberPersonSales = numberPersonSales;
+    }
+
+    public Long getBusEvNumber() {
+        return busEvNumber;
+    }
+
+    public void setBusEvNumber(Long busEvNumber) {
+        this.busEvNumber = busEvNumber;
+    }
+
+    public String getHasTimelists() {
+        return hasTimelists;
+    }
+
+    public void setHasTimelists(String hasTimelists) {
+        this.hasTimelists = hasTimelists;
+    }
+
+    public String getIsMetro() {
+        return isMetro;
+    }
+
+    public void setIsMetro(String isMetro) {
+        this.isMetro = isMetro;
+    }
+
+    public String getMetroTime() {
+        return metroTime;
+    }
+
+    public void setMetroTime(String metroTime) {
+        this.metroTime = metroTime;
+    }
+
+    public String getColdBonusType() {
+        return coldBonusType;
+    }
+
+    public void setColdBonusType(String coldBonusType) {
+        this.coldBonusType = coldBonusType;
+    }
+
+    public String getRevenueType() {
+        return revenueType;
+    }
+
+    public void setRevenueType(String revenueType) {
+        this.revenueType = revenueType;
+    }
+
+    public String getOperationType() {
+        return operationType;
+    }
+
+    public void setOperationType(String operationType) {
+        this.operationType = operationType;
+    }
+}
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-<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" />
+    <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>
+<style>
+    .select-list li {
+        color: #333;
+        margin: 5px 15px 5px 0px;
+        height: 40px;
+    }
+</style>
 <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}">
-			<input name="id" th:field="*{id}" type="hidden">
-
-			<div class="form-group">
-				<span id="lineName" display="none">
-					<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>
-				</span>
-				<!---------------------------------->
-				<span id="pLineId">
-					<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>
-				</span>
-				<!---------------------------------->
-				<span id="company">
-					<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>
-				</span>
-				<!---------------------------------->
-				<span id="fCompany">
-				<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>
-				</span>
-			</div>
-
-			<div class="form-group">
-				<span id="serviceType">
-				<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>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<span id="lineLevel">
-				<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>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<span id="lineType">
-				<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>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<span id="roadType">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="district">
-				<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.district== null ? '' : bsthTLine.district),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<span id="inoutDistrict">
-				<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.inoutDistrict== null ? '' : bsthTLine.inoutDistrict),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div></span>
-				<!---------------------------------->
-				<span id="busType">
-				<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>
-				</span>
-				<!---------------------------------->
-				<span id="airConditionerType">
-				<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>
-					</select>
-				</div>
-				</span>
-			</div>
-
-			<div class="form-group">
-				<span id="sellTicketType">
-				<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>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<span id="ticketPrice">
-				<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>
-				</span>
-				<!---------------------------------->
-				<span id="serviceTime">
-				<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>
-					</select>
-				</div>
-				</span>
-				<!---------------------------------->
-				<!--<span id="lineCode">
-				<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></span>-->
-			</div>
-
-			<div class="form-group">
-				<span id="lineDistance">
-				<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>
-				</span>
-				<!---------------------------------->
-				<span id="firstStation">
-				<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>
-				</span>
-				<!---------------------------------->
-				<span id="lastStation">
-				<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>
-				</span>
-				</span>
-			</div>
-
-			<div class="form-group">
-				<span id="halfwayStation">
-				<label class="col-sm-1 control-label">站点名称：</label>
-				<div class="col-sm-2">
-					<textarea name="halfwayStation" class="form-control" disabled>[[*{halfwayStation}]]</textarea>
-				</div></span>
-				<!---------------------------------->
-				<span id="directions">
-				<label class="col-sm-1 control-label">线路走向：</label>
-				<div class="col-sm-2">
-					<textarea name="directions" class="form-control" disabled>[[*{directions}]]</textarea>
-				</div></span>
-				<!---------------------------------->
-				<span id="firstTime">
-				<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></span>
-				<!---------------------------------->
-				<span id="lastTime">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<!--<span id="park">
-				<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></span>-->
-				<!---------------------------------->
-				<span id="warrantYear">
-				<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></span>
-				<!---------------------------------->
-				<span id="warrantStartTime">
-				<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" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div></span>
-				<!---------------------------------->
-				<span id="warrantEndTime">
-				<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" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div>
-			</span>
-			</div>
-
-			<div class="form-group">
-				<span id="planCancelTime">
-				<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" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div></span>
-				<!---------------------------------->
-				<span id="cancelTime">
-				<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" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div></span>
-				<!---------------------------------->
-				<span id="timeSchedule">
-				<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" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div></span>
-			</div>
-
-			<div class="form-group">
-				<span id="isWarrant">
-				<label class="col-sm-1 control-label">是否权证：</label>
-				<div class="col-sm-2">
-					<select name="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></span>
-				<!---------------------------------->
-				<span id="warrantVehiclesLarge">
-				<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>
-				</span>
-			</div>
-
-			<div class="form-group">
-				<span id="warrantVehiclesMiddle">
-				<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></span>
-				<!---------------------------------->
-				<span id="vehiclesNumber">
-				<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></span>
-				<!---------------------------------->
-				<span id="numberVehiclesLarge">
-				<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></span>
-				<!---------------------------------->
-				<span id="numberVehiclesMiddle">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="mileageUp">
-				<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></span>
-				<!---------------------------------->
-				<span id="mileageDown">
-				<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></span>
-				<!---------------------------------->
-				<span id="stationUp">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="stationDown">
-				<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></span>
-				<!---------------------------------->
-				<span id="travelTimeUp">
-				<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></span>
-				<!---------------------------------->
-				<span id="travelTimeDown">
-				<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></span>
-				<!---------------------------------->
-				<span id="travelIntervalUp">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="travelIntervalDown">
-				<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></span>
-				<!---------------------------------->
-				<span id="divideLevel">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="carPlate">
-				<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></span>
-				<!---------------------------------->
-				<span id="numberPerson">
-				<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></span>
-				<!---------------------------------->
-				<span id="numberPersonDriver">
-				<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></span>
-				<!---------------------------------->
-				<span id="numberPersonSales">
-				<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></span>
-			</div>
-
-			<div class="form-group">
-				<span id="busEvNumber">
-				<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></span>
-				<!---------------------------------->
-				<span id="isMetro">
-				<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>
-					</select>
-				</div></span>
-				<!---------------------------------->
-				<span id="metroTime">
-				<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}" disabled>
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-					</div>
-				</div></span>
-				<!---------------------------------->
-				<span id="hasTimelists">
-				<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>
-			   </span>
-			</div>
-			<div class="form-group">
-				<!---------------------------------->
-				<span id="serviceState">
-				<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></span>
-				<!---------------------------------->
-				<span id="coldBonusType">
-				<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></span>
-				<!---------------------------------->
-				<span id="revenueType">
-				<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>
-				</span>
-			</div>
-
-			<div class="form-group">
-				<span id="lineUpdateType">
-				<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></span>
-				<!---------------------------------->
-				<span id="remark">
-				<label class="col-sm-1 control-label">备注：</label>
-				<div class="col-sm-2">
-					<textarea name="remark" class="form-control" disabled>[[*{remark}]]</textarea>
-				</div></span>
-			</div></span>
-
-				<div class="form-group">
-				<span id="files">
-				<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 class="file-loading" id="uploadDiv">
-							<input id="fileinput" type="file" multiple disabled>
-						</div>
-						</div>
-				</div></span>
-				</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/line";
-		function deleteFile(obj){
-			$(obj).parent().remove();
-		}
-		
-		$(function() {
-
-			$("#fileinput").fileinput({
-				'theme' : 'explorer-fas',
-				'uploadUrl' : '/common/upload',
-				overwriteInitial : false,
-				initialPreviewAsData : false
-			});
-
-			$("#fileinput").on("fileuploaded",
-					function(event, data, proviewId, index) {
-						
-				
-						var obj = '<div><input name="files" type="hidden" value='+data.files[index].name + ':' + data.response.url + '>'+
-						'<a href='+data.response.url+'>'+ data.files[index].name + 
-						'</a><button onclick="deleteFile(this);">删除</button></div></span>';
-				
-							
-						$(".file-input").before(obj);
-						
-					});
-
-			$.get("/system/line/getUserLineInfo",
-					function(data) {
-						if (data.msg != null) {
-							var objs = JSON.parse(data.msg);
-
-							for (var i = 0; i < objs.length; i++) {
-								var o=objs[i];
-								if(o.checked==false){
-									console.log(o.name)
-									$('#'+o.name).attr("style","display:none;");
-								}else {
-									$('#'+o.name).attr("style","display:show;");
-								}
-
-
-							}
-						}
-					});
-			/*$.get("/system/line/getUserLineInfo",
-							function(data) {
-								if (data.msg != null) {
-									var objs = JSON.parse(data.msg);
-
-									for (var i = 0; i < objs.length; i++) {
-
-										if ($($("input[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("input[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("input[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-										if ($($("select[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("select[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("select[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-										if ($($("textarea[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("textarea[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("textarea[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-									}
-								}
-							});*/
-		})
-
-		function getParent(obj, className) {
-			var parent = obj;
-
-			while (parent[0] && parent[0].className != className) {
-				parent = parent.parent();
-			}
-
-			return parent;
-		}
-
-		$("#form-line-edit").validate({
-			focusCleanup : true
-		});
-
-		function submitHandler() {
-			console.log($("select[name='lineUpdateType']").val());
-
-			if ($("select[name='lineUpdateType']").val() == "") {
-				$.modal.msg("未选择线路性质");
-				return;
-			}
-
-			if ($.validate.form()) {
-				$.operate.save(prefix + "/edit", $('#form-line-edit')
-						.serialize());
-			}
-		}
-
-		$("input[name='warrantStartTime']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-		$("input[name='warrantEndTime']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-		$("input[name='planCancelTime']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-		$("input[name='cancelTime']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-		$("input[name='updateTime']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-		$("input[name='timeSchedule']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
-		});
-
-
-
-	</script>
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-line-edit" th:object="${bsthTLine}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <div class="select-list">
+            <ul>
+                <li id="lineName" display="none">
+                    <label>线路名称：</label><input name="lineName" th:field="*{lineName}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="company">
+                    <label>公司：</label><input name="company" th:field="*{company}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="fCompany">
+                    <label>分公司：</label><input name="fCompany" th:field="*{fCompany}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="serviceType">
+                    <label>营运方式：</label>
+                    <select name="serviceType" th:with="type=${@dict.getType('serviceType')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="lineLevel">
+                    <label>线路属性：</label>
+                    <select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="lineType">
+                    <label>线路类型：</label>
+                    <select name="lineType" th:with="type=${@dict.getType('lineType')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="roadType">
+                    <label>道路类型：</label>
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="roadType" th:with="type=${@dict.getType('roadType')}" class="selectpicker" 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>
+                </li>
+                <!---------------------------------->
+                <li id="district">
+                    <label>区属：</label>
+                    <select name="district" th:with="type=${@dict.getType('district')}" disabled>
+                        <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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="inoutDistrict">
+                    <label>是否区内：</label>
+                    <select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="busType">
+                    <label>车辆类型：</label>
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker" 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>
+                </li>
+                <!---------------------------------->
+                <li id="airConditionerType">
+                    <label>是否空调：</label>
+                    <select name="airConditionerType" th:with="type=${@dict.getType('airConditionerType')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="sellTicketType">
+                    <label>售票类型：</label>
+                    <select name="sellTicketType" th:with="type=${@dict.getType('sellTicketType')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="ticketPrice">
+                    <label>票价：</label>
+                    <!--data-max-options="2" 限制多选数量-->
+                    <select name="ticketPrice" th:with="type=${@dict.getType('ticketPrice')}" class="selectpicker"
+                            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>
+                </li>
+                <!---------------------------------->
+                <li id="serviceTime">
+                    <label>运营时间：</label>
+                    <select name="serviceTime" th:with="type=${@dict.getType('serviceTime')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="lineDistance">
+                    <label>线路长度：</label><input name="lineDistance" th:field="*{lineDistance}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="firstStation">
+                    <label>首站：</label><input name="firstStation" th:field="*{firstStation}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="lastStation">
+                    <label>末站：</label><input name="lastStation" th:field="*{lastStation}" type="text" disabled>
+                </li>
+                <li id="halfwayStation">
+                    <label>站点名称：</label><textarea name="halfwayStation" cols="27"
+                                                  disabled>[[*{halfwayStation}]]</textarea>
+                </li>
+                <!---------------------------------->
+                <li id="directions">
+                    <label>线路走向：</label><textarea name="directions" cols="27" disabled>[[*{directions}]]</textarea>
+                </li>
+                <!---------------------------------->
+                <li id="firstTime">
+                    <label>起点站首末班：</label>
+                    <input name="firstTime" th:field="*{firstTime}" type="text" disabled></li>
+                <!---------------------------------->
+                <li id="lastTime">
+                    <label>终点站首末班：</label>
+                    <input name="lastTime" th:field="*{lastTime}" type="text" disabled></li>
+                <li id="warrantYear">
+                    <label>授权年限：</label><input name="warrantYear" th:field="*{warrantYear}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="warrantStartTime">
+                    <label>授权起始日期：</label>
+                    <input name="warrantStartTime" th:value="${#dates.format(bsthTLine.warrantStartTime, 'yyyy-MM-dd')}"
+                           placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="warrantEndTime">
+                    <label>授权结束日期：</label>
+                    <input name="warrantEndTime" th:value="${#dates.format(bsthTLine.warrantEndTime, 'yyyy-MM-dd')}"
+                           placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="planCancelTime">
+                    <label>线路暂停日期：</label>
+                    <input name="planCancelTime" th:value="${#dates.format(bsthTLine.planCancelTime, 'yyyy-MM-dd')}"
+                           placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="cancelTime">
+                    <label>实际撤销日期：</label>
+                    <input name="cancelTime" th:value="${#dates.format(bsthTLine.cancelTime, 'yyyy-MM-dd')}"
+                           placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="timeSchedule">
+                    <label>实施时间：</label>
+                    <input name="timeSchedule" th:value="${#dates.format(bsthTLine.timeSchedule, 'yyyy-MM-dd')}"
+                           placeholder="yyyy-MM-dd" type="text" autocomplete="off" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="isWarrant">
+                    <label>是否权证：</label>
+                    <select name="isWarrant" th:with="type=${@dict.getType('trueFalse')}" 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>
+                </li>
+                <!---------------------------------->
+                <li id="warrantVehiclesLarge">
+                    <label>经营权证（大巴）：</label><input name="warrantVehiclesLarge" th:field="*{warrantVehiclesLarge}"
+                                                   type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="warrantVehiclesMiddle">
+                    <label>经营权证（中巴）：</label><input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}"
+                                                   type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="vehiclesNumber">
+                    <label>实际配车数：</label><input name="vehiclesNumber" th:field="*{vehiclesNumber}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="numberVehiclesLarge">
+                    <label>实际车辆数（大巴）：</label>
+                    <input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="numberVehiclesMiddle">
+                    <label>实际车辆数（中巴）：</label>
+                    <input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="mileageUp">
+                    <label>上行里程数：</label>
+                    <input name="mileageUp" th:field="*{mileageUp}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="mileageDown">
+                    <label>下行里程数：</label>
+                    <input name="mileageDown" th:field="*{mileageDown}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="stationUp">
+                    <label>站级数(上行)：</label>
+                    <input name="stationUp" th:field="*{stationUp}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="stationDown">
+                    <label>站级数(下行)：</label>
+                    <input name="stationDown" th:field="*{stationDown}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="travelTimeUp">
+                    <label>行驶时间(上行)：</label>
+                    <input name="travelTimeUp" th:field="*{travelTimeUp}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="travelTimeDown">
+                    <label>行驶时间(下行)：</label>
+                    <input name="travelTimeDown" th:field="*{travelTimeDown}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="travelIntervalUp">
+                    <label>行驶间隔(高峰)：</label>
+                    <input name="travelIntervalUp" th:field="*{travelIntervalUp}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="travelIntervalDown">
+                    <label>行驶间隔(低谷)：</label>
+                    <input name="travelIntervalDown" th:field="*{travelIntervalDown}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="divideLevel">
+                    <label>间隔等级：</label>
+                    <input name="divideLevel" th:field="*{divideLevel}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="carPlate">
+                    <label>车辆自编号：</label>
+                    <input name="carPlate" th:field="*{carPlate}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="numberPerson">
+                    <label>线路配档数：</label>
+                    <input name="numberPerson" th:field="*{numberPerson}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="numberPersonDriver">
+                    <label>司机人数：</label>
+                    <input name="numberPersonDriver" th:field="*{numberPersonDriver}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="numberPersonSales">
+                    <label>售票员数：</label>
+                    <input name="numberPersonSales" th:field="*{numberPersonSales}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="busEvNumber">
+                    <label>新能源车数：</label>
+                    <input name="busEvNumber" th:field="*{busEvNumber}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="isMetro">
+                    <label>是否轨交末班车衔接：</label>
+                    <select name="isMetro" th:with="type=${@dict.getType('trueFalse')}" 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>
+                    </select>
+                </li>
+                <!---------------------------------->
+                <li id="metroTime">
+                    <label>轨交时间：</label>
+                    <input name="metroTime" placeholder="HH:mm:ss" th:value="*{metroTime}" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="hasTimelists">
+                    <label>是否挂牌：</label>
+                    <select name="hasTimelists" th:with="type=${@dict.getType('trueFalse')}" disabled>
+                        <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>
+                </li>
+                <!---------------------------------->
+                <li id="serviceState">
+                    <label>营运状态：</label>
+                    <select name="serviceState" th:with="type=${@dict.getType('serviceState')}" disabled>
+                        <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>
+                </li>
+                <!---------------------------------->
+                <li id="coldBonusType">
+                    <label>冷僻线路补贴类型：</label>
+                    <input name="coldBonusType" th:field="*{coldBonusType}" type="text" disabled>
+                </li>
+                <!---------------------------------->
+                <li id="revenueType">
+                    <label>营收类型：</label>
+                    <select name="revenueType" th:with="type=${@dict.getType('revenueType')}" 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>
+                </li>
+                <!---------------------------------->
+                <li id="lineUpdateType">
+                    <label>性质：</label>
+                    <select name="lineUpdateType" th:with="type=${@dict.getType('lineUpdateType')}" 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>
+                </li>
+                <!---------------------------------->
+                <li id="remark">
+                    <label>备注：</label><textarea name="remark" cols="27" disabled>[[*{remark}]]</textarea>
+                </li>
+                <li id="files">
+                    <div class="form-group">
+                        <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>
+                </li>
+
+            </ul>
+        </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/line";
+
+    function deleteFile(obj) {
+        $(obj).parent().remove();
+    }
+
+    $(function () {
+
+        $("#fileinput").fileinput({
+            'theme': 'explorer-fas',
+            'uploadUrl': '/common/upload',
+            overwriteInitial: false,
+            initialPreviewAsData: false
+        });
+
+        $("#fileinput").on("fileuploaded",
+            function (event, data, proviewId, index) {
+
+
+                var obj = '<div><input name="files" type="hidden" value=' + data.files[index].name + ':' + data.response.url + '>' +
+                    '<a href=' + data.response.url + '>' + data.files[index].name +
+                    '</a><button onclick="deleteFile(this);">删除</button></div></li>';
+
+
+                $(".file-input").before(obj);
+
+            });
+
+        $.get("/system/line/getUserLineInfo",
+            function (data) {
+                if (data.msg != null) {
+                    var objs = JSON.parse(data.msg);
+
+                    for (var i = 0; i < objs.length; i++) {
+                        var o = objs[i];
+                        if (o.checked == false) {
+                            console.log(o.name)
+                            $('#' + o.name).attr("style", "display:none;");
+                        } else {
+                            $('#' + o.name).attr("style", "display:show;");
+                        }
+
+
+                    }
+                }
+            });
+        /*$.get("/system/line/getUserLineInfo",
+                        function(data) {
+                            if (data.msg != null) {
+                                var objs = JSON.parse(data.msg);
+
+                                for (var i = 0; i < objs.length; i++) {
+
+                                    if ($($("input[name=" + objs[i].name
+                                            + "]"))) {
+                                        if (objs[i].checked) {
+                                            getParent(
+                                                    $($("input[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").show();
+                                        } else {
+                                            getParent(
+                                                    $($("input[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").hide();
+                                        }
+                                    }
+
+                                    if ($($("select[name=" + objs[i].name
+                                            + "]"))) {
+                                        if (objs[i].checked) {
+                                            getParent(
+                                                    $($("select[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").show();
+                                        } else {
+                                            getParent(
+                                                    $($("select[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").hide();
+                                        }
+                                    }
+
+                                    if ($($("textarea[name=" + objs[i].name
+                                            + "]"))) {
+                                        if (objs[i].checked) {
+                                            getParent(
+                                                    $($("textarea[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").show();
+                                        } else {
+                                            getParent(
+                                                    $($("textarea[name="
+                                                            + objs[i].name
+                                                            + "]")),
+                                                    "form-group").hide();
+                                        }
+                                    }
+
+                                }
+                            }
+                        });*/
+    })
+
+    function getParent(obj, className) {
+        var parent = obj;
+
+        while (parent[0] && parent[0].className != className) {
+            parent = parent.parent();
+        }
+
+        return parent;
+    }
+
+    $("#form-line-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        console.log($("select[name='lineUpdateType']").val());
+
+        if ($("select[name='lineUpdateType']").val() == "") {
+            $.modal.msg("未选择线路性质");
+            return;
+        }
+
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-line-edit')
+                .serialize());
+        }
+    }
+
+    $("input[name='warrantStartTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='warrantEndTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='planCancelTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='cancelTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='updateTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='timeSchedule']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+</script>
 </body>
 </html>
 \ No newline at end of file
@@ -445,7 +445,6 @@
             fCompanySelect()
         });
-        console.log([[${user}]]);
         // 获取 div 标签下的所有子节点
       /*  var pObjs = document.getElementById('lw').getElementsByTagName("*")
@@ -5,44 +5,41 @@
 <th:block th:include="include :: datetimepicker-css" />
 <th:block th:include="include :: bootstrap-fileinput-css" />
 <th:block th:include="include :: bootstrap-select-css" />
+<th:block th:include="include :: select2-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}">
 			<input name="id" th:field="*{id}" type="hidden">
+			<h3>路务</h3>
 			<div class="form-group">
 				<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>
 				<!---------------------------------->
-				<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>
-				<!---------------------------------->
 				<label class="col-sm-1 control-label">公司：</label>
 				<div class="col-sm-2">
-					<input name="company" th:field="*{company}" class="form-control" type="text">
+					<select id='company' name="company" th:field="*{company}"></select>
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">分公司：</label>
 				<div class="col-sm-2">
-					<input name="fCompany" th:field="*{fCompany}" class="form-control" type="text">
+					<select id='fCompany' name="fCompany" th:field="*{fCompany}"></select>
 				</div>
-			</div>
-
-			<div class="form-group">
-				<label class="col-sm-1 control-label">营运方式：</label>
+				<!---------------------------------->
+				<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">
+					<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.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(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-1 control-label">线路属性：</label>
 				<div class="col-sm-2">
 					<select name="lineLevel" th:with="type=${@dict.getType('lineLevel')}" class="form-control m-b">
@@ -53,28 +50,25 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路类型：</label>
+				<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">
+					<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.lineType== null ? '' : bsthTLine.lineType),#strings.toString(dict.dictValue))}">
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.serviceType== null ? '' : bsthTLine.serviceType),#strings.toString(dict.dictValue))}">
 						</option>
 					</select>
 				</div>
 				<!---------------------------------->
-				<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>
+				<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-1 control-label">区属：</label>
 				<div class="col-sm-2">
 					<select name="district" th:with="type=${@dict.getType('district')}"class="selectpicker form-control"  multiple title="">
@@ -82,7 +76,9 @@
 								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-1 control-label">是否区内：</label>
 				<div class="col-sm-2">
 					<select name="inoutDistrict" th:with="type=${@dict.getType('trueFalse')}" class="form-control m-b">
@@ -92,16 +88,25 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">车辆类型：</label>
-				<div class="col-sm-2" name="busType">
+				<label class="col-sm-1 control-label">道路类型：</label>
+				<div class="col-sm-2" name="roadType">
 					<!--data-max-options="2" 限制多选数量-->
-					<select name="busType" th:with="type=${@dict.getType('busType')}" class="selectpicker form-control"  multiple title=""  >
+					<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.busType== null ? '' : bsthTLine.busType),#strings.toString(dict.dictValue))}">
+								th:selected="${#arrays.contains(#strings.toString(bsthTLine.roadType== null ? '' : bsthTLine.roadType),#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>
+					</select>
+				</div>
+				<!---------------------------------->
 				<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">
@@ -111,7 +116,7 @@
 					</select>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
 				<label class="col-sm-1 control-label">售票类型：</label>
 				<div class="col-sm-2" >
@@ -132,25 +137,26 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">运营时间：</label>
+				<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>
-					</select>
+					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
 				</div>
 				<!---------------------------------->
-			<!--	<label class="col-sm-1 control-label">线路编码：</label>
+				<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>-->
+					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">线路长度：</label>
+				<label class="col-sm-1 control-label">站级数(上行)：</label>
 				<div class="col-sm-2">
-					<input name="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
+				</div>
+				<!---------------------------------->
+				<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>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">首站：</label>
@@ -162,40 +168,42 @@
 				<div class="col-sm-2">
 					<input name="lastStation" th:field="*{lastStation}" class="form-control" type="text">
 				</div>
-				<!---------------------------------->
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">站点名称：</label>
+				<label class="col-sm-1 control-label">起点站首末班：</label>
 				<div class="col-sm-2">
-					<textarea name="halfwayStation" class="form-control">[[*{halfwayStation}]]</textarea>
+					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路走向：</label>
+				<label class="col-sm-1 control-label">终点站首末班：</label>
 				<div class="col-sm-2">
-					<textarea name="directions" class="form-control">[[*{directions}]]</textarea>
+					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">起点站首末班：</label>
+				<label class="col-sm-1 control-label">上行里程数：</label>
 				<div class="col-sm-2">
-					<input name="firstTime" th:field="*{firstTime}" class="form-control" type="text">
+					<input name="mileageUp" th:field="*{mileageUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">终点站首末班：</label>
+				<label class="col-sm-1 control-label">下行里程数：</label>
 				<div class="col-sm-2">
-					<input name="lastTime" th:field="*{lastTime}" class="form-control" type="text">
+					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-<!--				<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="lineDistance" th:field="*{lineDistance}" class="form-control" type="text">
+				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">授权年限：</label>
+				<label class="col-sm-1 control-label">是否权证：</label>
 				<div class="col-sm-2">
-					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
+					<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>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">授权起始日期：</label>
@@ -216,24 +224,11 @@
 					</div>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<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" 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>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际撤销日期：</label>
+				<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>
-					</div>
+					<input name="warrantYear" th:field="*{warrantYear}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">实施时间：</label>
@@ -246,212 +241,190 @@
 							class="fa fa-calendar"></i></span>
 					</div>
 				</div>
-			</div>
-
-			<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="${#arrays.contains(#strings.toString(bsthTLine.isWarrant== null ? '' : bsthTLine.isWarrant),#strings.toString(dict.dictValue))}"></option>
-					</select>
-				</div>
 				<!---------------------------------->
 				<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-1 control-label">经营权证（中巴）：</label>
 				<div class="col-sm-2">
 					<input name="warrantVehiclesMiddle" th:field="*{warrantVehiclesMiddle}" class="form-control" type="text">
 				</div>
-				<!---------------------------------->
-				<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>
-				<!---------------------------------->
-				<label class="col-sm-1 control-label">实际车辆数（大巴）：</label>
+
+			</div>
+			<!---------------------------------->
+			<div class="form-group">
+				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
 				<div class="col-sm-2">
-					<input name="numberVehiclesLarge" th:field="*{numberVehiclesLarge}" class="form-control" type="text">
+					<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>
 				<!---------------------------------->
-				<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-1 control-label">上行里程数：</label>
+				<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 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>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">下行里程数：</label>
+				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
 				<div class="col-sm-2">
-					<input name="mileageDown" th:field="*{mileageDown}" class="form-control" type="text">
+					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">站级数(上行)：</label>
+				<label class="col-sm-1 control-label">营运状态：</label>
 				<div class="col-sm-2">
-					<input name="stationUp" th:field="*{stationUp}" class="form-control" type="text">
+					<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-1 control-label">站级数(下行)：</label>
+				<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 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>
+					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
+				<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 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>
+					</div>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
+				<label class="col-sm-1 control-label">性质：</label>
 				<div class="col-sm-2">
-					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
+					<select name="lineUpdateType"
+							th:with="type=${@dict.getType('lineUpdateType')}"
+							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=='3' ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
+				<label class="col-sm-1 control-label">备注：</label>
 				<div class="col-sm-2">
-					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
+					<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<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>
-				<!---------------------------------->
-				<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 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>
-
+			<!---------------------------------->
+			<div class="hr-line-dashed"></div>
+			<h3>调度</h3>
+			<!---------------------------------->
 			<div class="form-group">
 				<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>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">线路配档数：</label>
+				<label class="col-sm-1 control-label">是否挂牌：</label>
 				<div class="col-sm-2">
-					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
+					<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.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
+					</select>
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">司机人数：</label>
+				<label class="col-sm-1 control-label">行驶时间(上行)：</label>
 				<div class="col-sm-2">
-					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
+					<input name="travelTimeUp" th:field="*{travelTimeUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">售票员数：</label>
+				<label class="col-sm-1 control-label">行驶时间(下行)：</label>
 				<div class="col-sm-2">
-					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
+					<input name="travelTimeDown" th:field="*{travelTimeDown}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">新能源车数：</label>
+				<label class="col-sm-1 control-label">行驶间隔(高峰)：</label>
 				<div class="col-sm-2">
-					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
+					<input name="travelIntervalUp" th:field="*{travelIntervalUp}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否轨交末班车衔接：</label>
+				<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>
+					<input name="travelIntervalDown" th:field="*{travelIntervalDown}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">轨交时间：</label>
+				<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>
+					<input name="divideLevel" th:field="*{divideLevel}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">是否挂牌：</label>
+				<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.hasTimelists== null ? '' : bsthTLine.hasTimelists),#strings.toString(dict.dictValue))}"></option>
-					</select>
+					<input name="vehiclesNumber" th:field="*{vehiclesNumber}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
+				<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>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">营运状态：</label>
+				<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>
+					<input name="numberVehiclesMiddle" th:field="*{numberVehiclesMiddle}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">冷僻线路补贴类型：</label>
+				<label class="col-sm-1 control-label">新能源车数：</label>
 				<div class="col-sm-2">
-					<input name="coldBonusType" th:field="*{coldBonusType}" class="form-control" type="text">
+					<input name="busEvNumber" th:field="*{busEvNumber}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">营收类型：</label>
+				<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>
+					<input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
 				</div>
 			</div>
-
+			<!---------------------------------->
 			<div class="form-group">
-				<label class="col-sm-1 control-label">性质：</label>
+				<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 th:each="dict : ${type}" th:text="${dict.dictLabel}"
-								th:value="${dict.dictValue}"
-								th:selected="${#arrays.contains(#strings.toString(bsthTLine.lineUpdateType== null||bsthTLine.lineUpdateType=='3' ? '' : bsthTLine.lineUpdateType),#strings.toString(dict.dictValue))}"></option>></option>
-					</select>
+					<input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
 				</div>
 				<!---------------------------------->
-				<label class="col-sm-1 control-label">备注：</label>
+				<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">
-				<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>
+					<input name="numberPersonSales" th:field="*{numberPersonSales}" class="form-control" type="text">
 				</div>
 			</div>
 		</form>
@@ -460,47 +433,103 @@
 	<th:block th:include="include :: datetimepicker-js" />
 	<th:block th:include="include :: bootstrap-fileinput-js" />
 	<th:block th:include="include :: bootstrap-select-js" />
+	<th:block th:include="include :: select2-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){
-				if(data.msg != null){
-					var objs = JSON.parse(data.msg);
-
-					for(var i = 0;i<objs.length;i++){
-					
-						
-			        	if($($("input[name="+objs[i].name+"]"))){
-			        		if(objs[i].checked){
-			        			getParent($($("input[name="+objs[i].name+"]")),"form-group").show();
-			        		}else{
-			        			getParent($($("input[name="+objs[i].name+"]")),"form-group").hide();
-			        		}
-			        	}
-			        	
-			        	if($($("select[name="+objs[i].name+"]"))){
-			        		if(objs[i].checked){
-			        			getParent($($("select[name="+objs[i].name+"]")),"form-group").show();
-			        		}else{
-			        			getParent($($("select[name="+objs[i].name+"]")),"form-group").hide();
-			        		}
-			        	}
-			        	
-			        	if($($("textarea[name="+objs[i].name+"]"))){
-			        		if(objs[i].checked){
-			        			getParent($($("textarea[name="+objs[i].name+"]")),"form-group").show();
-			        		}else{
-			        			getParent($($("textarea[name="+objs[i].name+"]")),"form-group").hide();
-			        		}
-			        	}
-						
+		//公司分公司联动
+		var companyList = [[${companyList}]];
+		var companies = new Array();
+		var fCompanies = new Array();
+		var bsthTLine = [[${bsthTLine}]];
+		$(function () {
+			for (let i in companyList) {
+				companies[i] = companyList[i].company;
+				fCompanies[i] = companyList[i].fCompany;
+			}
+			companies = Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect();
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect()
+			});
+			//初始选中
+			$("#company").val(bsthTLine.company).trigger("change");
+			$("#fCompany").val(bsthTLine.fCompany).trigger("change");
+			// 获取 div 标签下的所有子节点
+			/*  var pObjs = document.getElementById('lw').getElementsByTagName("*")
+              for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
+                  pObjs[i].setAttribute("disabled",true);
+              }
+              var pObjs = document.getElementById('dd').getElementsByTagName("*")
+              for (var i = 0 ; i <pObjs.length; i++) { // 一定要倒序，正序是删不干净的，可自行尝试
+                  pObjs[i].setAttribute("disabled",true);
+              }*/
+		});
+
+		function companySelect() {
+			var arr = new Array();
+			var company = new Object();
+			company.id = '';
+			company.text = '';
+			company.value = '';
+			arr.push(company)
+			for (var i = 0; i < companies.length; i++) {
+				company = new Object();
+				company.id = companies[i];
+				company.text = companies[i];
+				company.value = companies[i];
+				arr.push(company);
+			}
+			$("#company").select2({
+				data: arr,
+				placeholder: '请选择',
+				allowClear: true
+			})
+		}
+
+		function fCompanySelect() {
+			$('#fCompany').empty();
+			var company = $('#company').select2('val');
+			var arr = new Array();
+			var fCompany = new Object();
+			fCompany.id = '';
+			fCompany.text = '';
+			fCompany.value = '';
+			arr.push(fCompany)
+			if (company == '') {
+				for (let i in companyList) {
+					var companyName = companyList[i].company;
+					var fCompanyName = companyList[i].fCompany;
+					fCompany = new Object();
+					fCompany.id = fCompanyName;
+					fCompany.text = fCompanyName;
+					fCompany.value = fCompanyName;
+					arr.push(fCompany);
+				}
+			} else {
+				for (let i in companyList) {
+					var companyName = companyList[i].company;
+					var fCompanyName = companyList[i].fCompany;
+					if (companyName == company) {
+						fCompany = new Object();
+						fCompany.id = fCompanyName;
+						fCompany.text = fCompanyName;
+						fCompany.value = fCompanyName;
+						arr.push(fCompany);
 					}
 				}
-			}); */
+			}
+			$("#fCompany").select2({
+				data: arr,
+				placeholder: '请选择',
+				allowClear: true
+			});
+		}
+		var f=[[${flag}]];
+		$(function() {
 			$(function() {
 				$("#fileinput").fileinput({