Commit bef8f4cb25879253e9f14f158e567f1667c0c17c
1 parent
51e1ea58
溯源调整
Showing
2 changed files
with
10 additions
and
9 deletions
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
| @@ -276,10 +276,10 @@ | @@ -276,10 +276,10 @@ | ||
| 276 | shiro:hasPermission="shipment:shippingCombination:combination"> | 276 | shiro:hasPermission="shipment:shippingCombination:combination"> |
| 277 | <i class="fa fa-code-fork"></i> 自动组盘 | 277 | <i class="fa fa-code-fork"></i> 自动组盘 |
| 278 | </a> | 278 | </a> |
| 279 | - <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)" | ||
| 280 | - shiro:hasPermission="shipment:shippingCombination:combination"> | ||
| 281 | - <i class="fa fa-code-fork"></i> 自动组盘并生成任务 | ||
| 282 | - </a> | 279 | +<!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"--> |
| 280 | +<!-- shiro:hasPermission="shipment:shippingCombination:combination">--> | ||
| 281 | +<!-- <i class="fa fa-code-fork"></i> 自动组盘并生成任务--> | ||
| 282 | +<!-- </a>--> | ||
| 283 | </div> | 283 | </div> |
| 284 | <table id="bootstrap-table-detail" data-row-style="rowStyle" data-mobile-responsive="true" | 284 | <table id="bootstrap-table-detail" data-row-style="rowStyle" data-mobile-responsive="true" |
| 285 | class="table table-bordered table-hover text-nowrap"></table> | 285 | class="table table-bordered table-hover text-nowrap"></table> |
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
| @@ -568,11 +568,12 @@ | @@ -568,11 +568,12 @@ | ||
| 568 | return; | 568 | return; |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | - if(echelonApplicationField=='4'){ | 571 | + if(echelonApplicationField=='3'){ |
| 572 | if(otherContent==undefined || otherContent==''){ | 572 | if(otherContent==undefined || otherContent==''){ |
| 573 | - $.modal.msgWarning("其他内容必填！！"); | ||
| 574 | - $("#otherContent").focus(); | ||
| 575 | - return; | 573 | + // $.modal.msgWarning("其他内容必填！！"); |
| 574 | + // $("#otherContent").focus(); | ||
| 575 | + // return; | ||
| 576 | + otherContent = ''; | ||
| 576 | } | 577 | } |
| 577 | }else{ | 578 | }else{ |
| 578 | otherContent = ''; | 579 | otherContent = ''; |
| @@ -681,7 +682,7 @@ | @@ -681,7 +682,7 @@ | ||
| 681 | $("#echelonApplicationField").change(function(){ | 682 | $("#echelonApplicationField").change(function(){ |
| 682 | let val = $("#echelonApplicationField").val(); | 683 | let val = $("#echelonApplicationField").val(); |
| 683 | console.log(val) | 684 | console.log(val) |
| 684 | - if(val=='4'){ | 685 | + if(val=='3'){ |
| 685 | $("#otherContents").show(); | 686 | $("#otherContents").show(); |
| 686 | }else{ | 687 | }else{ |
| 687 | $("#otherContents").hide(); | 688 | $("#otherContents").hide(); |