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

zrg

2025-03-17 e4f24e81dc1f484cd91b965ed3eada9865b0bf85

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html

@@ -42,6 +42,10 @@
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <ul class="layui-tab-title" lay-filter="tab-all">
                                    <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                                    <li>其他信息</li>
                                </ul>
                                <h1 style="text-align:center;"><b>设备档案</b></h1>
                                <!--基本信息-->
                                <div class="layui-tab-content">
@@ -336,12 +340,19 @@
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">使用组织</label>
                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                        <!--动态渲染组织-->
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <!--其他信息-->
                                <!--<div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
                                    <!--其他信息-->
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">制单人</label>
@@ -367,12 +378,7 @@
                                                    <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">作废人</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                                </div>
                                            </div>
                                          
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
@@ -399,6 +405,14 @@
                                                    <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">作废人</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">作废日期</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
@@ -407,7 +421,7 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>-->
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab" lay-filter="table">
@@ -499,7 +513,7 @@
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            Organ();
            //初始化表单插件
            set_InitFrom();

@@ -507,6 +521,20 @@
            if (OperationType == 1) {//无源单
                Stverf = "Add";
                set_AddFNew();
            } else if (OperationType == 2) {//无源单
                Stverf = "Add";
                set_EditFromGrid();
                set_AddFNew();
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val("");
                $("#HChecker").val("");
                $("#HCheckDate").val("");
                $("#HUpDater").val("");
                $("#HUpDateDate").val("");
                $("#HCloseMan").val("");
                $("#HCloseDate").val("");
                $("#HDeleteMan").val("");
                $("#HDeleteDate").val("");
            }
            else if (OperationType == 3) {//编辑
                Stverf = "Update";
@@ -1266,6 +1294,29 @@

                })
            }
            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HUSEORGID").append(Organization);
                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //行内删除
            function set_GridDelete(obj) {
@@ -1300,6 +1351,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": sBillType },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
@@ -1317,6 +1369,7 @@
                $("#HInterID").val(linterid);//修改时主表ID
                $.ajax({
                    url: GetWEBURL() + "/Gy_EquipFileMain/Gy_EquipFileCheckDetai",
                    async: false,
                    type: "GET",
                    data: {
                        "HInterID": linterid
@@ -1371,6 +1424,19 @@
                        $("#HMainSourceFlag").val(d.data[0].是否主生产设备);
                        $("#HMainSourceID").val(d.data[0].HMainSourceID);
                        $("#HMainSourceName").val(d.data[0].所属主生产设备);

                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
                        $("#HMaker").val(d.data[0].制单人);
                        $("#HMakeDate").val(d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd"));
                        $("#HChecker").val(d.data[0].审核人);
                        $("#HCheckDate").val(d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd"));
                        $("#HUpDater").val(d.data[0].修改人);
                        $("#HUpDateDate").val(d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd"));
                        $("#HCloseMan").val(d.data[0].关闭人);
                        $("#HCloseDate").val(d.data[0].关闭日期 == null ? "" : Format(new Date(d.data[0].关闭日期), "yyyy-MM-dd"));
                        $("#HDeleteMan").val(d.data[0].作废人);
                        $("#HDeleteDate").val(d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd"));

                        form.render("select");
                    }
                });