模治具，设备测试(2)修复

zzr99

2022-08-22 86804db116fa7266c14add985bb3047d9e598447

模治具，设备测试(2)修复

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

@@ -43,7 +43,7 @@
                                <label class="layui-form-label">部门代码</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
                                    <input type="hidden" name="HUseOrgID" id="HUseOrgID" value="">
                                    <input type="hidden" lay-verify="HUseOrgID" id="HUseOrgID"  name="HUseOrgID"  value="0">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
@@ -124,7 +124,13 @@
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
            if (sessionStorage["OrganizationID"] == null || sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == " ") {
                $("#HUseOrgID").val(0);
            }
            else {
                $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
            }
           
            //#endregion


@@ -280,7 +286,6 @@

            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
                var sMainStr = JSON.stringify(data.field);
                if (!$("#HNumber").val()) {
                    layer.msg("请输入部门代码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -298,7 +303,7 @@
                    type: "POST",
                    url: GetWEBURL() + "Gy_Department/AddBill1", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DotCheckList.html

@@ -231,7 +231,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增保养项目',
                    title: '新增点检项目',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairCheckList.html

@@ -231,7 +231,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增保养项目',
                    title: '新增维修检验项目',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_RepairList.html

@@ -231,7 +231,7 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增保养项目',
                    title: '新增维修项目',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldProdBackBillList.html

@@ -1003,9 +1003,6 @@
                                        HWHID: checkStatus.data[0].HItemID,
                                        HWHCode: checkStatus.data[0].HNumber,
                                        HWHName: checkStatus.data[0].HName,
                                        HSPID: "",
                                        HSPCode: "",
                                        HSPName: "",
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldOtherOutBillEdit.html

@@ -47,7 +47,6 @@
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                    <input id="HInterID" name="HInterID" type="hidden" />
                                                    <input id="HYear" name="HYear"  type="hidden"/>
                                                    <input id="HMaker" name="HMaker" type="hidden" /><!--制单人-->
                                                </div>
                                            </div>
@@ -682,7 +681,6 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HInterID").val(0);
                        $("#HYear").val(Pub_Format(new Date(), "yyyy"));
                    }
                });
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillEdit.html

@@ -1025,9 +1025,6 @@
                                        HWHID: checkStatus.data[0].HItemID,
                                        HWHCode: checkStatus.data[0].HNumber,
                                        HWHName: checkStatus.data[0].HName,
                                        HSPID: "",
                                        HSPCode: "",
                                        HSPName: "",
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldRepairChangeBillEdit.html

@@ -606,9 +606,11 @@

            //新增
            form.on('submit(set_AddNew)', function (data) {
                $("#component-form-group")[0].reset();
                layui.form.render();
                set_AddFNew();
                //$("#component-form-group")[0].reset();
                //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", false);
                //layui.form.render();
                //set_AddFNew();
                location.reload();
            });
            //保存
            form.on('submit(Saver)', function (data) {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldRepairOutBillEdit.html

@@ -354,7 +354,6 @@
            });
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                alert(1);
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });
@@ -743,7 +742,14 @@
            });
            //退出
            form.on('submit(Exit)', function (data) {//
                Pub_Close(1);
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });
            //打印Printing
            form.on("submit(view)", function (data) {
@@ -892,6 +898,7 @@
                    , { field: 'HWHName', title: '收料仓库名称', edit: 'text', width: 100 }
                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ];
                option = {
                    id: 'mainTable'

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapInBill.html

@@ -752,6 +752,7 @@
                    , { field: 'HSPName', title: '仓位名称', edit: 'text', width: 100 }
                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }

                ];
                option = {
@@ -1158,9 +1159,6 @@
                                        HWHID: checkStatus.data[0].HItemID,
                                        HWHCode: checkStatus.data[0].HNumber,
                                        HWHName: checkStatus.data[0].HName,
                                        HSPID: "",
                                        HSPCode: "",
                                        HSPName: "",
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBill.html

@@ -1116,9 +1116,6 @@
                                        HWHID: checkStatus.data[0].HItemID,
                                        HWHCode: checkStatus.data[0].HNumber,
                                        HWHName: checkStatus.data[0].HName,
                                        HSPID: "",
                                        HSPCode: "",
                                        HSPName: "",
                                    });

                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的

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

@@ -51,7 +51,7 @@
                                        <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="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo"  readonly>
                                                <input type="hidden" name="HInterID" id="HInterID">
                                            </div>
                                        </div>
@@ -73,21 +73,21 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">器具编号</label>
                                            <label class="layui-form-label" style="width: 85px;">器具编号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">器具名称</label>
                                            <label class="layui-form-label" style="width: 85px;">器具名称<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HName" id="HName" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HName" id="HName" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">器具规格</label>
                                            <label class="layui-form-label" style="width: 85px;">器具规格<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HModel" id="HModel" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HModel" id="HModel" >
                                            </div>
                                        </div>
                                    </div>
@@ -95,19 +95,19 @@
                                        <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="HModel2" id="HModel2" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HModel2" id="HModel2">
                                            </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="HDiameter" id="HDiameter" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HDiameter" id="HDiameter" >
                                            </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="HSubjoin" id="HSubjoin" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HSubjoin" id="HSubjoin" >
                                            </div>
                                        </div>
                                    </div>
@@ -115,19 +115,19 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">辅助属性2</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2" >
                                            </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="HPICNo" id="HPICNo" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HPICNo" id="HPICNo" >
                                            </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="HWorkMaterModel" id="HWorkMaterModel" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HWorkMaterModel" id="HWorkMaterModel" >
                                            </div>
                                        </div>
                                    </div>
@@ -135,7 +135,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">对应ERP物料</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -143,9 +143,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">器具分类</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">器具分类<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -153,9 +153,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">单位</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">单位<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -173,13 +173,13 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">出厂编号</label>
                                            <div class="layui-input-block" style="margin-left: 125px;">
                                                <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" />
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">使用部门</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">使用部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 80px;">
                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
@@ -189,9 +189,9 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">供应商</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">供应商<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -201,37 +201,37 @@
                                        <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="HMouldStatus" id="HMouldStatus" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HMouldStatus" id="HMouldStatus" >
                                            </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="HSaveLife" id="HSaveLife" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HSaveLife" id="HSaveLife" >
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">默认仓库</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">默认仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
                                                    <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;">
                                                <input type="text" class="layui-input" name="HVersion" id="HVersion" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HVersion" id="HVersion" >
                                            </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" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
@@ -277,19 +277,19 @@
                                        <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="HDesignLife" id="HDesignLife" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HDesignLife" id="HDesignLife" >
                                            </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="HUseLife" id="HUseLife" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HUseLife" id="HUseLife" >
                                            </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="HLeaveLife" id="HLeaveLife" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HLeaveLife" id="HLeaveLife" >
                                            </div>
                                        </div>
                                    </div>
@@ -297,27 +297,27 @@
                                        <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="HProdQty" id="HProdQty" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HProdQty" id="HProdQty" >
                                            </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="HProdWeight" id="HProdWeight" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HProdWeight" id="HProdWeight">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">穴数</label>
                                            <label class="layui-form-label" style="width: 85px;">穴数<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" >
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">默认保养规程</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">默认保养规程<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -327,9 +327,19 @@
                                        <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="HBarCode" id="HBarCode" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">虚拟仓<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" 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>
                            </div>
@@ -1133,6 +1143,7 @@
                    },
                    success: function (d) {
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
                        
                        $("#HInterID").val(d.data[0].hmainid);
                        $("#HBillNo").val(d.data[0].单据号);
                        $("#HDate").val(formatDate(d.data[0].日期));
@@ -1168,7 +1179,7 @@
                        //$("#HSPGroupID").val(d.data[0].HSPGroupID);
                        $("#HSPID").val(d.data[0].HSPID);
                        $("#HSPName").val(d.data[0].默认仓位);
                        $("#HBarCode").var(d.data[0].条码编号);
                        //$("#HBarCode").var(d.data[0].条码编号);
                        //$("#HInitDesignLife").val(d.data[0].HInitDesignLife);
                        //$("#HInitModel").val(d.data[0].HInitModel);
                        $("#HDesignLife").val(d.data[0].初始设计寿命);
@@ -1181,6 +1192,9 @@
                        $("#HMouldDotCheckRuleInterID").val(d.data[0].HMouldDotCheckRuleInterID);
                        $("#HMouldMaintainRuleInterName").val(d.data[0].保养规程单号);
                        $("#HMouldMaintainRuleInterID").val(d.data[0].HMouldMaintainRuleInterID);
                        $("#HBarCode").val(d.data[0].条码编号);
                        //$("#HNowSupID").val(d.data[0].HNowSupID);
                        //$("#HNowSupName").val(d.data[0].虚拟仓);
                    }

                });
@@ -1336,8 +1350,12 @@
                layer.msg("穴数不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HNowSupID").val() == '' || $("#HCaveQty").val() == null) {
                layer.msg("请选择虚拟仓！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //if ($("#HNowSupID").val() == '' || $("#HNowSupID").val() == null) {
            //    layer.msg("请选择虚拟仓！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            if ($("#HMouldMaintainRuleInterID").val() == '' || $("#HMouldMaintainRuleInterID").val() == null) {
                layer.msg("请选择默认保养规程！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;

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

@@ -212,7 +212,7 @@
                                                <label class="layui-form-label">源单类型</label>
                                                <div class="layui-input-inline">
                                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
                                                        <option value="2" selected="selected">采购订单</option>
                                                        <option value="2" selected="selected">故障登记单</option>
                                                        <option value="1">手工录入</option>
                                                    </select>
                                                </div>
@@ -647,7 +647,7 @@
                    title: '器具故障登记单列表',
                    shift: 2,
                    area: ['90%', '90%'],
                    content: ['../../PublicPage/PurchOrder.html', 'yes'],
                    content: ['../模治具管理/Sc_MouldConkBookBillList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                     
@@ -659,6 +659,9 @@
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择单据数据');
                        }
                        else if (checkStatus.data.length >1) {
                            return layer.msg('请选择一行单据数据');
                        }
                        //刷新当前页表格数据重载
                        //var oldData = table.cache["mainTable"];
@@ -858,7 +861,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [];
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " }];
                table.render(option);
            }
            //获取最大单据号及默认值赋值

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

@@ -501,7 +501,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;

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

@@ -242,6 +242,22 @@
                        console.log(checkStatus);
                        $("#HPlanInterName").val(checkStatus.data[0].单据号);
                        $("#HPlanInterID").val(checkStatus.data[0].hmainid);
                        $.ajax({
                            url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
                            type: "GET",
                            data: { "HPlanInterID": $("#HPlanInterID").val() },
                            success: function (result) {
                                if (result.count == 1) {
                                    option.data = result.data;
                                    table.render(option);

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {

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

@@ -56,9 +56,13 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">产品器具</label>
                                                <label class="layui-form-label">产品器具<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HMouldID" id="HMouldID" class="layui-input" value="0">
                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                        </div>
@@ -180,6 +184,44 @@
                layer.alert("未知操作类型！", { icon: 5 });
            }
            //#endregion

            //表头产品模具信息
            form.on('submit(HMouldList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '产品器具列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/MouldInformation.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('请选择数据');
                        }
                        console.log(checkStatus);
                        $("#HMouldName").val(checkStatus.data[0].HName);
                        $("#HMouldID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });


            //#region å¤´å·¥å…·æ äº‹ä»¶
@@ -361,6 +403,7 @@
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                                , "HMouldID": data.HMouldID
                                , "HMouldName": data.产品模具
                                , "HCycleUnit": data.周期单位
                                , "HCheckCycle": data.保养周期
                                , "HBeginDate": data.计划开始日期

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

@@ -77,7 +77,7 @@
                                                    </button>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                            <!--<div class="layui-inline">
                                                <label class="layui-form-label">保养计划内码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
@@ -86,7 +86,7 @@
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
                                            </div>-->
                                            <div class="layui-inline">
                                                <label class="layui-form-label">保养开始日期</label>
                                                <div class="layui-input-inline">
@@ -1018,7 +1018,8 @@
                                , "HPlanInterID": data.保养计划内码
                                , "HMouldID": data.HMouldID
                                , "HMouldName": data.产品模具

                                , "HMouldMaintainRuleInterID": data.HMouldMaintainRuleInterID
                                , "HMouldMaintainRuleInterNo": data.器具保养规程
                            });

                        } else {

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

@@ -49,6 +49,7 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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 class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
@@ -187,9 +188,10 @@
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $("#PartModul").val("");
                $("#CheckItem").val("");
                $("#BenginHCreateDate").val("");
                $("#EndHCreateDate").val("");
                sWhere = "";
                get_Display(sWhere);
            }
            //查询按钮
            form.on('submit(btnSearch)', function (data) {

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

@@ -28,14 +28,16 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <select name="HBillType" id="HBillType">
                                            <option value="">所有</option>
                                            <option value="ZHXJ">下架找货单</option>
                                            <option value="ZHSJ">上架归还单</option>
                                        </select>
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -45,34 +47,24 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">制单人</label>
                                    <label class="layui-form-label">器具代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                        <input type="text" class="layui-input" name="PartModul" id="PartModul">
                                    </div>
                                </div>-->
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <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 class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>-->
                                <!--<div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始时间</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束时间</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                        </div>
                                    </div>
                                </div>-->
        <div class="layui-inline">
            <div class="layui-inline">
                <span>其他条件></span>
            </div>
        </div>

    </div>-->
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -85,7 +77,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                               

                            </div>
                        </script>
                    </form>
@@ -179,10 +171,40 @@
            });
            //快速过滤
            function get_FastQuery(table, option) {
                var index = layer.load(0);
                var HBillNo = $("#HBillNo").val();//单据号
                var PartModul = $("#PartModul").val();//产品模具
                var BenginHCreateDate = $("#BenginHCreateDate").val();//开始日期
                var EndHCreateDate = $("#EndHCreateDate").val();//结束日期

                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (PartModul) {
                    sWhere += " and äº§å“æ¨¡å…· like '%" + PartModul + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + EndHCreateDate + "'";
                }

                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //重置过滤条件
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
                get_Display(sWhere);
            }


            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
@@ -200,7 +222,7 @@
                        , { field: '单据类型', title: '单据类型', width: 160, hide: true }
                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
                        , { field: '产品模具代码', title: '产品器具代码', width: 200 }
                        , { field: '产品模具', title: '产品器具', width: 200, hide: true }
                        , { field: '产品模具', title: '产品器具', width: 200 }
                        , { field: '周期单位', title: '周期单位', width: 200 }
                        , { field: '保养周期', title: '保养周期', width: 200 }
                        , { field: '计划开始日期', title: '计划开始日期', width: 200, templet: "<div>{{d.计划开始日期 ==null ?'':layui.util.toDateString(d.计划开始日期, 'yyyy-MM-dd')}}</div>" }

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

@@ -171,6 +171,7 @@
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HBillNo").val("");//单据号
                sWhere = "";
                get_Display(sWhere);
            }

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

@@ -1,4 +1,4 @@
f<!DOCTYPE html>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -121,6 +121,7 @@
            </div>
        </div>
    </div>
    
    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -444,11 +445,11 @@
                var HStockOrgName = $("#HStockOrgName").val(); //组织
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDept = $("#HDept").val();       //部门信息
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码    
                var HMaterNumber = $("#HMaterNumber").val();   //物料代码
                var HModelNumber = $("#HModelNumber").val();    //器具代码
                var HWhName = $("#HWhName").val();  //仓库名称
                var HSupName = $("#HSupName").val();    //往来单位
               

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }

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

@@ -159,7 +159,7 @@
                        break;
                    //刷新
                    case 'btn-reload':
                        get_Refresh();
                        set_ClearQuery();
                        break;
                    //退出按钮
                    case 'btn-exit':
@@ -368,7 +368,7 @@
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and åˆ¶å•äºº like '%" + HBillNo + "%'";
                    sWhere += " and åˆ¶å•äºº like '%" + HCreateBy + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
@@ -387,7 +387,8 @@
                $("#HCreateBy").val("");//制单人
                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#btnSearch").click();
                sWhere = "";
                get_Display(sWhere);
            }



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

@@ -89,7 +89,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>

                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>

                            </div>
                        </script>
@@ -149,6 +149,9 @@
                    case 'btn-Delete':
                        set_DeleteBill();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });


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

@@ -696,6 +696,8 @@
                                , "HPlanNo": data.点检计划编号            //点检计划编号
                                , "HPlanName": data.点检计划            //点检计划编号
                                , "HRemark": data.表头备注                //备注
                                , "HEquipDotCheckRuleInterID": data.设备点检规程ID // è®¾å¤‡ç‚¹æ£€è§„程ID
                                , "HEquipDotCheckRuleInterNo": data.设备点检规程 // è®¾å¤‡ç‚¹æ£€è§„程
                            });

                        } else {

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

@@ -188,6 +188,7 @@
                        , { field: 'HBillType', title: '单据类型', width: 160 }
                        , { field: '设备代码', title: '设备代码', width: 200 }
                        , { field: '设备名称', title: '设备名称', width: 200 }
                        , { field: '设备点检规程', title: '设备点检规程', width: 200 }
                        , { field: '表头备注', title: '表头备注', width: 200}
                        , { field: '开始日期', title: '开始日期', width: 200, templet: "<div>{{d.开始日期 ==null ?'':layui.util.toDateString(d.开始日期, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
                        , { field: '结束日期', title: '结束日期', width: 200, templet: "<div>{{d.结束日期 ==null ?'':layui.util.toDateString(d.结束日期, 'yyyy-MM-dd HH:mm:ss')}}</div>"}

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

@@ -265,7 +265,7 @@
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
                set_GridCellCheckMain(obj); //行内快捷键筛选
            });
            //行内事件
            table.on('tool(mainTable1)', function (obj) {
@@ -614,8 +614,8 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', hide: true }
                    , { field: 'HMaintainItemNumber', title: '保养项目代码', hide: true ,edit: 'text', event: 'HMaintainItemNumber' }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text' }
                    , { field: 'HMaintainItemNumber', title: '保养项目代码', hide: true ,edit: 'text' }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text', event: 'HMaintainItemNumber' }
                    , { field: 'HMaintainPart', title: '保养部位', edit: 'text' }
                    , { field: 'HClaim', title: '具体要求', edit: 'text' }
                    , { field: 'HManagerID', title: '负责人ID', edit: 'text', hide: true }
@@ -880,7 +880,7 @@
                }
            }
            //表格行内事件快捷键筛选
            function set_GridCellCheck(obj) {
            function set_GridCellCheckMain(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event === 'HMaintainItemNumber')  //保养项目信息

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

@@ -33,7 +33,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                                <<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">退出</button>
                            </div>
                        </div>
                        <div class="layui-card-body">
@@ -256,7 +256,7 @@
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">设备状态<label style="color:red"> * </label></label>
                                                <div class="layui-input-block"  style="margin-left: 125px;width:55%;">
                                                <div class="layui-input-block" style="margin-left: 125px;width:55%;">
                                                    <select name="HStatus" lay-filter="aihao" id="HStatus">
                                                        <option value="空闲" selected="selected">空闲</option>
                                                        <option value="占用">占用</option>
@@ -268,7 +268,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    </div>
                                </div>
                                <!--其他信息-->
                                <!--<div class="layui-tab-content">
                                    <div class="layui-tab-item layui-show">
@@ -381,6 +381,7 @@
                , util = layui.util
                ;
            var sBillType = "3308";
            $("#HMakeSupID").val(0);
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -407,8 +408,15 @@
            form.on('submit(Saver)', function (data) {//提交
                set_btnSave(data);
            })


            //退出按钮
            form.on('submit(Exit)', function () {
                if (linterid == undefined) {
                    Pub_Close(2);
                }
                else {
                    Pub_Close(1);
                }
            })
            //设备保养规程
            form.on('submit(HEquipMaintainRuleInterList)', function () {
                //页面层-自定义
@@ -966,15 +974,6 @@
                }
            }

            //退出按钮
            form.on('submit(Exit)', function () {
                if (linterid == undefined) {
                    Pub_Close(2);
                }
                else {
                    Pub_Close(1);
                }
            })
        });

        function AllowLoadData() {  //非空验证
@@ -982,7 +981,7 @@
            if ($("#HEquipFileNo").val() == '' || $("#HEquipFileNo").val() == null) {
                layer.msg("设备编号不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            } 
            }
            if ($("#HEquipFileNumber").val() == '' || $("#HEquipFileNumber").val() == null) {
                layer.msg("设备代码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;

 WebTM/views/É豸¹ÜÀí/É豸άÐÞÅɹ¤µ¥/Sb_EquipRepairSendWorkBillEdit.html

@@ -139,7 +139,11 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">时间单位</label>
                                                <div class="layui-input-block" style="margin-left: 125px;">
                                                    <input type="text" class="layui-input" name="HCycleUnit" lay-verify="HCycleUnit" style="width:100%" id="HCycleUnit" value="" onmouseover="this.title=this.value">
                                                    <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
                                                        <option value="小时" selected="selected">小时</option>
                                                        <option value="天">天</option>
                                                        <option value="月">月</option>
                                                    </select>
                                                </div>
                                            </div>
                                        </div>
@@ -563,10 +567,19 @@
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.close(index);
                                layer.msg("提交成功");
                                $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                location.reload();
                                if (linterid == undefined) {
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                        location.reload();
                                    });
                                }
                                else {
                                    layer.msg("修改成功", { time: 1 * 1000, icon: 1 }, function () {
                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                        Pub_Close(1);
                                    });
                                }
                                
                            }
                            else {
                                layer.close(index);

 WebTM/views/É豸¹ÜÀí/É豸¹æ³Ìµ¥/Sb_EquipDotCheckRuleEdit.html

@@ -127,7 +127,9 @@
            </div>
        </div>
    </div>

    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -429,12 +431,12 @@
                                "HBillNo": data.单据号
                                , "HInterID": data.hmainid
                                , "HDate": formatDate(data.日期)
                                ,"HBeginDate":formatDate(data.计划开始日期)
                                ,"HEndDate":formatDate(data.计划结束日期)
                                ,"HCheckCycle":data.点检周期
                                ,"HCycleUnit":data.周期单位
                                ,"HExplanation":data.摘要
                                ,"HRemark":data.备注
                                , "HBeginDate": formatDate(data.计划开始日期)
                                , "HEndDate": formatDate(data.计划结束日期)
                                , "HCheckCycle": data.点检周期
                                , "HCycleUnit": data.周期单位
                                , "HExplanation": data.摘要
                                , "HRemark": data.备注
                            });

                        } else {