添加车辆报废显示，查询条件

报废车辆界面，添加车辆是否报废选项，根据选择显示报废号，报废日期选项

添加车辆报废显示，查询条件
报废车辆界面，添加车辆是否报废选项，根据选择显示报废号，报废日期选项
徐烜
1 parent 858a7430
Showing 3 changed files with 43 additions and 26 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
@@ -234,7 +234,15 @@
                                placeholder="请输入标准油耗/关空调"/>
                     </div>
                 </div>
+
                 <div class="form-group">
+                    <label class="col-md-2 control-label">是否报废：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForSave.scrapState" dicgroup="truefalseType" name="scrapState"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1">
                     <label class="col-md-2 control-label">报废号：</label>
                     <div class="col-md-4">
                         <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
@@ -242,7 +250,7 @@
                     </div>
                 </div>
-                <div class="form-group">
+                <div class="form-group" ng-if="ctrl.busInfoForSave.scrapState == 1">
                     <label class="col-md-2 control-label">报废日期：</label>
                     <div class="col-md-4">
                         <div class="input-group">
@@ -235,31 +235,31 @@
                                 placeholder="请输入标准油耗/关空调"/>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="col-md-2 control-label">报废号：</label>
-                    <div class="col-md-4">
-                        <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
-                                placeholder="请输入报废号"/>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label class="col-md-2 control-label">报废日期：</label>
-                    <div class="col-md-4">
-                        <div class="input-group">
-                            <input type="text" class="form-control"
-                                   name="scrapDate" placeholder="请选择报废日期..."
-                                   uib-datepicker-popup="yyyy年MM月dd日"
-                                   is-open="ctrl.scrapDateOpen"
-                                   ng-model="ctrl.busInfoForSave.scrapDate" readonly/>
-                            <span class="input-group-btn">
-                                <button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">
-                                    <i class="glyphicon glyphicon-calendar"></i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
-                </div>
+                <!--<div class="form-group">-->
+                    <!--<label class="col-md-2 control-label">报废号：</label>-->
+                    <!--<div class="col-md-4">-->
+                        <!--<input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"-->
+                                <!--placeholder="请输入报废号"/>-->
+                    <!--</div>-->
+                <!--</div>-->
+
+                <!--<div class="form-group">-->
+                    <!--<label class="col-md-2 control-label">报废日期：</label>-->
+                    <!--<div class="col-md-4">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="text" class="form-control"-->
+                                   <!--name="scrapDate" placeholder="请选择报废日期..."-->
+                                   <!--uib-datepicker-popup="yyyy年MM月dd日"-->
+                                   <!--is-open="ctrl.scrapDateOpen"-->
+                                   <!--ng-model="ctrl.busInfoForSave.scrapDate" readonly/>-->
+                            <!--<span class="input-group-btn">-->
+                                <!--<button type="button" class="btn btn-default" ng-click="ctrl.scrapDate_open()">-->
+                                    <!--<i class="glyphicon glyphicon-calendar"></i>-->
+                                <!--</button>-->
+                            <!--</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
                 <div class="form-group">
                     <label class="col-md-2 control-label">厂牌型号1：</label>
                     <div class="col-md-4">
@@ -12,6 +12,7 @@
                 <th style="width: 150px;">所在公司</th>
                 <th style="width: 160px;">所在分公司</th>
                 <th style="width: 60px">电车</th>
+                <th style="width: 80px;" >状态</th>
                 <th style="width: 100%">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -62,6 +63,11 @@
                 </td>
                 <td>
+                    <label class="checkbox-inline input">
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['scrapState_eq']" />报废
+                    </label>
+                </td>
+                <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
                             ng-click="ctrl.doPage()">
                         <i class="fa fa-search"></i> 搜索</button>
@@ -110,6 +116,9 @@
                     <span ng-bind="info.sfdc | dict:'truefalseType':'未知' "></span>
                 </td>
                 <td>
+                    <span ng-bind="info.scrapState | dict:'truefalseType':'未知' "></span>
+                </td>
+                <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="busInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>