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

YL

2021-10-04 8d3130cd1443e6d96173bdd7c582de8ffc08ca17

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

 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({
@@ -250,7 +237,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);
@@ -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 }