Merge remote-tracking branch 'origin/master'

src/main/resources/static/js/pdaOther/toolPurchaseIn.js

@@ -80,11 +80,6 @@ $("#toolInstance").on("blur", function () {
 	loadSiteList();
 });
 
-// 预计使用寿命只允许输入数字
-$("#expectedLife").on("input", function () {
-	this.value = this.value.replace(/[^0-9]/g, "");
-});
-
 /**
  * 根据工具实例查询工厂站点列表
  */
@@ -138,18 +133,10 @@ function confirmIn() {
 		return false;
 	}
 
-	var expectedLife = $("#expectedLife").val();
-	if (!expectedLife || expectedLife.trim() === "") {
-		layer.msg("请输入预计使用寿命！");
-		$("#expectedLife").focus();
-		return false;
-	}
-
 	var params = [{
 		toolInstanceID: toolInstance.trim(),
 		site: site.trim(),
-		locationID: locationId.trim(),
-		expectedLife: parseFloat(expectedLife.trim())
+		locationID: locationId.trim()
 	}];
 
 	requestPost("/pdaOrder/batchSaveToolPurchaseIn", params, function (data) {
@@ -165,7 +152,6 @@ function clearForm() {
 	$("#toolInstance").val("");
 	$("#siteSel").html('<option value="">请先输入工具实例</option>');
 	$("#locationId").val("");
-	$("#expectedLife").val("");
 	$("#toolInstance").focus();
 }
 

src/main/resources/templates/pdaOther/toolPurchaseIn.ftl

@@ -102,15 +102,6 @@
 	</div>
 	<div class="pda-clear"></div>
 
-	<!-- 预计使用寿命 -->
-	<div autocomplete="off" style="margin-left: 27px;width: 90px;height: 24px;margin-top: 5px;">
-		<label class="ivu-form-item-label">预计使用寿命</label>
-	</div>
-	<div autocomplete="off" style="width: 260px;margin-left: 25px;height: 24px;margin-top: -5px;">
-		<input id="expectedLife" type="text" class="form-input-2">
-	</div>
-	<div class="pda-clear"></div>
-
 	<div autocomplete="off" style="margin-top: 20px;width: 120px;margin-left: 90px;">
 		<button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 44px;" onclick="pdaBaseJump()">退出</button>
 		<button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 55px;margin-left: 10%" onclick="confirmIn()">确认</button>