From ab62442b9aa2c4189c4b097f96c0dcc71c781fbf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 30 十二月 2024 14:57:13 +0800
Subject: [PATCH] 检验仪器增加字段
---
WebTM/WebTM.csproj.user | 4 +-
WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html | 4 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
WebTM/layuiadmin/Scripts/webConfig.js | 2
4 files changed, 103 insertions(+), 10 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f96700a..8233a56 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 804b479..9a4f363 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
index e886c51..c764bb7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_InspectInstruMent.html"
@@ -40,20 +40,40 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+ <input type="text" class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">鍚嶇О<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HName" id="HName" autocomplete="off">
+ <input type="text" class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px;">鏍″噯鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HCalibrationDate" id="HCalibrationDate" style="padding-left: 68px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px;">鏈夋晥鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HValidDate" id="HValidDate" style="padding-left: 68px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px;">鍒版湡澶╂暟</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HExpiryDay" id="HExpiryDay" value="" style="padding-left: 68px;">
</div>
</div>
</div>
@@ -70,6 +90,15 @@
<option value="鏈娴�" selected>鏈娴�</option>
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px">鏍″噯鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select name="HCalibrationStatus" id="HCalibrationStatus" lay-verify="HCalibrationStatus">
+ <option value="鍚堟牸" selected>鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</div>
</div>
@@ -130,6 +159,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script>
//鑾峰彇鍙傛暟
var params = get_UrlVars();
@@ -145,7 +175,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'upload','element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'upload', 'element'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -244,6 +274,8 @@
function set_AddFNew() {
$("#HItemID").val("0");
$("#HNumber").val("");
+ $("#HCalibrationDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HValidDate").val(Format(new Date(), "yyyy-MM-dd"));
// 鐩戝惉鎸夐挳鐐瑰嚮浜嬩欢锛岃Е鍙戞枃浠惰緭鍏ユ鐨勭偣鍑讳簨浠�
document.getElementById('testList').addEventListener('click', function () {
@@ -296,8 +328,12 @@
$("#HNumber").val(data.妫�楠屼华鍣ㄤ唬鐮�);//浠ｇ爜
$("#HName").val(data.妫�楠屼华鍣ㄥ悕绉�);//鍚嶇О
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
- $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
+ $("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+ $("#HCalibrationDate").val(Format(new Date(data.鏍″噯鏃ユ湡), "yyyy-MM-dd"));//鏍″噯鏃ユ湡
+ $("#HValidDate").val(Format(new Date(data.鏈夋晥鏃ユ湡), "yyyy-MM-dd"));//鏈夋晥鏃ユ湡
+ $("#HCalibrationStatus").val(data.鏍″噯鐘舵��);//鏍″噯鐘舵��
+ $("#HExpiryDay").val(data.鍒版湡澶╂暟);//鍒版湡澶╂暟
$("#HRemark").val(data.澶囨敞);//澶囨敞
$("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
@@ -359,7 +395,7 @@
function PicUpload() {
//澶氬浘鐗囦笂浼�
//澶氭枃浠跺垪琛ㄧず渚�
- var ProImgByList = $('#ProImgByList')
+ var ProImgByList = $('#ProImgByList')
, uploadListIns = upload.render({
elem: '#testList'
, url: GetWEBURL() + "/Gy_InspectInstruMent_UploadFile"
@@ -460,6 +496,61 @@
}
//#endregion
+ //#region 鏂囨湰妗嗙洃鍚�
+ $(document).ready(function () {
+ var oldCalibrationDate = ""; //淇敼鍓嶇殑鏃ユ湡
+ var newCalibrationDate = ""; //淇敼鍚庣殑鏃ユ湡
+ var oldExpiryDate = ""; // 淇敼鍓嶇殑鍒版湡澶╂暟
+
+ // 鏃ユ湡鏍煎紡鍖栧嚱鏁帮紝纭繚鏃ユ湡鏍煎紡缁熶竴
+ function formatDate(date) {
+ var d = new Date(date);
+ return d.toISOString().split('T')[0]; // 鏍煎紡鍖栦负 "YYYY-MM-DD"
+ }
+
+ // 璁＄畻涓や釜鏃ユ湡涔嬮棿鐨勫ぉ鏁板樊
+ function calculateDaysDiff(startDate, endDate) {
+ var start = new Date(startDate);
+ var end = new Date(endDate);
+ // 璁＄畻澶╂暟宸�
+ var timeDiff = end - start;
+ return timeDiff / (1000 * 3600 * 24); // 杩斿洖澶╂暟
+ }
+
+ // 鏍″噯鏃ユ湡鐒︾偣浜嬩欢
+ $("#HCalibrationDate").on('focus', function () {
+ oldCalibrationDate = $(this).val(); // 璁板綍淇敼鍓嶇殑鍊�
+ }).on('blur', function () {
+ newCalibrationDate = $(this).val(); // 璁板綍淇敼鍚庣殑鍊�
+
+ if (newCalibrationDate !== oldCalibrationDate) {
+ // 鏍″噯鏃ユ湡鍊兼湁鍙樺姩鏃讹紝閲嶆柊璁＄畻鍒版湡澶╂暟
+ var calibrationDate = new Date(newCalibrationDate);
+ var validDate = $("#HValidDate").val(); // 鑾峰彇鏈夋晥鏃ユ湡
+
+ if (validDate) {
+ var expiryDays = calculateDaysDiff(calibrationDate, validDate); // 璁＄畻鍒版湡澶╂暟
+ $("#HExpiryDay").val(expiryDays); // 璁剧疆鍒版湡澶╂暟
+ } else {
+ alert('璇疯緭鍏ユ湁鏁堟棩鏈�');
+ }
+ }
+ });
+
+ // 鏈夋晥鏃ユ湡鍙樺寲鏃讹紝鏇存柊鍒版湡澶╂暟
+ $("#HValidDate").on('blur', function () {
+ var validDate = $(this).val(); // 鑾峰彇鏈夋晥鏃ユ湡
+ var calibrationDate = $("#HCalibrationDate").val();
+
+ if (calibrationDate && validDate) {
+ var expiryDays = calculateDaysDiff(calibrationDate, validDate); // 璁＄畻鍒版湡澶╂暟
+ $("#HExpiryDay").val(expiryDays); // 璁剧疆鍒版湡澶╂暟
+ }
+ });
+
+ });
+
+
//#endregion
});
@@ -532,7 +623,7 @@
});
})
}
- //#endregion
+ //#endregion
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
index e3140e6..5d08721 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
@@ -752,7 +752,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
--
Gitblit v1.9.1