检验仪器增加字段

zrg

2024-12-30 ab62442b9aa2c4189c4b097f96c0dcc71c781fbf

检验仪器增加字段

 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 />

 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/";      //余思杰本地配置(安瑞)

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_InspectInstruMent.html

@@ -58,6 +58,26 @@
                                            </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>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 120px">使用组织：</label>
                                            <div class="layui-input-inline">
                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
@@ -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();
@@ -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 () {
@@ -298,6 +330,10 @@
                            $("#HHelpCode").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();//实时渲染选中和不选中的样式,最好添加这句话
@@ -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
        });


 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_InspectInstruMent.html

@@ -752,7 +752,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;