Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2024-11-22 4f90256a50a31f587853ce3ce51a89732764c924

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Cj_TemperatureCurveDryingMachine.html

@@ -73,7 +73,7 @@
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                    <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="btnReSearch" style="padding:0 5px">退出</button>
                                    <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="Exit" style="padding:0 5px">退出</button>
                                </div>
                            </div>
                        </div>
@@ -143,12 +143,7 @@
                layer.msg("设备编号不能为空");
                return false;
            }          
            if (OperationType == 1) {
                get_HProcHBillNoId(linterid);
                get_FastQuery();
            } else {
                get_FastQuery();
            }
            get_FastQuery();
        });


@@ -160,7 +155,12 @@
        function set_ClearBill() {
            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            get_FastQuery();
            if (OperationType == 1) {
                get_HProcHBillNoId(linterid);
                get_FastQuery();
            } else {
                get_FastQuery();
            }
        }

        //查询数据
@@ -386,6 +386,14 @@
                    if (data1.count == 1) {
                        $("#HEquipNumber").val(data1.data[0].设备编码);
                        $("#HEquipName").val(data1.data[0].设备名称);
                        if (data1.data[0].结束时间 <= data1.data[0].开始时间) {
                            $("#HBeginDate").val(formatDate(data1.data[0].开始时间));
                            $("#HEndDate").val(formatDate(new Date()));
                        } else {
                            $("#HBeginDate").val(formatDate(data1.data[0].开始时间));
                            $("#HEndDate").val(formatDate(data1.data[0].结束时间));
                        }
                        layer.close(wait);
                    } else {
                        layer.close(wait);
                        layer.alert(data1.Message, { icon: 5 });
@@ -399,8 +407,12 @@

        //退出
        form.on('submit(Exit)', function (data) {
            Pub_Close(1);
            //window.parent.location.reload();
            if (OperationType == 1) {
                Pub_Close(1);
            } else {
                Pub_Close(2);
            }

        });

        //#endregion