From 5feb1e58b63ffd24a84a4badd88dd5f83bd1b85c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期六, 25 五月 2024 10:31:06 +0800
Subject: [PATCH] 采购报表/器具报表 修改bug
---
WebTM/views/模治具管理/器具报表/Sc_MouldLifeUseReport.html | 6 ++-
WebTM/views/采购管理/采购报表/Cg_POOrderBillSumReport.html | 2
WebTM/views/采购管理/采购报表/Cg_POInStockBillSumReport.html | 41 ++++++++++----------
WebTM/views/采购管理/采购报表/Cg_POMaterialPriceReport.html | 4 +-
WebTM/views/采购管理/采购报表/Cg_POOrderReceiveSumReport.html | 4 +-
WebTM/layuiadmin/Scripts/webConfig.js | 6 +-
WebTM/views/采购管理/采购报表/Cg_POOrderReceiveDaySumReport.html | 2
WebTM/views/采购管理/采购报表/Cg_POOrderBillProcessSumReport.html | 2
WebTM/WebTM.csproj | 4 +-
9 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7171edb..3341636 100644
--- a/WebTM/WebTM.csproj
+++ b/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" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2be1229..fcde0ce 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/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
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUseReport .html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUseReport.html"
similarity index 98%
rename from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUseReport .html"
rename to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUseReport.html"
index b7c7c05..1387c31 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/Sc_MouldLifeUseReport .html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/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) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POInStockBillSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POInStockBillSumReport.html"
index 3f0ef05..272a6ea 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POInStockBillSumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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 闅愯棌鍒楄缃�
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POMaterialPriceReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POMaterialPriceReport.html"
index b39c90c..37d33bd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POMaterialPriceReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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"] },
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillProcessSumReport .html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillProcessSumReport.html"
similarity index 99%
rename from "WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillProcessSumReport .html"
rename to "WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillProcessSumReport.html"
index adc616c..ede462e 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillProcessSumReport .html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillSumReport.html"
index e1e7f7e..8cb618d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderBillSumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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"] },
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveDaySumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveDaySumReport.html"
index 59a95ef..c909ea0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveDaySumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveSumReport.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveSumReport.html"
index 6b7115a..7c44d9d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/Cg_POOrderReceiveSumReport.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\346\212\245\350\241\250/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) {
--
Gitblit v1.9.1