潘钊 / bsth_control · Commits

Commit bac419d3b4401dc8852395eda60cc0db7bac00b9

Authored by 徐烜
1 parent d6c6b5d3

Update

Inline Side-by-side
Showing 4 changed files with 31 additions and 30 deletions
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
  View file @bac419d
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@
69 cmaps="{'rerunTtinfo.id' : 'id'}" 69 cmaps="{'rerunTtinfo.id' : 'id'}"
70 dcname="rerunTtinfo.id" 70 dcname="rerunTtinfo.id"
71 icname="id" 71 icname="id"
72 - dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}, atype:'ttInfo' } | json }}"  
73 - dsparamsextra="{'type':'all'}" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id}, atype:'ttInfo' } | json }}"
  73 + dsparamsextra="{'type':'all', 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}"
74 iterobjname="item" 74 iterobjname="item"
75 iterobjexp="item.name + '-' + item.xl.name" 75 iterobjexp="item.name + '-' + item.xl.name"
76 searchph="请输拼音..." 76 searchph="请输拼音..."
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 cmaps="{'useXl.id' : 'id'}" 138 cmaps="{'useXl.id' : 'id'}"
139 dcname="useXl.id" 139 dcname="useXl.id"
140 icname="id" 140 icname="id"
141 - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}" 141 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
142 iterobjname="item" 142 iterobjname="item"
143 iterobjexp="item.name" 143 iterobjexp="item.name"
144 searchph="请输拼音..." 144 searchph="请输拼音..."
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
153 </div> 153 </div>
154 <div class="form-group has-success has-feedback" 154 <div class="form-group has-success has-feedback"
155 ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'"> 155 ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'">
156 - <label class="col-md-2 control-label">路牌*：</label> 156 + <label class="col-md-2 control-label">路牌2*：</label>
157 <div class="col-md-3"> 157 <div class="col-md-3">
158 <sa-Select5 name="useLp" 158 <sa-Select5 name="useLp"
159 model="ctrl.rerunManageForSave" 159 model="ctrl.rerunManageForSave"
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 dcname="useLp.id" 161 dcname="useLp.id"
162 icname="id" 162 icname="id"
163 dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.useXl.id}, atype:'lpInfo2' } | json }}" 163 dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.useXl.id}, atype:'lpInfo2' } | json }}"
164 - dsparamsextra="{'type':'all'}" 164 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
165 iterobjname="item" 165 iterobjname="item"
166 iterobjexp="'路牌' + item.lpName" 166 iterobjexp="'路牌' + item.lpName"
167 searchph="请输拼音..." 167 searchph="请输拼音..."
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
  View file @bac419d
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@
69 cmaps="{'rerunTtinfo.id' : 'id'}" 69 cmaps="{'rerunTtinfo.id' : 'id'}"
70 dcname="rerunTtinfo.id" 70 dcname="rerunTtinfo.id"
71 icname="id" 71 icname="id"
72 - dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id, 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}, atype:'ttInfo' } | json }}"  
73 - dsparamsextra="{'type':'all'}" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.rerunXl.id}, atype:'ttInfo' } | json }}"
  73 + dsparamsextra="{'type':'all', 'isCancel_eq': false, 'isEnableDisTemplate_eq': true}"
74 iterobjname="item" 74 iterobjname="item"
75 iterobjexp="item.name + '-' + item.xl.name" 75 iterobjexp="item.name + '-' + item.xl.name"
76 searchph="请输拼音..." 76 searchph="请输拼音..."
@@ -153,15 +153,15 @@ @@ -153,15 +153,15 @@
153 </div> 153 </div>
154 <div class="form-group has-success has-feedback" 154 <div class="form-group has-success has-feedback"
155 ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'"> 155 ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'">
156 - <label class="col-md-2 control-label">路牌*：</label> 156 + <label class="col-md-2 control-label">路牌2*：</label>
157 <div class="col-md-3"> 157 <div class="col-md-3">
158 <sa-Select5 name="useLp" 158 <sa-Select5 name="useLp"
159 model="ctrl.rerunManageForSave" 159 model="ctrl.rerunManageForSave"
160 cmaps="{'useLp.id' : 'id'}" 160 cmaps="{'useLp.id' : 'id'}"
161 dcname="useLp.id" 161 dcname="useLp.id"
162 icname="id" 162 icname="id"
163 - dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.useXl.id, 'isCancel_eq': false}, atype:'lpInfo2' } | json }}"  
164 - dsparamsextra="{'type':'all'}" 163 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.rerunManageForSave.useXl.id}, atype:'lpInfo2' } | json }}"
  164 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
165 iterobjname="item" 165 iterobjname="item"
166 iterobjexp="'路牌' + item.lpName" 166 iterobjexp="'路牌' + item.lpName"
167 searchph="请输拼音..." 167 searchph="请输拼音..."
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
  View file @bac419d
@@ -64,19 +64,20 @@ @@ -64,19 +64,20 @@
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.scheduleRuleManageForSave"  
68 - name="cl"  
69 - placeholder="请输拼音..."  
70 - dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" 67 + <sa-Select5 name="cl"
  68 + model="ctrl.scheduleRuleManageForSave"
  69 + cmaps="{'carConfigInfo.id' : 'id'}"
71 dcname="carConfigInfo.id" 70 dcname="carConfigInfo.id"
72 icname="id" 71 icname="id"
73 - icnames="cl.insideCode"  
74 - datatype="cci2"  
75 - dataassociate="true"  
76 - dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"  
77 - mlp="true" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id}, atype:'cci2' } | json }}"
  73 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
  74 + iterobjname="item"
  75 + iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
  76 + searchph="请输拼音..."
  77 + searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
78 required > 78 required >
79 - </sa-Select3> 79 + </sa-Select5>
  80 +
80 </div> 81 </div>
81 <!-- 隐藏块，显示验证信息 --> 82 <!-- 隐藏块，显示验证信息 -->
82 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> 83 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
  View file @bac419d
@@ -64,19 +64,19 @@ @@ -64,19 +64,19 @@
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.scheduleRuleManageForSave"  
68 - name="cl"  
69 - placeholder="请输拼音..."  
70 - dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" 67 + <sa-Select5 name="cl"
  68 + model="ctrl.scheduleRuleManageForSave"
  69 + cmaps="{'carConfigInfo.id' : 'id'}"
71 dcname="carConfigInfo.id" 70 dcname="carConfigInfo.id"
72 icname="id" 71 icname="id"
73 - icnames="cl.insideCode"  
74 - datatype="cci2"  
75 - dataassociate="true"  
76 - dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}"  
77 - mlp="true" 72 + dsparams="{{ {type: 'ajax', param:{'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id}, atype:'cci2' } | json }}"
  73 + dsparamsextra="{'type':'all', 'isCancel_eq': false}"
  74 + iterobjname="item"
  75 + iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
  76 + searchph="请输拼音..."
  77 + searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
78 required > 78 required >
79 - </sa-Select3> 79 + </sa-Select5>
80 </div> 80 </div>
81 <!-- 隐藏块，显示验证信息 --> 81 <!-- 隐藏块，显示验证信息 -->
82 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> 82 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">