From 837086faf198d33d52e073d24f691c1db01ac378 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Tue, 3 Nov 2026 13:01:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(toolPurchaseIn):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E8=AE=A1=E4=BD=BF=E7=94=A8=E5=AF=BF=E5=91=BD=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除前端模板中预计使用寿命的输入框与标签
- 移除预计使用寿命输入框的数字校验事件监听
- 移除提交表单时预计使用寿命的非空校验逻辑
- 从接口请求参数中移除预计使用寿命字段
- 移除表单重置时清空预计使用寿命输入框的逻辑
---
 .../static/js/pdaOther/toolPurchaseIn.js         | 16 +---------------
 .../templates/pdaOther/toolPurchaseIn.ftl        |  9 ---------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/main/resources/static/js/pdaOther/toolPurchaseIn.js b/src/main/resources/static/js/pdaOther/toolPurchaseIn.js
index 61ae0e0..25ea74f 100644
--- a/src/main/resources/static/js/pdaOther/toolPurchaseIn.js
+++ b/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();
 }
 
diff --git a/src/main/resources/templates/pdaOther/toolPurchaseIn.ftl b/src/main/resources/templates/pdaOther/toolPurchaseIn.ftl
index 45a889b..4703412 100644
--- a/src/main/resources/templates/pdaOther/toolPurchaseIn.ftl
+++ b/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>