MESWMS-LayUI.git

parent: d45c7f51 | 补丁 | 提交 | ignore whitespace

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

2021-10-04 8d3130cd1443e6d96173bdd7c582de8ffc08ca17

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

10个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html	94 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,7 +6,7 @@
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½

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

@@ -165,34 +165,8 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
    //è·ååæ°
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }



        var params = getUrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//æä½ç±»å
            var closeType = 2;  //å³éç±»å
        } else {
            var OperationType = params[params[0]];//æä½ç±»å
            var linterid = params[params[1]];//æºåid
            var HSouceBillType = params[params[2]];//æºåç±»å
            var closeType = params[params[3]];  //å³éç±»å
        }
        var hID = params[params[0]];//ç¼è¾æ¥ç


        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
@@ -205,6 +179,20 @@
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
       
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//æä½ç±»å
                var closeType = 2;  //å³éç±»å
            } else {
                var OperationType = params[params[0]];//æä½ç±»å
                var linterid = params[params[1]];//æºåid
                var HSouceBillType = params[params[2]];//æºåç±»å
                var closeType = params[params[3]];  //å³éç±»å
            }
            var hID = params[params[1]];//ç¼è¾æ¥ç

       

            //å¸¸è§ç¨æ³
            laydate.render({
@@ -251,7 +239,7 @@
                , limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
            };
            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
            if (OperationType == 1) {
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                table.render(option);
@@ -764,17 +752,14 @@

            //éåº
            form.on('submit(Exit)', function (data) {
                if (closeType == 0) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                if (OperationType == 1) {
                    Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
                }
                if (closeType == 1) {
                    //å³éå¼¹çª
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
            });

@@ -783,6 +768,7 @@




            //form.on('submit(Cancel)', function () {
            //    //sessionStorage["SourceFlag"] = false;
            //    parent.location.href = "../../../views/index.html"

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

@@ -165,33 +165,8 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>//è·ååæ°
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }



        var params = getUrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//æä½ç±»å
            var closeType = 2;  //å³éç±»å
        } else {
            var OperationType = params[params[0]];//æä½ç±»å
            var linterid = params[params[1]];//æºåid
            var HSouceBillType = params[params[2]];//æºåç±»å
            var closeType = params[params[3]];  //å³éç±»å
        }
        var hID = params[params[0]];//ç¼è¾æ¥ç


    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
@@ -204,6 +179,18 @@
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
    
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//æä½ç±»å
                var closeType = 2;  //å³éç±»å
            } else {
                var OperationType = params[params[0]];//æä½ç±»å
                var linterid = params[params[1]];//æºåid
                var HSouceBillType = params[params[2]];//æºåç±»å
                var closeType = params[params[3]];  //å³éç±»å
            }
            var hID = params[params[1]];//ç¼è¾æ¥ç

            //å¸¸è§ç¨æ³
            laydate.render({
@@ -225,23 +212,23 @@
                , page: true //å¼å¯åé¡µ
                , cols: [[ //è¡¨å¤´
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" ,width: 100}
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100}
                    , { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }  
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100}
                    , { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100}
                    , { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
                    , { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
                    , { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100 }
                    , { field: 'HUseLife', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', edit: 'text', width: 100 }
                    , { field: 'HQtyMust', title: 'åºåæ°é', edit: 'text', width: 100 }
                    , { field: 'HQty', title: 'å®åæ°é', edit: 'text', width: 100}
                    , { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100}
                    , { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100}
                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
                    , { field: 'HQty', title: 'å®åæ°é', edit: 'text', width: 100 }
                    , { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100 }
                    , { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100 }
                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
                    , { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
                    , { field: 'HWHName', title: 'åæä»åº', edit: 'text', width: 100 }
                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
                    , { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
                    , { field: 'HSPName', title: 'ä»ä½', edit: 'text', width: 100 }
                    , { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
@@ -250,9 +237,9 @@
                , limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
            };
            //å¤ææ¯å¦æ°å¢
            if (hID == null || hID == 0) {
            if (OperationType == 1) {
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                table.render(option);
            }
            else {
@@ -334,7 +321,7 @@
                        }
                    });
                }
               

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event === 'HMaterCode')  //æ¨¡å·ä¿¡æ¯
@@ -383,7 +370,7 @@
                                }
                            });
                        }
                       

                        if (obj.event === 'HWHCode')  //ä»åºä»£ç 
                        {
                            //é¡µé¢å±-èªå®ä¹
@@ -469,7 +456,7 @@
                        return false;

                    }
                })          
                })
            });

            //çå¬ååæ ¼ç¼è¾
@@ -564,7 +551,7 @@
                                , "HKeeperName": data.åæäºº            //ä¿ç®¡ååç§°
                                , "HDeptID": data.HDeptID                 //é¨é¨ID
                                , "HDeptName": data.é¨é¨                //é¨é¨åç§°
                                , "HSourceBillType":""                   //æºåç±»å
                                , "HSourceBillType": ""                   //æºåç±»å
                                , "XDH": ""                               //éåå·
                                , "HExplanation": data.æè¦              //æè¦
                                , "HRemark": data.è¡¨å¤´å¤æ³¨                    //å¤æ³¨
@@ -761,22 +748,19 @@
                });
            });


            //éåº
            form.on('submit(Exit)', function (data) {
                if (closeType == 0) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                if (OperationType == 1) {
                    Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
                }
                if (closeType == 1) {
                    //å³éå¼¹çª
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
            });
         




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

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }

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

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }

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

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }

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

@@ -141,6 +141,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    ,limits: [50,500,1000,5000,10000] 
                    ,limit: 50
                    , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }
@@ -243,7 +245,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html',
                            content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            end: function () {
                                //å·æ°é¡µé¢,
                                location.reload();
@@ -267,7 +269,7 @@
                                , shade: 0.6 //é®ç½©éæåº¦
                                , maxmin: true //åè®¸å¨å±æå°å
                                , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                                , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?hID=' + hID
                                , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
                                , resize: false,
                                end: function () {
                                    //å·æ°é¡µé¢,

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

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }

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

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }
@@ -242,7 +244,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html',
                            content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            end: function () {
                                //å·æ°é¡µé¢,
                                location.reload();
@@ -266,7 +268,7 @@
                                , shade: 0.6 //é®ç½©éæåº¦
                                , maxmin: true //åè®¸å¨å±æå°å
                                , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                                , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html?hID=' + hID
                                , content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdOutBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
                                , resize: false,
                                end: function () {
                                    //å·æ°é¡µé¢,

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Sc_MouldOtherInBillList.html

@@ -142,6 +142,8 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limits: [50, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }

			@@ -6,7 +6,7 @@
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½

			@@ -165,34 +165,8 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script>
			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}



			var params = getUrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}
			var hID = params[params[0]];//ç¼è¾æ¥ç


			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -205,6 +179,20 @@
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;

			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}
			var hID = params[params[1]];//ç¼è¾æ¥ç



			//å¸¸è§ç¨æ³
			laydate.render({
			@@ -251,7 +239,7 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			};
			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			if (OperationType == 1) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
			table.render(option);
			@@ -764,17 +752,14 @@

			//éåº
			form.on('submit(Exit)', function (data) {
			if (closeType == 0) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			if (OperationType == 1) {
			Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
			}
			if (closeType == 1) {
			//å³éå¼¹çª
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			} else if (closeType == 2) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			else if (OperationType == 3) {
			Pub_Close(closeType);
			}
			else {
			Pub_Close(2);
			}
			});

			@@ -783,6 +768,7 @@




			//form.on('submit(Cancel)', function () {
			// //sessionStorage["SourceFlag"] = false;
			// parent.location.href = "../../../views/index.html"

			@@ -165,33 +165,8 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}



			var params = getUrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}
			var hID = params[params[0]];//ç¼è¾æ¥ç


			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -204,6 +179,18 @@
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;

			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			}
			var hID = params[params[1]];//ç¼è¾æ¥ç

			//å¸¸è§ç¨æ³
			laydate.render({
			@@ -225,23 +212,23 @@
			, page: true //å¼å¯åé¡µ
			, cols: [[ //è¡¨å¤´
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" ,width: 100}
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100}
			, { field: 'HMaterName', title: 'æ¨¡å·åç§°', edit: 'text', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', edit: 'text', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100}
			, { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100}
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', edit: 'text', width: 100 }
			, { field: 'HDesignLife', title: 'è®¾è®¡å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HLeaveLife', title: 'å©ä½å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HUseLife', title: 'ç´¯ç§¯ä½¿ç¨å¯¿å½', edit: 'text', width: 100 }
			, { field: 'HQtyMust', title: 'åºåæ°é', edit: 'text', width: 100 }
			, { field: 'HQty', title: 'å®åæ°é', edit: 'text', width: 100}
			, { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100}
			, { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100}
			, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
			, { field: 'HQty', title: 'å®åæ°é', edit: 'text', width: 100 }
			, { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100 }
			, { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100 }
			, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
			, { field: 'HWHCode', title: 'åæä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
			, { field: 'HWHName', title: 'åæä»åº', edit: 'text', width: 100 }
			, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
			, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
			, { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
			, { field: 'HSPName', title: 'ä»ä½', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			@@ -250,9 +237,9 @@
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			};
			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			if (OperationType == 1) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
			table.render(option);
			}
			else {
			@@ -334,7 +321,7 @@
			}
			});
			}


			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			if (event.key == "F7") {
			if (obj.event === 'HMaterCode') //æ¨¡å·ä¿¡æ¯
			@@ -383,7 +370,7 @@
			}
			});
			}


			if (obj.event === 'HWHCode') //ä»åºä»£ç
			{
			//é¡µé¢å±-èªå®ä¹
			@@ -469,7 +456,7 @@
			return false;

			}
			})
			})
			});

			//çå¬ååæ ¼ç¼è¾
			@@ -564,7 +551,7 @@
			, "HKeeperName": data.åæäºº //ä¿ç®¡ååç§°
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨ //é¨é¨åç§°
			, "HSourceBillType":"" //æºåç±»å
			, "HSourceBillType": "" //æºåç±»å
			, "XDH": "" //éåå·
			, "HExplanation": data.æè¦ //æè¦
			, "HRemark": data.è¡¨å¤´å¤æ³¨ //å¤æ³¨
			@@ -761,22 +748,19 @@
			});
			});


			//éåº
			form.on('submit(Exit)', function (data) {
			if (closeType == 0) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			if (OperationType == 1) {
			Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
			}
			if (closeType == 1) {
			//å³éå¼¹çª
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			} else if (closeType == 2) {
			//å³éé¡µç¾
			parent.layui.admin.events.closeThisTabs();
			else if (OperationType == 3) {
			Pub_Close(closeType);
			}
			else {
			Pub_Close(2);
			}
			});

			@@ -142,6 +142,8 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, limits: [50, 500, 1000, 5000, 10000]
			, limit: 50
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }

			@@ -141,6 +141,8 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			,limits: [50,500,1000,5000,10000]
			,limit: 50
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			@@ -243,7 +245,7 @@
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html',
			content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -267,7 +269,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?hID=' + hID
			, content: '../æ¨¡æ²»å·ä»åºç®¡ç/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,