zrg
2024-05-25 5feb1e58b63ffd24a84a4badd88dd5f83bd1b85c
采购报表/器具报表 修改bug
2 文件已重命名
7个文件已修改
71 ■■■■ 已修改文件
WebTM/WebTM.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具报表/Sc_MouldLifeUseReport.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POInStockBillSumReport.html 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POMaterialPriceReport.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POOrderBillProcessSumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POOrderBillSumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POOrderReceiveDaySumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购报表/Cg_POOrderReceiveSumReport.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -348,7 +348,7 @@
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBillList_PDA.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBillList_PDA.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUseReport .html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUseReport.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具调拨\Sc_MouldProdMoveBillList_PDA.html" />
    <Content Include="views\模治具管理\模具调拨\Sc_MouldProdMoveBill_PDA.html" />
@@ -401,7 +401,7 @@
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport .html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUseReport.html
File was renamed from WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUseReport .html
@@ -193,11 +193,13 @@
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
             
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
               get_FastQuery(1);
                //Organ();
            }
            //#endregion
@@ -222,7 +224,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldLifeUseReport/list',
                    url: GetWEBURL() + '/Sc_MouldLifeUseReport/GetSc_MouldLifeUseReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
                    success: function (data1) {
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POInStockBillSumReport.html
@@ -5,16 +5,16 @@
    <title>采购入库统计表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -195,7 +195,8 @@
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
@@ -225,7 +226,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POInStockBillSumReport/list',
                    url: GetWEBURL() + '/YF_PayMentBill/GetCg_POInStockBillSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
                    success: function (data1) {
@@ -368,21 +369,21 @@
           
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
                //$.ajax({
                //    type: "GET",
                //    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                //    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                //    success: function (result) {
                //        if (result.count == 1) {
                //            table.exportFile(ins.config.id, option.data, "xls");
                //        } else {
                //            layer.alert("当前模块没有导出权限!", { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
            //#endregion
            //#region éšè—åˆ—设置
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POMaterialPriceReport.html
@@ -151,7 +151,7 @@
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                set_Graphics();
                //set_Graphics();
            }
            //初始化表格
@@ -194,7 +194,7 @@
                var HType = $("#HType").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/LEMS/POMaterialPriceReport',
                    url: GetWEBURL() + '/YF_PayMentBill/POMaterialPriceReport',
                    type: "GET",
                    async: false,
                    data: { "DateYear": DateYear, "HType": HType, "user": sessionStorage["HUserName"] },
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillProcessSumReport.html
File was renamed from WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillProcessSumReport .html
@@ -234,7 +234,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/Xs_SeReport/Xs_SeOrderBillProcessSumReportList',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderBillProcessSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillSumReport.html
@@ -529,7 +529,7 @@
                var HType = $("#HType").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/LEMS/SeOutStockReportList',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderBillSumReport',
                    type: "GET", 
                    async: false,
                    data: { "DateYear": DateYear, "HType": HType, "user": sessionStorage["HUserName"] },
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderReceiveDaySumReport.html
@@ -226,7 +226,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/Cg_POInStockBillSumReport/Cg_POOrderReceiveDaySumReport',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveDaySumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderReceiveSumReport.html
@@ -141,7 +141,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Cg_POOrderBillSumReport";
            var HModName = "Cg_POOrderReceiveSumReport";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = [];
@@ -226,7 +226,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveSumReport',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveDaySumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {