Commit 116c8c4407e9579b53995dacdca2de2d3492e0bb
Merge branch 'PSM-12' into minhang
Showing
2 changed files
with
18 additions
and
20 deletions
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
| @@ -64,19 +64,18 @@ | @@ -64,19 +64,18 @@ | ||
| 64 | <div class="form-group has-success has-feedback"> | 64 | <div class="form-group has-success has-feedback"> |
| 65 | <label class="col-md-2 control-label">车辆*：</label> | 65 | <label class="col-md-2 control-label">车辆*：</label> |
| 66 | <div class="col-md-3"> | 66 | <div class="col-md-3"> |
| 67 | - <sa-Select3 model="ctrl.busConfigForSave" | ||
| 68 | - name="cl" | ||
| 69 | - placeholder="请输拼音..." | ||
| 70 | - dcvalue="{{ctrl.busConfigForSave.cl.id}}" | 67 | + <sa-Select5 name="cl" |
| 68 | + model="ctrl.busConfigForSave" | ||
| 69 | + cmaps="{'cl.id': 'id'}" | ||
| 71 | dcname="cl.id" | 70 | dcname="cl.id" |
| 72 | icname="id" | 71 | icname="id" |
| 73 | - icnames="insideCode" | ||
| 74 | - datatype="cl" | ||
| 75 | - dataassociate="true" | ||
| 76 | - dataparam="{{ {'businessCode_eq': ctrl.busConfigForSave.xl.company} | json }}" | ||
| 77 | - mlp="true" | 72 | + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cl' } | json }}" |
| 73 | + iterobjname="item" | ||
| 74 | + iterobjexp="item.insideCode" | ||
| 75 | + searchph="请输拼音..." | ||
| 76 | + searchexp="this.insideCode" | ||
| 78 | required > | 77 | required > |
| 79 | - </sa-Select3> | 78 | + </sa-Select5> |
| 80 | </div> | 79 | </div> |
| 81 | <!-- 隐藏块，显示验证信息 --> | 80 | <!-- 隐藏块，显示验证信息 --> |
| 82 | <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> | 81 | <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> |
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html
| @@ -64,19 +64,18 @@ | @@ -64,19 +64,18 @@ | ||
| 64 | <div class="form-group has-success has-feedback"> | 64 | <div class="form-group has-success has-feedback"> |
| 65 | <label class="col-md-2 control-label">车辆*：</label> | 65 | <label class="col-md-2 control-label">车辆*：</label> |
| 66 | <div class="col-md-3"> | 66 | <div class="col-md-3"> |
| 67 | - <sa-Select3 model="ctrl.busConfigForSave" | ||
| 68 | - name="cl" | ||
| 69 | - placeholder="请输拼音..." | ||
| 70 | - dcvalue="{{ctrl.busConfigForSave.cl.id}}" | 67 | + <sa-Select5 name="cl" |
| 68 | + model="ctrl.busConfigForSave" | ||
| 69 | + cmaps="{'cl.id': 'id'}" | ||
| 71 | dcname="cl.id" | 70 | dcname="cl.id" |
| 72 | icname="id" | 71 | icname="id" |
| 73 | - icnames="insideCode" | ||
| 74 | - datatype="cl" | ||
| 75 | - dataassociate="true" | ||
| 76 | - dataparam="{{ {'businessCode_eq': ctrl.busConfigForSave.xl.company} | json }}" | ||
| 77 | - mlp="true" | 72 | + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cl' } | json }}" |
| 73 | + iterobjname="item" | ||
| 74 | + iterobjexp="item.insideCode" | ||
| 75 | + searchph="请输拼音..." | ||
| 76 | + searchexp="this.insideCode" | ||
| 78 | required > | 77 | required > |
| 79 | - </sa-Select3> | 78 | + </sa-Select5> |
| 80 | </div> | 79 | </div> |
| 81 | <!-- 隐藏块，显示验证信息 --> | 80 | <!-- 隐藏块，显示验证信息 --> |
| 82 | <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> | 81 | <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> |