MES-WEB-LayUI.git

parent: 669207dd | 补丁 | 提交 | ignore whitespace

wtt

2024-12-27 a8803f033b4e000ff890e652a536ef4baaa09292

器具采购入库单页面优化

3个文件已修改

	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html	74 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html	189 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -14,40 +14,40 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/tableSelect.js"></script>

    <style type="text/css">
        /*begin æ¤æ ·å¼ç¨äºæ¶é¤è¡åç´ ä¸å¸å±å®½åº¦ä¸å¤çé®é¢*/
        .layui-form-item .layui-inline {
        /*.layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        }*/
        /*end*/
        /*é¡µé¢è¾å¥æ¡é´è·ä¼å*/
        .layui-card .layui-tab-brief .layui-tab-content {
        /*.layui-card .layui-tab-brief .layui-tab-content {
            padding: 10px;
        }
        }*/
        /*è¡¨ååç´ å±ä¸å¤å°åç´ */
        .layui-form-item {
        /*.layui-form-item {
            margin-bottom: 0px;
        }
        }*/
        /* è¡¨åæ¡é«åº¦*/
        .layui-input, .layui-select, .layui-textarea {
        /*.layui-input, .layui-select, .layui-textarea {
            height: 32px;
        }
        }*/
        /*è¡¨åæé®é«åº¦ãè¡é«*/
        .layui-btn {
        /*.layui-btn {
            height: 31px;
            line-height: 31px;
        }
        }*/
        /*è¡¨åæ ç¾ååé´è·(ä¸ä¸é´è·ãå·¦å³é´è·)*/
        .layui-form-label {
        /*.layui-form-label {
            padding: 6px 15px;
        }
        }*/
        /*æ´ä¸ªé¡µé¢ææè¾å¥æ¡ãé¢æ¿çè¾¹æ¡é¢è²*/
        .layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
        /*.layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
            border-color: #dbd8d8;
        }
        }*/
    </style>
</head>
<body>
@@ -595,6 +595,40 @@
                    Pub_Close(1);
                }
            });
            //å¤å¶
            form.on('submit(Copy)', function (data) {
                set_Copy();
            });
            //æ°å¢
            form.on('submit(Add)', function (data) {
                //å¶åäºº
                //$("#HMaker").val(sessionStorage["HUserName"]);
                //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //è·åæå¤§åæ®å·
                get_MAXNum();
                linterid = "";
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                table.render(option);
                form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
                    "HInnerBillNo": ""
                    , "HWHID": 0                   //ä»åºID
                    , "HWHName": ""                   //ä»åºåç§°
                    , "HSecManagerID": 0   //éªæ¶åID
                    , "HSecManagerName": ""        //éªæ¶ååç§°
                    , "HKeeperID": 0            //ä¿ç®¡åID
                    , "HKeeperName": ""            //ä¿ç®¡ååç§°
                    , "HDeptID": 0                //é¨é¨ID
                    , "HDeptName": ""                 //é¨é¨åç§°
                    , "HSourceBillType": ""       //æºåç±»å
                    , "XDH": ""                               //éåå·
                    , "HExplanation": ""           //æè¦
                    , "HRemark": ""               //å¤æ³¨
                    , "HSupTypeID": ""                             //éåå·
                    , "HSupName": ""             //æè¦
                    , "HSupID": 0                  //å¤æ³¨
                });
                
            });
            //é¢è§
            form.on("submit(planview)", function (data) {
                if (linterid != "" || linterid != null) {
@@ -891,6 +925,16 @@
                    }
                });
            }
            //#region å¤å¶
            function set_Copy() {
                //å¶åäºº
                //$("#HMaker").val(sessionStorage["HUserName"]);
                //$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //è·åæå¤§åæ®å·
                get_MAXNum();
                linterid = "";
            }
            //#endregion
            //æ¥ææ ¼å¼å
            function formatDate(date) {
                var d = new Date(date),

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillList.html

@@ -209,6 +209,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
@@ -311,6 +313,14 @@
                    //åå®¡æ ¸
                    case 'btn-Faudit': get_FAudit();
                        break;
                    //å³éæé®        ï¼0:å³éã1:åå³éï¼
                    case 'btn-Close':
                        set_CloseBill(0);
                        break;
                    //åå³éæé®
                    case 'btn-DeClose':
                        set_CloseBill(1);
                        break;
                    //å·æ°
                    case 'get_Refresh': set_Refresh();
                        break;
@@ -347,6 +357,12 @@
                optionPage.curr = 1;
               get_FastQuery(table, option);
                
            });
            //è¾å¥æ¡åè½¦æ¹æ³
            $('input').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery();
                }
            });
            //#endregion

@@ -433,17 +449,6 @@
                        soulTable.render(this);
                    }
                };
                //è®¾ç½®åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }



                optionPage = {
@@ -630,7 +635,7 @@
                                        //å³éå½åframe
                                        layer.close(index);
                                        //ä¿®æ¹ä¸ºååå·æ°çé¢
                                        window.location.reload();
                                        $("#btnSearch").click();
                                    });

                                } else {
@@ -708,7 +713,7 @@
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    window.location.reload();
                                    $("#btnSearch").click();
                                });

                            } else {
@@ -741,7 +746,7 @@
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    window.location.reload();
                                    $("#btnSearch").click();
                                });

                            } else {
@@ -756,128 +761,45 @@
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®ï¼');
                }
            }
          
            //è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
                    async: false,
                    type: "Get",
                    dataType: "json",
                    data: { "colNum": colNum, "Name": Name },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
            //#region åå³é/å³éæ°æ®
            function set_CloseBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    //é»è¾å®¡æ ¸æ¹æ³
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MouldProdInBill/CloseSc_MouldProdInBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    $("#btnSearch").trigger('click');
                                });

                return result;
            }
            //ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                get_FastQuery(table, option);
            }
            //é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(200);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å³éï¼');
                }
                get_FastQuery(table, option);
            }
            //#endregion

            //å¤å¶åæ®
            function set_CopyBill() {

            }
            //å³éåæ®
            function set_CloseBill() {

            }
            //åå³éåæ®
            function set_CancelCloseBill() {

            }
            //ä½åºåæ®
@@ -911,6 +833,23 @@
            })
            //#endregion

            //#region æåºåéæ©
            table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
                table.reload('mainTable', {
                    initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
                    , where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
                        field: obj.field //æåºåæ®µ   å¨æ¥å£ä½ä¸ºåæ°åæ®µ  field order
                        , order: obj.type //æåºæ¹å¼   å¨æ¥å£ä½ä¸ºåæ°åæ®µ  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
                //å·æ°æé®æ¾ç¤º
                Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
            });
            //#endregion


            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();//ç¶æ

			@@ -2,7 +2,7 @@
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -14,40 +14,40 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/tableSelect.js"></script>

			<style type="text/css">
			/begin æ¤æ ·å¼ç¨äºæ¶é¤è¡åç´ ä¸å¸å±å®½åº¦ä¸å¤çé®é¢/
			.layui-form-item .layui-inline {
			/*.layui-form-item .layui-inline {
			margin-top: 5px;
			margin-bottom: 5px;
			margin-right: 0px;
			}
			}*/
			/end/
			/é¡µé¢è¾å¥æ¡é´è·ä¼å/
			.layui-card .layui-tab-brief .layui-tab-content {
			/*.layui-card .layui-tab-brief .layui-tab-content {
			padding: 10px;
			}
			}*/
			/è¡¨ååç´ å±ä¸å¤å°åç´ /
			.layui-form-item {
			/*.layui-form-item {
			margin-bottom: 0px;
			}
			}*/
			/* è¡¨åæ¡é«åº¦*/
			.layui-input, .layui-select, .layui-textarea {
			/*.layui-input, .layui-select, .layui-textarea {
			height: 32px;
			}
			}*/
			/è¡¨åæé®é«åº¦ãè¡é«/
			.layui-btn {
			/*.layui-btn {
			height: 31px;
			line-height: 31px;
			}
			}*/
			/è¡¨åæ ç¾ååé´è·(ä¸ä¸é´è·ãå·¦å³é´è·)/
			.layui-form-label {
			/*.layui-form-label {
			padding: 6px 15px;
			}
			}*/
			/æ´ä¸ªé¡µé¢ææè¾å¥æ¡ãé¢æ¿çè¾¹æ¡é¢è²/
			.layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
			/*.layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
			border-color: #dbd8d8;
			}
			}*/
			</style>
			</head>
			<body>
			@@ -595,6 +595,40 @@
			Pub_Close(1);
			}
			});
			//å¤å¶
			form.on('submit(Copy)', function (data) {
			set_Copy();
			});
			//æ°å¢
			form.on('submit(Add)', function (data) {
			//å¶åäºº
			//$("#HMaker").val(sessionStorage["HUserName"]);
			//$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			//è·åæå¤§åæ®å·
			get_MAXNum();
			linterid = "";
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
			table.render(option);
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInnerBillNo": ""
			, "HWHID": 0 //ä»åºID
			, "HWHName": "" //ä»åºåç§°
			, "HSecManagerID": 0 //éªæ¶åID
			, "HSecManagerName": "" //éªæ¶ååç§°
			, "HKeeperID": 0 //ä¿ç®¡åID
			, "HKeeperName": "" //ä¿ç®¡ååç§°
			, "HDeptID": 0 //é¨é¨ID
			, "HDeptName": "" //é¨é¨åç§°
			, "HSourceBillType": "" //æºåç±»å
			, "XDH": "" //éåå·
			, "HExplanation": "" //æè¦
			, "HRemark": "" //å¤æ³¨
			, "HSupTypeID": "" //éåå·
			, "HSupName": "" //æè¦
			, "HSupID": 0 //å¤æ³¨
			});

			});
			//é¢è§
			form.on("submit(planview)", function (data) {
			if (linterid != "" \|\| linterid != null) {
			@@ -891,6 +925,16 @@
			}
			});
			}
			//#region å¤å¶
			function set_Copy() {
			//å¶åäºº
			//$("#HMaker").val(sessionStorage["HUserName"]);
			//$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			//è·åæå¤§åæ®å·
			get_MAXNum();
			linterid = "";
			}
			//#endregion
			//æ¥ææ ¼å¼å
			function formatDate(date) {
			var d = new Date(date),

			@@ -209,6 +209,8 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -311,6 +313,14 @@
			//åå®¡æ ¸
			case 'btn-Faudit': get_FAudit();
			break;
			//å³éæé® ï¼0:å³éã1:åå³éï¼
			case 'btn-Close':
			set_CloseBill(0);
			break;
			//åå³éæé®
			case 'btn-DeClose':
			set_CloseBill(1);
			break;
			//å·æ°
			case 'get_Refresh': set_Refresh();
			break;
			@@ -347,6 +357,12 @@
			optionPage.curr = 1;
			get_FastQuery(table, option);

			});
			//è¾å¥æ¡åè½¦æ¹æ³
			$('input').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});
			//#endregion

			@@ -433,17 +449,6 @@
			soulTable.render(this);
			}
			};
			//è®¾ç½®åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}



			optionPage = {
			@@ -630,7 +635,7 @@
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			$("#btnSearch").click();
			});

			} else {
			@@ -708,7 +713,7 @@
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			$("#btnSearch").click();
			});

			} else {
			@@ -741,7 +746,7 @@
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			$("#btnSearch").click();
			});

			} else {
			@@ -756,128 +761,45 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ï¼');
			}
			}

			//è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			type: "Get",
			dataType: "json",
			data: { "colNum": colNum, "Name": Name },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//#region åå³é/å³éæ°æ®
			function set_CloseBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MouldProdInBill/CloseSc_MouldProdInBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			return result;
			}
			//ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name },
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			get_FastQuery(table, option);
			}
			//é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name },
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å³éï¼');
			}
			get_FastQuery(table, option);
			}
			//#endregion

			//å¤å¶åæ®
			function set_CopyBill() {

			}
			//å³éåæ®
			function set_CloseBill() {

			}
			//åå³éåæ®
			function set_CancelCloseBill() {

			}
			//ä½åºåæ®
			@@ -911,6 +833,23 @@
			})
			//#endregion

			//#region æåºåéæ©
			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			table.reload('mainTable', {
			initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
			, where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
			field: obj.field //æåºåæ®µ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			, order: obj.type //æåºæ¹å¼ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			}
			});
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			});
			//#endregion


			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ