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

yxj

2023-10-18 55036d528c0fa6aa6c3cf436c0fbc93f481b424c

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

 WebTM/WebTM.csproj

@@ -472,6 +472,7 @@
    <Content Include="views\grf\cs10.grf" />
    <Content Include="views\grf\指引卡1.grf" />
    <Content Include="views\grf\生产领料单.grf" />
    <Content Include="views\grf\工序在制报表.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 WebTM/views/Baseset/SRM_OpenTmpList.html

@@ -22,6 +22,7 @@
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">删除</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">刷新</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">选择</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="ReportPrint">报表打印</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">退出</button>
                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                            </div>
@@ -56,7 +57,7 @@

            var option = [];
            var HModName = "SRM_OpenTmpList";
            option={
            option = {
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                , data: []
@@ -116,7 +117,7 @@
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        //table.reload('mainTable', {
                        //    data: ajaxReturnData
                           

                        //});
                        option.data = ajaxReturnData;
                        table.render(option);
@@ -236,7 +237,7 @@
                element.tabDelete('tabDemo', '2'); //删除
            });

            form.on('submit(Select)', function (data) {//选择
            form.on('submit(Select)', function (data) {//报表打印
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var OpenTmp = data[0].模板名称;
@@ -253,6 +254,7 @@
                        url = "UpdatePOInStockBillPrintQty"
                        break;
                }

                //更新打印数量
                //$.ajax(
                //    {
@@ -270,10 +272,24 @@
                //        }
                //    });


                //关闭当前窗口
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            form.on('submit(ReportPrint)', function (data) {//选择
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 0) {
                    return layer.msg("请选择模版!");
                }
                parent.ReportPrint(data);
                //关闭当前窗口
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            })

            //隐藏列设置
            form.on('submit(HideColumn)', function (data) {
@@ -291,7 +307,7 @@
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length ; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
@@ -302,7 +318,7 @@
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
               

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框

 WebTM/views/grf/¹¤ÐòÔÚÖƱ¨±í.grf

New file
@@ -0,0 +1,191 @@
{
    "Version":"6.5.0.0",
    "Title":"1a.简单表格",
    "Author":"锐浪报表软件",
    "Description":"演示一个最基本的列表报表。",
    "Font":{
        "Name":"宋体",
        "Size":90000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "Size":256,
        "Height":33,
        "TopMargin":1.5,
        "BottomMargin":1.5
    },
    "DetailGrid":{
        "Recordset":{
            "Field":[
                {
                    "Name":"单据日期",
                    "Type":"DateTime"
                },
                {
                    "Name":"产品编码"
                },
                {
                    "Name":"产品名称"
                },
                {
                    "Name":"用量（‰）",
                    "DBFieldName":"HRate"
                },
                {
                    "Name":"重量（克）",
                    "DBFieldName":"HQty"
                },
                {
                    "Name":"单位"
                },
                {
                    "Name":"染料总量"
                },
                {
                    "Name":"助剂总量"
                },
                {
                    "Name":"日期"
                }
            ]
        },
        "Column":[
            {
                "Name":"Column1",
                "Width":3.57188
            },
            {
                "Name":"Column2",
                "Width":4.39208
            },
            {
                "Name":"Column3",
                "Width":4.41854
            },
            {
                "Name":"Column4",
                "Width":4.60375
            },
            {
                "Name":"Column5",
                "Width":2.59292
            }
        ],
        "ColumnContent":{
            "Height":0.608542,
            "ColumnContentCell":[
                {
                    "Column":"Column1",
                    "TextAlign":"MiddleCenter",
                    "DataField":"产品编码"
                },
                {
                    "Column":"Column2",
                    "TextAlign":"MiddleCenter",
                    "DataField":"产品名称"
                },
                {
                    "Column":"Column3",
                    "TextAlign":"MiddleCenter",
                    "DataField":"用量（‰）"
                },
                {
                    "Column":"Column4",
                    "TextAlign":"MiddleCenter",
                    "DataField":"重量（克）"
                },
                {
                    "Column":"Column5",
                    "TextAlign":"MiddleCenter",
                    "DataField":"单位"
                }
            ]
        },
        "ColumnTitle":{
            "Height":0.608542,
            "ColumnTitleCell":[
                {
                    "GroupTitle":false,
                    "Column":"Column1",
                    "TextAlign":"TopCenter",
                    "Text":"物料代码\r\n"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column2",
                    "TextAlign":"TopCenter",
                    "Text":"物料名称\r\n"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column3",
                    "TextAlign":"TopCenter",
                    "Text":"用量（‰）"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column4",
                    "TextAlign":"TopCenter",
                    "Text":"重量（克）"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column5",
                    "TextAlign":"TopCenter",
                    "Text":"单位"
                }
            ]
        }
    },
    "ReportHeader":[
        {
            "Name":"ReportHeader2",
            "Height":2.59292,
            "Control":[
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox1",
                    "Left":6.00604,
                    "Top":0.396875,
                    "Width":5.18583,
                    "Height":0.608542,
                    "Font":{
                        "Name":"宋体",
                        "Size":157500,
                        "Weight":400,
                        "Charset":134
                    },
                    "Text":"生产领料汇总"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox5",
                    "Left":0.79375,
                    "Top":1.19063,
                    "Width":7.19667,
                    "Height":0.608542,
                    "Text":"日期：[#日期#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox6",
                    "Left":0.79375,
                    "Top":1.79917,
                    "Width":7.19667,
                    "Height":0.608542,
                    "Text":"染料总量（公斤）：[#染料总量#]"
                },
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox4",
                    "Left":7.99042,
                    "Top":1.79917,
                    "Width":8.20208,
                    "Height":0.608542,
                    "Text":"助剂总量（公斤）：[#助剂总量#]"
                }
            ]
        }
    ]
}

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -1056,9 +1056,9 @@
                    async: false,
                    data: { "HBillType": '3772' },
                    success: function (d) {
                        //console.log(d.data);
                        var HBillNo = d.data[0].HBillNo.replace('GXLX', 'ZYK0');
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillNo").val(HBillNo);
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Kf_MateOutSumReport_QiaoYi.html

@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <style>
        .layui-form-select .layui-input {
            padding-right: 15px;
@@ -86,6 +87,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="Cell"><i class="layui-icon layui-icon-slider"></i>保存列宽</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="RefreshCell"><i class="layui-icon layui-icon-cols"></i>默认列宽</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Print" id="get_Print"><i class="layui-icon layui-icon-form"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
@@ -95,6 +97,9 @@
        </div>
    </div>
    <script>

        var OptionData = [];

        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
@@ -282,6 +287,9 @@
                        break;
                    //列设置
                    case 'btn_HideColumn': get_HideColumn();
                        break;
                    case 'get_Print':
                        get_Print();
                        break;
                };
            });
@@ -491,6 +499,52 @@
            }
            //#endregion

            //打印报表
            function get_Print() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '打印模版选择'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: false //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_WorkShopProcessWIPSumReport', 'yes']
                    , resize: false
                    , end: function () {
                        console.log(OptionData);
                        if (OptionData.length > 0) {
                            var GrfName = OptionData[0].HName;
                            if (option.data.length != 0) {
                                var dataPrint = [];
                                for (var i = 0; i < option.data.length; i++) {
                                    option.data[i]["日期"] = $("#HBeginDate").val() + "-"+$("#HEndDate").val();
                                    option.data[i]["染料总量"] = $("#HSumRLQty").val();
                                    option.data[i]["助剂总量"] = $("#HSumZJQty").val();
                                    dataPrint.push(option.data[i])
                                }

                                var Customer = {
                                    "Table": dataPrint
                                }

                                var args = {
                                    type: "preview",
                                    //showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
                                    data: Customer
                                };

                                //var args = {
                                //    report: urlAddRandomNo("../../grf/cs10.grf"),
                                //    data: Customer
                                //};
                                webapp_ws_ajax_run(args);
                            }
                        }
                    }
                })
            }

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
@@ -524,9 +578,10 @@

        });




        //双击返回生产资源
        function ReportPrint(data) {
            OptionData = data
        }
    </script>

</body>

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPSumReport.html

@@ -14,6 +14,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
@@ -118,6 +119,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-return"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
                        </script>
@@ -128,6 +130,7 @@
    </div>

    <script>
        var OptionData = [];
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -168,6 +171,11 @@
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                    //隐藏列设置
                    case 'btn-Print':
                        get_Print();
                        break;
                          
                };
            });
            //重置按钮
@@ -224,7 +232,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/WorkShopProcessWIPSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -375,6 +383,54 @@
                })
            }

            //打印报表
            function get_Print() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '打印模版选择'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: false //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_WorkShopProcessWIPSumReport', 'yes']
                    , resize: false
                    , end: function () {
                        console.log(OptionData);
                        if (OptionData.length > 0) {
                            var GrfName = OptionData[0].HName;
                            if (option.data.length != 0) {
                                var dataPrint = [];
                                for (var i = 0; i < option.data.length; i++) {
                                    option.data[i]["日期"] = "2320-12-11";
                                    option.data[i]["染料总量"] = "11237";
                                    option.data[i]["助剂总量"] = "1321414";
                                    dataPrint.push(option.data[i])
                                }

                                var Customer = {
                                    "Table": dataPrint,
                                }


                                var args = {
                                    type: "preview",
                                    //showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
                                    data: Customer
                                };

                                console.log(option.data[0].单据号);
                                //var args = {
                                //    report: urlAddRandomNo("../../grf/cs10.grf"),
                                //    data: Customer
                                //};
                                webapp_ws_ajax_run(args);
                            }
                        }
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
@@ -454,6 +510,11 @@

            //#endregion
        });

        //双击返回生产资源
        function ReportPrint(data) {
            OptionData = data
        }
    </script>
</body>
</html>