Commit e842efc55520a7a5023307dd81f5124c0709b007
1 parent
8a30b095
Update
Showing
5 changed files
with
269 additions
and
150 deletions
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detail.html
| @@ -81,29 +81,29 @@ | @@ -81,29 +81,29 @@ | ||
| 81 | 81 | ||
| 82 | </div> | 82 | </div> |
| 83 | 83 | ||
| 84 | - <div class="form-group"> | ||
| 85 | - <label class="col-md-2 control-label">路牌数量:</label> | ||
| 86 | - <div class="col-md-4"> | ||
| 87 | - <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.lpCount" | ||
| 88 | - name="lpCount" placeholder="请输入路牌数" min="1" readonly/> | ||
| 89 | - </div> | ||
| 90 | - </div> | 84 | + <!--<div class="form-group">--> |
| 85 | + <!--<label class="col-md-2 control-label">路牌数量:</label>--> | ||
| 86 | + <!--<div class="col-md-4">--> | ||
| 87 | + <!--<input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.lpCount"--> | ||
| 88 | + <!--name="lpCount" placeholder="请输入路牌数" min="1" readonly/>--> | ||
| 89 | + <!--</div>--> | ||
| 90 | + <!--</div>--> | ||
| 91 | 91 | ||
| 92 | - <div class="form-group"> | ||
| 93 | - <label class="col-md-2 control-label">营运圈数:</label> | ||
| 94 | - <div class="col-md-4"> | ||
| 95 | - <input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.loopCount" | ||
| 96 | - name="loopCount" placeholder="请输入圈数" min="1" readonly/> | ||
| 97 | - </div> | ||
| 98 | - </div> | 92 | + <!--<div class="form-group">--> |
| 93 | + <!--<label class="col-md-2 control-label">营运圈数:</label>--> | ||
| 94 | + <!--<div class="col-md-4">--> | ||
| 95 | + <!--<input type="number" class="form-control" ng-value="ctrl.ttInfoManageForDetail.loopCount"--> | ||
| 96 | + <!--name="loopCount" placeholder="请输入圈数" min="1" readonly/>--> | ||
| 97 | + <!--</div>--> | ||
| 98 | + <!--</div>--> | ||
| 99 | 99 | ||
| 100 | - <div class="form-group"> | ||
| 101 | - <label class="col-md-2 control-label">停车场:</label> | ||
| 102 | - <div class="col-md-4"> | ||
| 103 | - <input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.xl.carParkCode | dict:'CarPark':'未知' " | ||
| 104 | - name="carParkCode" readonly/> | ||
| 105 | - </div> | ||
| 106 | - </div> | 100 | + <!--<div class="form-group">--> |
| 101 | + <!--<label class="col-md-2 control-label">停车场:</label>--> | ||
| 102 | + <!--<div class="col-md-4">--> | ||
| 103 | + <!--<input type="text" class="form-control" ng-value="ctrl.ttInfoManageForDetail.xl.carParkCode | dict:'CarPark':'未知' "--> | ||
| 104 | + <!--name="carParkCode" readonly/>--> | ||
| 105 | + <!--</div>--> | ||
| 106 | + <!--</div>--> | ||
| 107 | 107 | ||
| 108 | <div class="form-group"> | 108 | <div class="form-group"> |
| 109 | <label class="col-md-2 control-label">常规有效日:</label> | 109 | <label class="col-md-2 control-label">常规有效日:</label> |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
| @@ -39,8 +39,8 @@ | @@ -39,8 +39,8 @@ | ||
| 39 | <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm"> | 39 | <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm"> |
| 40 | <div class="form-body"> | 40 | <div class="form-body"> |
| 41 | <div class="form-group has-success has-feedback"> | 41 | <div class="form-group has-success has-feedback"> |
| 42 | - <label class="col-md-3 control-label">线路*:</label> | ||
| 43 | - <div class="col-md-7"> | 42 | + <label class="col-md-2 control-label">线路*:</label> |
| 43 | + <div class="col-md-3"> | ||
| 44 | <input type="text" class="form-control" | 44 | <input type="text" class="form-control" |
| 45 | ng-value="ctrl.TimeTableDetailForSave.xl.name" | 45 | ng-value="ctrl.TimeTableDetailForSave.xl.name" |
| 46 | readonly/> | 46 | readonly/> |
| @@ -48,16 +48,16 @@ | @@ -48,16 +48,16 @@ | ||
| 48 | 48 | ||
| 49 | </div> | 49 | </div> |
| 50 | <div class="form-group has-success has-feedback"> | 50 | <div class="form-group has-success has-feedback"> |
| 51 | - <label class="col-md-3 control-label">时刻表名称*:</label> | ||
| 52 | - <div class="col-md-7"> | 51 | + <label class="col-md-2 control-label">时刻表名称*:</label> |
| 52 | + <div class="col-md-3"> | ||
| 53 | <input type="text" class="form-control" | 53 | <input type="text" class="form-control" |
| 54 | ng-value="ctrl.TimeTableDetailForSave.ttinfo.name" | 54 | ng-value="ctrl.TimeTableDetailForSave.ttinfo.name" |
| 55 | readonly/> | 55 | readonly/> |
| 56 | </div> | 56 | </div> |
| 57 | </div> | 57 | </div> |
| 58 | <div class="form-group has-success has-feedback"> | 58 | <div class="form-group has-success has-feedback"> |
| 59 | - <label class="col-md-3 control-label">路牌*:</label> | ||
| 60 | - <div class="col-md-7"> | 59 | + <label class="col-md-2 control-label">路牌*:</label> |
| 60 | + <div class="col-md-3"> | ||
| 61 | <input type="text" class="form-control" | 61 | <input type="text" class="form-control" |
| 62 | ng-value="ctrl.TimeTableDetailForSave.lp.lpName" | 62 | ng-value="ctrl.TimeTableDetailForSave.lp.lpName" |
| 63 | readonly/> | 63 | readonly/> |
| @@ -65,8 +65,8 @@ | @@ -65,8 +65,8 @@ | ||
| 65 | 65 | ||
| 66 | </div> | 66 | </div> |
| 67 | <div class="form-group has-success has-feedback"> | 67 | <div class="form-group has-success has-feedback"> |
| 68 | - <label class="col-md-3 control-label">发车顺序号*:</label> | ||
| 69 | - <div class="col-md-7"> | 68 | + <label class="col-md-2 control-label">发车顺序号*:</label> |
| 69 | + <div class="col-md-3"> | ||
| 70 | <input type="text" class="form-control" | 70 | <input type="text" class="form-control" |
| 71 | ng-value="ctrl.TimeTableDetailForSave.fcno" | 71 | ng-value="ctrl.TimeTableDetailForSave.fcno" |
| 72 | readonly/> | 72 | readonly/> |
| @@ -74,8 +74,8 @@ | @@ -74,8 +74,8 @@ | ||
| 74 | 74 | ||
| 75 | </div> | 75 | </div> |
| 76 | <div class="form-group has-success has-feedback"> | 76 | <div class="form-group has-success has-feedback"> |
| 77 | - <label class="col-md-3 control-label">方向*:</label> | ||
| 78 | - <div class="col-md-7"> | 77 | + <label class="col-md-2 control-label">方向*:</label> |
| 78 | + <div class="col-md-3"> | ||
| 79 | <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir" required></sa-Radiogroup> | 79 | <sa-Radiogroup model="ctrl.TimeTableDetailForSave.xlDir" dicgroup="LineTrend" name="xlDir" required></sa-Radiogroup> |
| 80 | </div> | 80 | </div> |
| 81 | <!-- 隐藏块,显示验证信息 --> | 81 | <!-- 隐藏块,显示验证信息 --> |
| @@ -84,71 +84,162 @@ | @@ -84,71 +84,162 @@ | ||
| 84 | </div> | 84 | </div> |
| 85 | 85 | ||
| 86 | </div> | 86 | </div> |
| 87 | - <div class="form-group"> | ||
| 88 | - <label class="col-md-3 control-label">起点站:</label> | ||
| 89 | - <div class="col-md-7"> | ||
| 90 | - <sa-Select3 model="ctrl.TimeTableDetailForSave" | ||
| 91 | - name="qdz" | ||
| 92 | - placeholder="请输拼音..." | ||
| 93 | - dcvalue="{{ctrl.TimeTableDetailForSave.qdz.id}}" | 87 | + |
| 88 | + <!--- 进场班次判定 --> | ||
| 89 | + <div class="form-group has-success has-feedback" | ||
| 90 | + ng-if="ctrl.TimeTableDetailForSave.bcType == 'in'"> | ||
| 91 | + <label class="col-md-2 control-label">起点站:</label> | ||
| 92 | + <div class="col-md-3"> | ||
| 93 | + <sa-Select5 name="qdz" | ||
| 94 | + model="ctrl.TimeTableDetailForSave" | ||
| 95 | + cmaps="{'qdz.id' : 'stationid'}" | ||
| 94 | dcname="qdz.id" | 96 | dcname="qdz.id" |
| 95 | icname="stationid" | 97 | icname="stationid" |
| 96 | - icnames="stationname" | ||
| 97 | - datatype="zd" | ||
| 98 | - dataassociate="true" | ||
| 99 | - dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}" | ||
| 100 | - mlp="true" | ||
| 101 | - > | ||
| 102 | - </sa-Select3> | 98 | + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}" |
| 99 | + iterobjname="item" | ||
| 100 | + iterobjexp="item.stationname" | ||
| 101 | + searchph="请输拼音..." | ||
| 102 | + searchexp="this.stationname" | ||
| 103 | + required > | ||
| 104 | + </sa-Select5> | ||
| 105 | + </div> | ||
| 106 | + <!-- 隐藏块,显示验证信息 --> | ||
| 107 | + <div class="alert alert-danger well-sm" ng-show="myForm.qdz.$error.required"> | ||
| 108 | + 起点站必须选择 | ||
| 103 | </div> | 109 | </div> |
| 104 | </div> | 110 | </div> |
| 105 | - <div class="form-group"> | ||
| 106 | - <label class="col-md-3 control-label">终点站:</label> | ||
| 107 | - <div class="col-md-7"> | ||
| 108 | - <sa-Select3 model="ctrl.TimeTableDetailForSave" | ||
| 109 | - name="zdz" | ||
| 110 | - placeholder="请输拼音..." | ||
| 111 | - dcvalue="{{ctrl.TimeTableDetailForSave.zdz.id}}" | ||
| 112 | - dcname="zdz.id" | ||
| 113 | - icname="stationid" | ||
| 114 | - icnames="stationname" | ||
| 115 | - datatype="zd" | ||
| 116 | - dataassociate="true" | ||
| 117 | - dataparam="{{ {'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir} | json }}" | ||
| 118 | - mlp="true" | ||
| 119 | - > | ||
| 120 | - </sa-Select3> | 111 | + <div class="form-group has-success has-feedback" |
| 112 | + ng-if="ctrl.TimeTableDetailForSave.bcType == 'in'"> | ||
| 113 | + <label class="col-md-2 control-label">停车场:</label> | ||
| 114 | + <div class="col-md-3"> | ||
| 115 | + <sa-Select5 name="tcc" | ||
| 116 | + model="ctrl.TimeTableDetailForSave" | ||
| 117 | + cmaps="{'tcc.id': 'id'}" | ||
| 118 | + dcname="tcc.id" | ||
| 119 | + icname="id" | ||
| 120 | + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}" | ||
| 121 | + iterobjname="item" | ||
| 122 | + iterobjexp="item.parkName" | ||
| 123 | + searchph="请输拼音..." | ||
| 124 | + searchexp="this.parkName" | ||
| 125 | + required > | ||
| 126 | + </sa-Select5> | ||
| 127 | + </div> | ||
| 128 | + <!-- 隐藏块,显示验证信息 --> | ||
| 129 | + <div class="alert alert-danger well-sm" ng-show="myForm.tcc.$error.required"> | ||
| 130 | + 停车场必须选择 | ||
| 121 | </div> | 131 | </div> |
| 122 | </div> | 132 | </div> |
| 123 | - <div class="form-group"> | ||
| 124 | - <label class="col-md-3 control-label">停车场:</label> | ||
| 125 | - <div class="col-md-7"> | ||
| 126 | - <sa-Select3 model="ctrl.TimeTableDetailForSave" | ||
| 127 | - name="tcc" | ||
| 128 | - placeholder="请输拼音..." | ||
| 129 | - dcvalue="{{ctrl.TimeTableDetailForSave.tcc.id}}" | 133 | + |
| 134 | + <!--- 出场班次判定 --> | ||
| 135 | + <div class="form-group has-success has-feedback" | ||
| 136 | + ng-if="ctrl.TimeTableDetailForSave.bcType == 'out'"> | ||
| 137 | + <label class="col-md-2 control-label">停车场:</label> | ||
| 138 | + <div class="col-md-3"> | ||
| 139 | + <sa-Select5 name="tcc" | ||
| 140 | + model="ctrl.TimeTableDetailForSave" | ||
| 141 | + cmaps="{'tcc.id': 'id'}" | ||
| 130 | dcname="tcc.id" | 142 | dcname="tcc.id" |
| 131 | icname="id" | 143 | icname="id" |
| 132 | - icnames="parkName" | ||
| 133 | - datatype="tcc" | ||
| 134 | - mlp="true" | ||
| 135 | - > | ||
| 136 | - </sa-Select3> | 144 | + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}" |
| 145 | + iterobjname="item" | ||
| 146 | + iterobjexp="item.parkName" | ||
| 147 | + searchph="请输拼音..." | ||
| 148 | + searchexp="this.parkName" | ||
| 149 | + required > | ||
| 150 | + </sa-Select5> | ||
| 151 | + </div> | ||
| 152 | + <!-- 隐藏块,显示验证信息 --> | ||
| 153 | + <div class="alert alert-danger well-sm" ng-show="myForm.tcc.$error.required"> | ||
| 154 | + 停车场必须选择 | ||
| 155 | + </div> | ||
| 156 | + </div> | ||
| 157 | + <div class="form-group has-success has-feedback" | ||
| 158 | + ng-if="ctrl.TimeTableDetailForSave.bcType == 'out'"> | ||
| 159 | + <label class="col-md-2 control-label">终点站:</label> | ||
| 160 | + <div class="col-md-3"> | ||
| 161 | + <sa-Select5 name="zdz" | ||
| 162 | + model="ctrl.TimeTableDetailForSave" | ||
| 163 | + cmaps="{'zdz.id' : 'stationid'}" | ||
| 164 | + dcname="zdz.id" | ||
| 165 | + icname="stationid" | ||
| 166 | + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}" | ||
| 167 | + iterobjname="item" | ||
| 168 | + iterobjexp="item.stationname" | ||
| 169 | + searchph="请输拼音..." | ||
| 170 | + searchexp="this.stationname" | ||
| 171 | + required > | ||
| 172 | + </sa-Select5> | ||
| 173 | + </div> | ||
| 174 | + <!-- 隐藏块,显示验证信息 --> | ||
| 175 | + <div class="alert alert-danger well-sm" ng-show="myForm.zdz.$error.required"> | ||
| 176 | + 终点站必须选择 | ||
| 177 | + </div> | ||
| 178 | + </div> | ||
| 179 | + | ||
| 180 | + <!-- 其他班次类型 --> | ||
| 181 | + <div class="form-group has-success has-feedback" | ||
| 182 | + ng-if="ctrl.TimeTableDetailForSave.bcType != 'in' && ctrl.TimeTableDetailForSave.bcType != 'out'"> | ||
| 183 | + <label class="col-md-2 control-label">起点站:</label> | ||
| 184 | + <div class="col-md-3"> | ||
| 185 | + <sa-Select5 name="qdz" | ||
| 186 | + model="ctrl.TimeTableDetailForSave" | ||
| 187 | + cmaps="{'qdz.id' : 'stationid'}" | ||
| 188 | + dcname="qdz.id" | ||
| 189 | + icname="stationid" | ||
| 190 | + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}" | ||
| 191 | + iterobjname="item" | ||
| 192 | + iterobjexp="item.stationname" | ||
| 193 | + searchph="请输拼音..." | ||
| 194 | + searchexp="this.stationname" | ||
| 195 | + required > | ||
| 196 | + </sa-Select5> | ||
| 197 | + </div> | ||
| 198 | + <!-- 隐藏块,显示验证信息 --> | ||
| 199 | + <div class="alert alert-danger well-sm" ng-show="myForm.qdz.$error.required"> | ||
| 200 | + 起点站必须选择 | ||
| 201 | + </div> | ||
| 202 | + </div> | ||
| 203 | + <div class="form-group has-success has-feedback" | ||
| 204 | + ng-if="ctrl.TimeTableDetailForSave.bcType != 'in' && ctrl.TimeTableDetailForSave.bcType != 'out'"> | ||
| 205 | + <label class="col-md-2 control-label">终点站:</label> | ||
| 206 | + <div class="col-md-3"> | ||
| 207 | + <sa-Select5 name="zdz" | ||
| 208 | + model="ctrl.TimeTableDetailForSave" | ||
| 209 | + cmaps="{'zdz.id' : 'stationid'}" | ||
| 210 | + dcname="zdz.id" | ||
| 211 | + icname="stationid" | ||
| 212 | + dsparams="{{ {type: 'ajax', param:{'xlid': ctrl.TimeTableDetailForSave.xl.id, 'xldir': ctrl.TimeTableDetailForSave.xlDir}, atype:'zd' } | json }}" | ||
| 213 | + iterobjname="item" | ||
| 214 | + iterobjexp="item.stationname" | ||
| 215 | + searchph="请输拼音..." | ||
| 216 | + searchexp="this.stationname" | ||
| 217 | + required > | ||
| 218 | + </sa-Select5> | ||
| 219 | + </div> | ||
| 220 | + <!-- 隐藏块,显示验证信息 --> | ||
| 221 | + <div class="alert alert-danger well-sm" ng-show="myForm.zdz.$error.required"> | ||
| 222 | + 终点站必须选择 | ||
| 137 | </div> | 223 | </div> |
| 138 | </div> | 224 | </div> |
| 139 | 225 | ||
| 140 | <div class="form-group has-success has-feedback"> | 226 | <div class="form-group has-success has-feedback"> |
| 141 | - <label class="col-md-3 control-label">发车时间*:</label> | ||
| 142 | - <div class="col-md-7"> | ||
| 143 | - <input type="text" class="form-control" | 227 | + <label class="col-md-2 control-label">发车时间*:</label> |
| 228 | + <div class="col-md-3"> | ||
| 229 | + <input type="text" class="form-control" name="fcsj" | ||
| 144 | ng-model="ctrl.TimeTableDetailForSave.fcsj" | 230 | ng-model="ctrl.TimeTableDetailForSave.fcsj" |
| 231 | + ng-pattern="ctrl.time_regex" | ||
| 145 | /> | 232 | /> |
| 146 | </div> | 233 | </div> |
| 234 | + <!-- 隐藏块,显示验证信息 --> | ||
| 235 | + <div class="alert alert-danger well-sm" ng-show="myForm.fcsj.$error.pattern"> | ||
| 236 | + 时间格式错误,应该是格式hh:mm,如:06:39 | ||
| 237 | + </div> | ||
| 147 | 238 | ||
| 148 | </div> | 239 | </div> |
| 149 | <div class="form-group"> | 240 | <div class="form-group"> |
| 150 | - <label class="col-md-3 control-label">对应班次数:</label> | ||
| 151 | - <div class="col-md-7"> | 241 | + <label class="col-md-2 control-label">对应班次数:</label> |
| 242 | + <div class="col-md-3"> | ||
| 152 | <input type="text" class="form-control" | 243 | <input type="text" class="form-control" |
| 153 | ng-value="ctrl.TimeTableDetailForSave.bcs" | 244 | ng-value="ctrl.TimeTableDetailForSave.bcs" |
| 154 | readonly/> | 245 | readonly/> |
| @@ -156,42 +247,63 @@ | @@ -156,42 +247,63 @@ | ||
| 156 | 247 | ||
| 157 | </div> | 248 | </div> |
| 158 | <div class="form-group"> | 249 | <div class="form-group"> |
| 159 | - <label class="col-md-3 control-label">计划里程:</label> | ||
| 160 | - <div class="col-md-7"> | ||
| 161 | - <input type="text" class="form-control" | ||
| 162 | - ng-model="ctrl.TimeTableDetailForSave.jhlc" | 250 | + <label class="col-md-2 control-label">计划里程:</label> |
| 251 | + <div class="col-md-3"> | ||
| 252 | + <input type="text" class="form-control" name="jhlc" | ||
| 253 | + ng-model="ctrl.TimeTableDetailForSave.jhlc" required ng-pattern="ctrl.float_regex" | ||
| 163 | /> | 254 | /> |
| 164 | </div> | 255 | </div> |
| 256 | + <!-- 隐藏块,显示验证信息 --> | ||
| 257 | + <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.required"> | ||
| 258 | + 计划里程必须填写 | ||
| 259 | + </div> | ||
| 260 | + <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern"> | ||
| 261 | + 输入数字 | ||
| 262 | + </div> | ||
| 165 | 263 | ||
| 166 | </div> | 264 | </div> |
| 167 | <div class="form-group"> | 265 | <div class="form-group"> |
| 168 | - <label class="col-md-3 control-label">班次历时:</label> | ||
| 169 | - <div class="col-md-7"> | ||
| 170 | - <input type="text" class="form-control" | ||
| 171 | - ng-model="ctrl.TimeTableDetailForSave.bcsj" | 266 | + <label class="col-md-2 control-label">班次历时:</label> |
| 267 | + <div class="col-md-3"> | ||
| 268 | + <input type="text" class="form-control" name="bcsj" | ||
| 269 | + ng-model="ctrl.TimeTableDetailForSave.bcsj" required ng-pattern="ctrl.number_regex" | ||
| 172 | /> | 270 | /> |
| 173 | </div> | 271 | </div> |
| 272 | + <!-- 隐藏块,显示验证信息 --> | ||
| 273 | + <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.required"> | ||
| 274 | + 班次时间必须填写 | ||
| 275 | + </div> | ||
| 276 | + <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern"> | ||
| 277 | + 输入整数 | ||
| 278 | + </div> | ||
| 174 | 279 | ||
| 175 | </div> | 280 | </div> |
| 176 | <div class="form-group has-success has-feedback"> | 281 | <div class="form-group has-success has-feedback"> |
| 177 | - <label class="col-md-3 control-label">班次类型*:</label> | ||
| 178 | - <div class="col-md-7"> | ||
| 179 | - <sa-Select3 model="ctrl.TimeTableDetailForSave" | ||
| 180 | - name="bcType" | ||
| 181 | - placeholder="请选择班次类型..." | ||
| 182 | - dcvalue="{{ctrl.TimeTableDetailForSave.bcType}}" | 282 | + <label class="col-md-2 control-label">班次类型*:</label> |
| 283 | + <div class="col-md-3"> | ||
| 284 | + <sa-Select5 name="bcType" | ||
| 285 | + model="ctrl.TimeTableDetailForSave" | ||
| 286 | + cmaps="{'bcType': 'code'}" | ||
| 183 | dcname="bcType" | 287 | dcname="bcType" |
| 184 | icname="code" | 288 | icname="code" |
| 185 | - icnames="name" | ||
| 186 | - datatype="ScheduleType" | ||
| 187 | - required > | ||
| 188 | - </sa-Select3> | 289 | + dsparams="{{ {type: 'dic', param: 'ScheduleType' } | json }}" |
| 290 | + iterobjname="item" | ||
| 291 | + iterobjexp="item.name" | ||
| 292 | + searchph="请选择营运状态..." | ||
| 293 | + searchexp="this.name" | ||
| 294 | + required | ||
| 295 | + > | ||
| 296 | + </sa-Select5> | ||
| 297 | + </div> | ||
| 298 | + <!-- 隐藏块,显示验证信息 --> | ||
| 299 | + <div class="alert alert-danger well-sm" ng-show="myForm.bcType.$error.required"> | ||
| 300 | + 班次类型必须选择 | ||
| 189 | </div> | 301 | </div> |
| 190 | 302 | ||
| 191 | </div> | 303 | </div> |
| 192 | <div class="form-group"> | 304 | <div class="form-group"> |
| 193 | - <label class="col-md-3 control-label">备注:</label> | ||
| 194 | - <div class="col-md-7"> | 305 | + <label class="col-md-2 control-label">备注:</label> |
| 306 | + <div class="col-md-3"> | ||
| 195 | <textarea class="form-control" | 307 | <textarea class="form-control" |
| 196 | ng-model="ctrl.TimeTableDetailForSave.remark" | 308 | ng-model="ctrl.TimeTableDetailForSave.remark" |
| 197 | /> | 309 | /> |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
| @@ -261,6 +261,13 @@ angular.module('ScheduleApp').controller( | @@ -261,6 +261,13 @@ angular.module('ScheduleApp').controller( | ||
| 261 | var self = this; | 261 | var self = this; |
| 262 | var TTInfoDetail = service.getQueryClass(); | 262 | var TTInfoDetail = service.getQueryClass(); |
| 263 | 263 | ||
| 264 | + // 时间正则表达式(格式hh:mm,如:06:39) | ||
| 265 | + self.time_regex = /^(([0-1]\d)|(2[0-4])):[0-5]\d$/; | ||
| 266 | + // 整数 | ||
| 267 | + self.number_regex = /^-?\d+$/; | ||
| 268 | + // 小数 | ||
| 269 | + self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/; | ||
| 270 | + | ||
| 264 | // 欲保存的busInfo信息,绑定 | 271 | // 欲保存的busInfo信息,绑定 |
| 265 | self.TimeTableDetailForSave = new TTInfoDetail; | 272 | self.TimeTableDetailForSave = new TTInfoDetail; |
| 266 | 273 |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/edit.html
| @@ -129,33 +129,33 @@ | @@ -129,33 +129,33 @@ | ||
| 129 | 129 | ||
| 130 | </div> | 130 | </div> |
| 131 | 131 | ||
| 132 | - <div class="form-group"> | ||
| 133 | - <label class="col-md-2 control-label">路牌数量:</label> | ||
| 134 | - <div class="col-md-3"> | ||
| 135 | - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount" | ||
| 136 | - name="lpCount" placeholder="请输入路牌数..." min="1"/> | ||
| 137 | - </div> | ||
| 138 | - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number"> | ||
| 139 | - 必须输入数字 | ||
| 140 | - </div> | ||
| 141 | - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min"> | ||
| 142 | - 路爬数量必须大于1 | ||
| 143 | - </div> | ||
| 144 | - </div> | 132 | + <!--<div class="form-group">--> |
| 133 | + <!--<label class="col-md-2 control-label">路牌数量:</label>--> | ||
| 134 | + <!--<div class="col-md-3">--> | ||
| 135 | + <!--<input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"--> | ||
| 136 | + <!--name="lpCount" placeholder="请输入路牌数..." min="1"/>--> | ||
| 137 | + <!--</div>--> | ||
| 138 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">--> | ||
| 139 | + <!--必须输入数字--> | ||
| 140 | + <!--</div>--> | ||
| 141 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">--> | ||
| 142 | + <!--路爬数量必须大于1--> | ||
| 143 | + <!--</div>--> | ||
| 144 | + <!--</div>--> | ||
| 145 | 145 | ||
| 146 | - <div class="form-group"> | ||
| 147 | - <label class="col-md-2 control-label">营运圈数:</label> | ||
| 148 | - <div class="col-md-3"> | ||
| 149 | - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount" | ||
| 150 | - name="loopCount" placeholder="请输入圈数..." min="1"/> | ||
| 151 | - </div> | ||
| 152 | - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number"> | ||
| 153 | - 必须输入数字 | ||
| 154 | - </div> | ||
| 155 | - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min"> | ||
| 156 | - 营运圈数必须大于1 | ||
| 157 | - </div> | ||
| 158 | - </div> | 146 | + <!--<div class="form-group">--> |
| 147 | + <!--<label class="col-md-2 control-label">营运圈数:</label>--> | ||
| 148 | + <!--<div class="col-md-3">--> | ||
| 149 | + <!--<input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"--> | ||
| 150 | + <!--name="loopCount" placeholder="请输入圈数..." min="1"/>--> | ||
| 151 | + <!--</div>--> | ||
| 152 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">--> | ||
| 153 | + <!--必须输入数字--> | ||
| 154 | + <!--</div>--> | ||
| 155 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">--> | ||
| 156 | + <!--营运圈数必须大于1--> | ||
| 157 | + <!--</div>--> | ||
| 158 | + <!--</div>--> | ||
| 159 | 159 | ||
| 160 | <div class="form-group"> | 160 | <div class="form-group"> |
| 161 | <label class="col-md-2 control-label">常规有效日:</label> | 161 | <label class="col-md-2 control-label">常规有效日:</label> |
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/form.html
| @@ -129,33 +129,33 @@ | @@ -129,33 +129,33 @@ | ||
| 129 | 129 | ||
| 130 | </div> | 130 | </div> |
| 131 | 131 | ||
| 132 | - <div class="form-group"> | ||
| 133 | - <label class="col-md-2 control-label">路牌数量:</label> | ||
| 134 | - <div class="col-md-3"> | ||
| 135 | - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount" | ||
| 136 | - name="lpCount" placeholder="请输入路牌数..." min="1"/> | ||
| 137 | - </div> | ||
| 138 | - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number"> | ||
| 139 | - 必须输入数字 | ||
| 140 | - </div> | ||
| 141 | - <div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min"> | ||
| 142 | - 路爬数量必须大于1 | ||
| 143 | - </div> | ||
| 144 | - </div> | 132 | + <!--<div class="form-group">--> |
| 133 | + <!--<label class="col-md-2 control-label">路牌数量:</label>--> | ||
| 134 | + <!--<div class="col-md-3">--> | ||
| 135 | + <!--<input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.lpCount"--> | ||
| 136 | + <!--name="lpCount" placeholder="请输入路牌数..." min="1"/>--> | ||
| 137 | + <!--</div>--> | ||
| 138 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.number">--> | ||
| 139 | + <!--必须输入数字--> | ||
| 140 | + <!--</div>--> | ||
| 141 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.lpCount.$error.min">--> | ||
| 142 | + <!--路爬数量必须大于1--> | ||
| 143 | + <!--</div>--> | ||
| 144 | + <!--</div>--> | ||
| 145 | 145 | ||
| 146 | - <div class="form-group"> | ||
| 147 | - <label class="col-md-2 control-label">营运圈数:</label> | ||
| 148 | - <div class="col-md-3"> | ||
| 149 | - <input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount" | ||
| 150 | - name="loopCount" placeholder="请输入圈数..." min="1"/> | ||
| 151 | - </div> | ||
| 152 | - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number"> | ||
| 153 | - 必须输入数字 | ||
| 154 | - </div> | ||
| 155 | - <div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min"> | ||
| 156 | - 营运圈数必须大于1 | ||
| 157 | - </div> | ||
| 158 | - </div> | 146 | + <!--<div class="form-group">--> |
| 147 | + <!--<label class="col-md-2 control-label">营运圈数:</label>--> | ||
| 148 | + <!--<div class="col-md-3">--> | ||
| 149 | + <!--<input type="number" class="form-control" ng-model="ctrl.ttInfoManageForForm.loopCount"--> | ||
| 150 | + <!--name="loopCount" placeholder="请输入圈数..." min="1"/>--> | ||
| 151 | + <!--</div>--> | ||
| 152 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.number">--> | ||
| 153 | + <!--必须输入数字--> | ||
| 154 | + <!--</div>--> | ||
| 155 | + <!--<div class="alert alert-danger well-sm" ng-show="myForm.loopCount.$error.min">--> | ||
| 156 | + <!--营运圈数必须大于1--> | ||
| 157 | + <!--</div>--> | ||
| 158 | + <!--</div>--> | ||
| 159 | 159 | ||
| 160 | <div class="form-group"> | 160 | <div class="form-group"> |
| 161 | <label class="col-md-2 control-label">常规有效日:</label> | 161 | <label class="col-md-2 control-label">常规有效日:</label> |