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

wtt

2024-07-23 89c069f784fac1015013d25274aeca8e28a7ba1c

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

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,8 +8,8 @@
    /*var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    *//*//张瑞广本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    /*//张瑞广本地配置*/
   // var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sb_Add_MouldRepairWorkBillList.html

@@ -137,10 +137,10 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">供应商<label style="color:red"> * </label></label>
                                                <label class="layui-form-label">供应商</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -192,7 +192,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">新设计寿命</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value="">
                                                    <input type="text" name="HNewDesignLife" id="HNewDesignLife" class="layui-input" value="0">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -1519,10 +1519,10 @@
                layer.msg("请填写器具规格", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if ($("#HSupName").val() == '') {
                layer.msg("供应商没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if ($("#HSupName").val() == '') {
            //    layer.msg("供应商没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            if ($("#HEquipName").val() == '') {
                layer.msg("设备没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
@@ -1541,10 +1541,10 @@
                layer.msg("实际维修工时请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (reg.test($("#HNewDesignLife").val()) == false || $("#HTimes").val() == '') {
                layer.msg("新设计寿命请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            //if (reg.test($("#HNewDesignLife").val()) == false || $("#HTimes").val() == '') {
            //    layer.msg("新设计寿命请填写数字", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return false;
            //}
            if ($("#HBillNo").val() == '') {
                layer.msg("错误的单据号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckPlanBillList.html

@@ -67,58 +67,77 @@
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-form-item">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">周期单位</label>
                                                    <div class="layui-input-inline">
                                                        <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
                                                            <option value="天">天</option>
                                                            <option value="月">月</option>
                                                            <option value="周">周</option>
                                                        </select>
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">点检周期</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">计划开始日期</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">计划结束日期</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                    </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">周期单位</label>
                                                <div class="layui-input-inline">
                                                    <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
                                                        <option value="天">天</option>
                                                        <option value="月">月</option>
                                                        <option value="周">周</option>
                                                    </select>
                                                </div>
                                            </div>
                                            <div class="layui-form-item">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width:95px;">器具点检规程<label style="color:red"> * </label></label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
                                                        <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                    </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">点检周期</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">摘要</label>
                                                    <div class="layui-input-inline">
                                                        <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                    </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">计划开始日期</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">备注</label>
                                                    <div class="layui-input-inline">
                                                        <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                    </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">计划结束日期</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                </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-inline">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:520px;"></textarea>
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="margin-left:330px;">
                                                <label class="layui-form-label" style="width: 85px;">备注</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="width:520px;"></textarea>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width:85px;">点检规程<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">部门</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </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" value="0">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                        <!--动态渲染组织-->
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
@@ -151,7 +170,7 @@
                            <script type="text/html" id="xuhao">
                                {{d.LAY_TABLE_INDEX+1}}
                            </script>

                        </div>
                    </form>
                </div>
            </div>
@@ -208,6 +227,9 @@
            set_InitFrom();
            //初始化表格
            set_InitGrid();
            //动态加载组织
            Organ();
            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
@@ -293,6 +315,33 @@
                    },
                    success: function (layero, index) {

                    }
                });
            });

            //表头设备点检规程信息
            form.on('submit(btnHDept)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '部门列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        $("#HDeptName").val(checkStatus.data[0].部门名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            });
@@ -526,6 +575,27 @@
                    }
                });
            }
            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    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"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //编辑
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
@@ -564,9 +634,14 @@
                                , "HEndDate": Pub_Format(data.计划结束日期, "yyyy-MM-dd")
                                , "HMouldDotCheckRuleName": data.HMouldDotCheckRuleNo
                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID

                                , "HCREATEORGID": data.HCREATEORGID
                                , "HUSEORGID": data.HUSEORGID
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.部门名称
                            });

                            if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
                                $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html

@@ -108,6 +108,20 @@
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
                                                </div>
                                            </div>
                                            <div class="layui-inline" style="margin-left:340px;">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">产品器具<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
@@ -118,15 +132,22 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                <label class="layui-form-label">部门</label>
                                                <div class="layui-input-inline" >
                                                    <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly>
                                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                <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" value="0">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                        <!--动态渲染组织-->
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
@@ -242,7 +263,9 @@
            set_InitGrid();
            set_InitGrid1();
            set_InitGrid_Plan();

            //动态加载组织
            Organ();
            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
@@ -422,6 +445,33 @@
                    },
                    success: function (layero, index) {

                    }
                });
            });

            //表头设备点检规程信息
            form.on('submit(btnHDept)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '部门列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        $("#HDeptName").val(checkStatus.data[0].部门名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            });
@@ -649,6 +699,28 @@
                });
            }

            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    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"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //编辑获取表头
            function set_EditForm(linterid) {
                //查询检验方案单是否存在
@@ -677,8 +749,14 @@
                                , "HMaintainLevName": data.保养级别名称
                                , "HMouldID": data.HMouldID
                                , "HMouldName": data.器具名称
                                , "HCREATEORGID": data.HCREATEORGID
                                , "HUSEORGID": data.HUSEORGID
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.部门名称
                            });

                            if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
                                $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -636,7 +636,7 @@
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //方法所在页面和方法名
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //方法所在页面和方法名
                        async: false,
                        data: {
                            "HSourceName": HSourceName  

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckPlanBillEdit.html

@@ -631,7 +631,9 @@
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.部门名称
                            });

                            if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
                                $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }

 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainPlanBillEdit.html

@@ -117,18 +117,6 @@
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">保养级别</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:60%;background-color:#efefef4d;" readonly>
                                                    <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaintainLev" id="btnMaintainLev" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">摘要</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:493px;"></textarea>
@@ -138,6 +126,37 @@
                                                <label class="layui-form-label" style="width: 85px;">备注</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="width:493px;"></textarea>
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:10px;">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">保养级别</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" name="HMaintainLevName" id="HMaintainLevName" style="float:left;width:60%;background-color:#efefef4d;" readonly>
                                                    <input type="hidden" class="layui-input" name="HMaintainLevID" id="HMaintainLevID" value="0" style="float:left;width:150px;">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaintainLev" id="btnMaintainLev" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">部门</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                    <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </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" value="0">
                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                        <!--动态渲染组织-->
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
@@ -251,7 +270,9 @@
            set_InitFrom();
            //初始化表格
            set_InitGrid();

            //动态加载组织
            Organ();
            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
            //判断操作类型
            if (OperationType == 1) {//无源新增
                set_AddFNew();
@@ -462,6 +483,33 @@
                });
            });

            //表头设备点检规程信息
            form.on('submit(btnHDept)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '部门列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        $("#HDeptName").val(checkStatus.data[0].部门名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                });
            });

            //预览Printing
            form.on("submit(view)", function (data) {
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEquipMaintainPlanBill&OpenTmp=设备保养计划条码");
@@ -640,6 +688,27 @@
                    }
                });
            }
            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    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"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //编辑
            function set_EditFromGrid(linterid) {
                set_EditForm(linterid);  //编辑获取表头
@@ -683,8 +752,14 @@
                                , "HMouldMaintainRuleNo": data.设备保养规程
                                , "HMaintainLevID": data.HMaintainLevID
                                , "HMaintainLevName": data.保养级别名称
                                , "HCREATEORGID": data.HCREATEORGID
                                , "HUSEORGID": data.HUSEORGID
                                , "HDeptID": data.HDeptID
                                , "HDeptName": data.部门名称
                            });

                            if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
                                $("#HUSEORGID").val(sessionStorage["OrganizationID"])
                            }
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }