Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
2ec6e237 1 parent 8e97f7e5

modify

Inline Side-by-side
Showing 1 changed file with 31 additions and 19 deletions
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
193 <el-radio label="2">不包含ServiceCode</el-radio> 193 <el-radio label="2">不包含ServiceCode</el-radio>
194 </el-radio-group> 194 </el-radio-group>
195 </el-col> 195 </el-col>
196 - <el-col :span="16"> 196 + <el-col :span="16" v-if="isServiceCode == '1'">
197 <el-input 197 <el-input
198 type="textarea" 198 type="textarea"
199 v-model="queryForm.includeServiceType" 199 v-model="queryForm.includeServiceType"
...@@ -206,6 +206,19 @@ ...@@ -206,6 +206,19 @@
206 :disabled="!getRouter" 206 :disabled="!getRouter"
207 ></el-input> 207 ></el-input>
208 </el-col> 208 </el-col>
209 + <el-col :span="16" v-else>
210 + <el-input
211 + type="textarea"
212 + v-model="queryForm.notIncludeServiceType"
213 + size="medium"
214 + maxlength="1000"
215 + show-word-limit
216 + :rows="4"
217 + placeholder="请输入ServiceCode"
218 + @blur="serviceCodeBlur"
219 + :disabled="!getRouter"
220 + ></el-input>
221 + </el-col>
209 </el-form-item> 222 </el-form-item>
210 </el-col> 223 </el-col>
211 </el-col> 224 </el-col>
...@@ -289,46 +302,45 @@ ...@@ -289,46 +302,45 @@
289 </el-form-item> 302 </el-form-item>
290 </el-col> 303 </el-col>
291 <el-col :span="8"> 304 <el-col :span="8">
292 - <el-form-item label="" class="custom-label"> 305 + <el-form-item label="件数" class="custom-label-pieces">
293 - <span class="custom-label-title">重量(KG)</span>
294 <el-col :span="10"> 306 <el-col :span="10">
295 <el-input 307 <el-input
296 - v-model.trim="queryForm.minWeight" 308 + v-model.trim="queryForm.minNumOfPieces"
297 - placeholder="最小重量" 309 + placeholder="最少件数"
298 - @blur="inputBlurMinWeight($event)" 310 + @blur="inputBlurMinPieces($event)"
299 :disabled="!getRouter" 311 :disabled="!getRouter"
300 ></el-input> 312 ></el-input>
301 - <span ref="minWeight" class="el-form-item__error"></span> 313 + <span ref="minNumOfPieces" class="el-form-item__error"></span>
302 </el-col> 314 </el-col>
303 <el-col style="text-align: center" :span="1">-</el-col> 315 <el-col style="text-align: center" :span="1">-</el-col>
304 <el-col :span="10"> 316 <el-col :span="10">
305 <el-input 317 <el-input
306 - v-model.trim="queryForm.maxWeight" 318 + v-model.trim="queryForm.maxNumOfPieces"
307 - placeholder="最大重量" 319 + placeholder="最多件数"
308 - @blur="inputBlurMaxWeight($event)" 320 + @blur="inputBlurMaxPieces($event)"
309 :disabled="!getRouter" 321 :disabled="!getRouter"
310 ></el-input> 322 ></el-input>
311 </el-col> 323 </el-col>
312 </el-form-item> 324 </el-form-item>
313 </el-col> 325 </el-col>
314 -
315 <el-col :span="8"> 326 <el-col :span="8">
316 - <el-form-item label="件数" class="custom-label-pieces"> 327 + <el-form-item label="" class="custom-label">
328 + <span class="custom-label-title">重量(KG)</span>
317 <el-col :span="10"> 329 <el-col :span="10">
318 <el-input 330 <el-input
319 - v-model.trim="queryForm.minNumOfPieces" 331 + v-model.trim="queryForm.minWeight"
320 - placeholder="最少件数" 332 + placeholder="最小重量"
321 - @blur="inputBlurMinPieces($event)" 333 + @blur="inputBlurMinWeight($event)"
322 :disabled="!getRouter" 334 :disabled="!getRouter"
323 ></el-input> 335 ></el-input>
324 - <span ref="minNumOfPieces" class="el-form-item__error"></span> 336 + <span ref="minWeight" class="el-form-item__error"></span>
325 </el-col> 337 </el-col>
326 <el-col style="text-align: center" :span="1">-</el-col> 338 <el-col style="text-align: center" :span="1">-</el-col>
327 <el-col :span="10"> 339 <el-col :span="10">
328 <el-input 340 <el-input
329 - v-model.trim="queryForm.maxNumOfPieces" 341 + v-model.trim="queryForm.maxWeight"
330 - placeholder="最多件数" 342 + placeholder="最大重量"
331 - @blur="inputBlurMaxPieces($event)" 343 + @blur="inputBlurMaxWeight($event)"
332 :disabled="!getRouter" 344 :disabled="!getRouter"
333 ></el-input> 345 ></el-input>
334 </el-col> 346 </el-col>
......