From bef8f4cb25879253e9f14f158e567f1667c0c17c Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Tue, 1 Nov 2022 11:59:25 +0800
Subject: [PATCH] 溯源调整
---
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html | 8 ++++----
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index a6289e1..1413ce4 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -276,10 +276,10 @@
shiro:hasPermission="shipment:shippingCombination:combination">
<i class="fa fa-code-fork"></i> 自动组盘
</a>
- <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"
- shiro:hasPermission="shipment:shippingCombination:combination">
- <i class="fa fa-code-fork"></i> 自动组盘并生成任务
- </a>
+<!-- <a class="btn btn-outline btn-primary btn-rounded auto-shipment-task" onclick="Toshipping(2)"-->
+<!-- shiro:hasPermission="shipment:shippingCombination:combination">-->
+<!-- <i class="fa fa-code-fork"></i> 自动组盘并生成任务-->
+<!-- </a>-->
</div>
<table id="bootstrap-table-detail" data-row-style="rowStyle" data-mobile-responsive="true"
class="table table-bordered table-hover text-nowrap"></table>
diff --git a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
index c98ce86..6754b2f 100644
--- a/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
+++ b/src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -568,11 +568,12 @@
return;
}
- if(echelonApplicationField=='4'){
+ if(echelonApplicationField=='3'){
if(otherContent==undefined || otherContent==''){
- $.modal.msgWarning("其他内容必填！！");
- $("#otherContent").focus();
- return;
+ // $.modal.msgWarning("其他内容必填！！");
+ // $("#otherContent").focus();
+ // return;
+ otherContent = '';
}
}else{
otherContent = '';
@@ -681,7 +682,7 @@
$("#echelonApplicationField").change(function(){
let val = $("#echelonApplicationField").val();
console.log(val)
- if(val=='4'){
+ if(val=='3'){
$("#otherContents").show();
}else{
$("#otherContents").hide();
--
libgit2 0.22.2