朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 24ff46ce6204fc9a74ebef6fa2b68eeab1e031b8 1 个父辈 58aaf163

修改 海关状态 收发货人 城市 改为null（海关规定） 发货人手机为必填项 收货人除名称以外 其他改为选填项

内嵌 并排对比
正在显示 5 个修改的文件 包含 41 行增加 和 26 行删除
... ... @@ -1077,7 +1077,8 @@ public class ManifestController extends BasicController {
model.setData(manifest);
model.setStatus(200);
model.setMsg(HttpJsonMsg.SUCCESS);
manifest.setSh_city("");
manifest.setCo_city("");
receiptService.saveFromManifest(manifest, WaybillReceiptType.TEMP_SAVE);
}
} catch (Exception e) {
... ... @@ -1150,7 +1151,8 @@ public class ManifestController extends BasicController {
@ResponseBody
public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
System.out.println(manifest);
manifest.setSh_city("");
manifest.setCo_city("");
//发货人
String forShortShipper = request.getParameter("for_short_shipper");
... ...
... ... @@ -21,6 +21,7 @@ public class SDCargoTypeService extends BasicService<SDCargoTypeEntity> {
@Transactional
public SDCargoTypeEntity save(SDCargoTypeEntity sdCargoTypeEntity){
return sdCargoTypeRepository.save(sdCargoTypeEntity);
}
... ...
... ... @@ -27,7 +27,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
<div style="margin-top: 10px;">
<input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请输入验证码">
<input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请计算右侧图片中的数值">
<img class="verifyCodes" style="float: left; width: 202px; height: 37px; line-height: 35px; margin-left: 11px; padding: 5px; margin-top: -5px;" onclick="changeCode()" src="<%=basePath %>agent/getVerifyCode">
... ...
... ... @@ -216,20 +216,34 @@
class="required_span">*</span></td>
<td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required>
<option value="001"
<c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message
code="manifest.customs_status_001" /></option>
<c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>>
<%--<spring:message--%>
<%--code="manifest.customs_status_001" />--%>进出口货物
</option>
<option value="002"
<c:if test="${manifest.customsstatus == 002 }">selected="selected"</c:if>><spring:message
code="manifest.customs_status_002" /></option>
<c:if test="${manifest.customsstatus == 002 }">selected="selected"</c:if>>
<%--<spring:message--%>
<%--code="manifest.customs_status_002" />--%>国际转运货物
</option>
<option value="003"
<c:if test="${manifest.customsstatus == 003 }">selected="selected"</c:if>><spring:message
code="manifest.customs_status_003" /></option>
<c:if test="${manifest.customsstatus == 003 }">selected="selected"</c:if>>
<%--<spring:message--%>
<%--code="manifest.customs_status_003" />--%>过境货物
</option>
<option value="004"
<c:if test="${manifest.customsstatus == 004 }">selected="selected"</c:if>><spring:message
code="manifest.customs_status_004" /></option>
<option value="006"
<c:if test="${manifest.customsstatus == 006 }">selected="selected"</c:if>><spring:message
code="manifest.customs_status_006" /></option>
<c:if test="${manifest.customsstatus == 004 }">selected="selected"</c:if>>
<%--<spring:message--%>
<%--code="manifest.customs_status_004" />--%>暂时进出境集装箱
</option>
<option value="007"
<c:if test="${manifest.customsstatus == 007 }">selected="selected"</c:if>><%--<spring:message--%>
<%--code="manifest.customs_status_006" />--%>互市贸易</option>
<option value="008"
<c:if test="${manifest.customsstatus == 008 }">selected="selected"</c:if>>
<%--<spring:message--%>
<%--code="manifest.customs_status_006" />--%>
惰性物料
</option>
</select></td>
</tr>
<tr style="display: none;">
... ... @@ -298,8 +312,10 @@
value="${manifest.co_zipcode }"></td>
</tr>
<tr>
<td class="kv-label"><spring:message code="manifest.telephone" /></td>
<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50"
<td class="kv-label"><spring:message code="manifest.telephone" />
<span class="required_span">*</span>
</td>
<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50" required
value="${manifest.co_telephone }"
oninput="onInputChange(event,'co_telephone','oninput')"
onpropertychange="onInputChange(event,'co_telephone','onpropertychange')"
... ... @@ -360,22 +376,20 @@
<td class="kv-content"><input required id="sh_company" name="sh_company" type="text" maxlength="70"
value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
<td class="kv-label"><spring:message code="manifest.address" /><span
class="required_span">*</span></td>
<td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70"
<td class="kv-label"><spring:message code="manifest.address" /></td>
<td class="kv-content"><input id="sh_address" name="sh_address" maxlength="70"
type="text" value="${manifest.sh_address }"
oninput="onInputChange(event,'sh_address','oninput')"
onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td>
<td class="kv-label"><spring:message code="manifest.country" /><span
class="required_span">*</span></td>
<td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
<td class="kv-label"><spring:message code="manifest.country" /></td>
<td class="kv-content"><input id="sh_country" name="sh_country" maxlength="2"
type="text" value="${manifest.sh_country}" class="layui-input"
oninput="onInputChange(event,'sh_country','oninput')"
onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td>
</tr>
<tr>
<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
<td class="kv-content"><input required id="sh_city" name="sh_city" type="text" maxlength="35"
<td class="kv-label"><spring:message code="manifest.city" /></td>
<td class="kv-content"><input id="sh_city" name="sh_city" type="text" maxlength="35"
value="${manifest.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
<td class="kv-label"><spring:message code="manifest.state" /></td>
... ...
... ... @@ -75,7 +75,6 @@
</div>
</div>
</div>
<%--<script src="http://res.layui.com/lay/lib/layer/src/layer.js?v=2.0"></script>--%>
<script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
<script type="text/javascript">
... ... @@ -103,7 +102,6 @@
var confirmnewpassword = $("#confirmnewpassword").val();
var id = $("#id").val();
UPSCGOSCS123
var passwords = $("#newpassword").val();
var reg = /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{8,}$/;
... ...