Commit 70ada0b26bd4c1c74c7d7163ad23e5033f418d60
1 parent
858a7430
添加车辆报废显示，查询条件
报废车辆界面，添加车辆是否报废选项，根据选择显示报废号，报废日期选项
Showing
3 changed files
with
43 additions
and
26 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
| ... | ... | @@ -234,7 +234,15 @@ |
| 234 | 234 | placeholder="请输入标准油耗/关空调"/> |
| 235 | 235 | </div> |
| 236 | 236 | </div> |
| 237 | + | |
| 237 | 238 | <div class="form-group"> |
| 239 | + <label class="col-md-2 control-label">是否报废：</label> | |
| 240 | + <div class="col-md-3"> | |
| 241 | + <sa-Radiogroup model="ctrl.busInfoForSave.scrapState" dicgroup="truefalseType" name="scrapState"></sa-Radiogroup> | |
| 242 | + </div> | |
| 243 | + </div> | |
| 244 | + | |
| 245 | + <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1"> | |
| 238 | 246 | <label class="col-md-2 control-label">报废号：</label> |
| 239 | 247 | <div class="col-md-4"> |
| 240 | 248 | <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode" |
| ... | ... | @@ -242,7 +250,7 @@ |
| 242 | 250 | </div> |
| 243 | 251 | </div> |
| 244 | 252 | |
| 245 | - <div class="form-group"> | |
| 253 | + <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1"> | |
| 246 | 254 | <label class="col-md-2 control-label">报废日期：</label> |
| 247 | 255 | <div class="col-md-4"> |
| 248 | 256 | <div class="input-group"> | ... | ... |
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
| ... | ... | @@ -235,31 +235,31 @@ |
| 235 | 235 | placeholder="请输入标准油耗/关空调"/> |
| 236 | 236 | </div> |
| 237 | 237 | </div> |
| 238 | - <div class="form-group"> | |
| 239 | - <label class="col-md-2 control-label">报废号：</label> | |
| 240 | - <div class="col-md-4"> | |
| 241 | - <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode" | |
| 242 | - placeholder="请输入报废号"/> | |
| 243 | - </div> | |
| 244 | - </div> | |
| 245 | - | |
| 246 | - <div class="form-group"> | |
| 247 | - <label class="col-md-2 control-label">报废日期：</label> | |
| 248 | - <div class="col-md-4"> | |
| 249 | - <div class="input-group"> | |
| 250 | - <input type="text" class="form-control" | |
| 251 | - name="scrapDate" placeholder="请选择报废日期..." | |
| 252 | - uib-datepicker-popup="yyyy年MM月dd日" | |
| 253 | - is-open="ctrl.scrapDateOpen" | |
| 254 | - ng-model="ctrl.busInfoForSave.scrapDate" readonly/> | |
| 255 | - <span class="input-group-btn"> | |
| 256 | - <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()"> | |
| 257 | - <i class="glyphicon glyphicon-calendar"></i> | |
| 258 | - </button> | |
| 259 | - </span> | |
| 260 | - </div> | |
| 261 | - </div> | |
| 262 | - </div> | |
| 238 | + <!--<div class="form-group">--> | |
| 239 | + <!--<label class="col-md-2 control-label">报废号：</label>--> | |
| 240 | + <!--<div class="col-md-4">--> | |
| 241 | + <!--<input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"--> | |
| 242 | + <!--placeholder="请输入报废号"/>--> | |
| 243 | + <!--</div>--> | |
| 244 | + <!--</div>--> | |
| 245 | + | |
| 246 | + <!--<div class="form-group">--> | |
| 247 | + <!--<label class="col-md-2 control-label">报废日期：</label>--> | |
| 248 | + <!--<div class="col-md-4">--> | |
| 249 | + <!--<div class="input-group">--> | |
| 250 | + <!--<input type="text" class="form-control"--> | |
| 251 | + <!--name="scrapDate" placeholder="请选择报废日期..."--> | |
| 252 | + <!--uib-datepicker-popup="yyyy年MM月dd日"--> | |
| 253 | + <!--is-open="ctrl.scrapDateOpen"--> | |
| 254 | + <!--ng-model="ctrl.busInfoForSave.scrapDate" readonly/>--> | |
| 255 | + <!--<span class="input-group-btn">--> | |
| 256 | + <!--<button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">--> | |
| 257 | + <!--<i class="glyphicon glyphicon-calendar"></i>--> | |
| 258 | + <!--</button>--> | |
| 259 | + <!--</span>--> | |
| 260 | + <!--</div>--> | |
| 261 | + <!--</div>--> | |
| 262 | + <!--</div>--> | |
| 263 | 263 | <div class="form-group"> |
| 264 | 264 | <label class="col-md-2 control-label">厂牌型号1：</label> |
| 265 | 265 | <div class="col-md-4"> | ... | ... |
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
| ... | ... | @@ -12,6 +12,7 @@ |
| 12 | 12 | <th style="width: 150px;">所在公司</th> |
| 13 | 13 | <th style="width: 160px;">所在分公司</th> |
| 14 | 14 | <th style="width: 60px">电车</th> |
| 15 | + <th style="width: 80px;" >状态</th> | |
| 15 | 16 | <th style="width: 100%">操作</th> |
| 16 | 17 | </tr> |
| 17 | 18 | <tr role="row" class="filter"> |
| ... | ... | @@ -62,6 +63,11 @@ |
| 62 | 63 | |
| 63 | 64 | </td> |
| 64 | 65 | <td> |
| 66 | + <label class="checkbox-inline input"> | |
| 67 | + <input type="checkbox" ng-model="ctrl.searchCondition()['scrapState_eq']" />报废 | |
| 68 | + </label> | |
| 69 | + </td> | |
| 70 | + <td> | |
| 65 | 71 | <button class="btn btn-sm green btn-outline filter-submit margin-bottom" |
| 66 | 72 | ng-click="ctrl.doPage()"> |
| 67 | 73 | <i class="fa fa-search"></i> 搜索</button> |
| ... | ... | @@ -110,6 +116,9 @@ |
| 110 | 116 | <span ng-bind="info.sfdc | dict:'truefalseType':'未知' "></span> |
| 111 | 117 | </td> |
| 112 | 118 | <td> |
| 119 | + <span ng-bind="info.scrapState | dict:'truefalseType':'未知' "></span> | |
| 120 | + </td> | |
| 121 | + <td> | |
| 113 | 122 | <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> |
| 114 | 123 | <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> |
| 115 | 124 | <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a> | ... | ... |