From 9dc32795c75ee417f45ef3b5b42a005ada0411bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 10 四月 2026 12:55:17 +0800
Subject: [PATCH] 合并分支
---
WebTM/views/模治具管理/器具报表/Sc_MouldMonthUseReport.html | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
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_MouldMonthUseReport.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_MouldMonthUseReport.html"
index c6c73a3..20712ae 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_MouldMonthUseReport.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_MouldMonthUseReport.html"
@@ -260,14 +260,11 @@
}
var HCostObjID = $("#HMouldID").val() || '0';
- var HWorkShopID = $("#HDeptID").val() || '0';
- var HWorkShopID = $("#HDeptID").val() || '0';
- var HProcID = $("#HProcID").val() || '0';
// 淇敼锛氬瓨鍌ㄨ繃绋嬪弬鏁版敼涓哄紑濮嬪勾銆佸紑濮嬫湀銆佺粨鏉熷勾銆佺粨鏉熸湀銆佽溅闂淬�佺墿鏂�
var spParams = "'" + HStartYear + "','" + HStartPeriod + "','" +
- HEndYear + "','" + HEndPeriod + "','" +
- HWorkShopID + "','" + HCostObjID + "'" + ",'" + HProcID+"'";
+ HEndYear + "','" + HEndPeriod + "'," +
+ HCostObjID
sWhere = spParams;
if (type == 2) {
@@ -275,16 +272,15 @@
}
}
- // 鍔犺浇闃舵璁′欢鏁版嵁
function get_Display(params) {
var loadIndex = layer.load(1, { shade: false });
- var sql = "exec h_p_CB_ActualItemMoneyCost" + params;
+ var sql = "exec h_p_Sc_MouldMonthUseReport" + params;
$.ajax({
- url: GetWEBURL() + '/CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList',
+ url: GetWEBURL() + '/CommonModel/searchMethod',
type: "GET",
- data: { "sWhere": sql },
+ data: { "sql": sql, "user": sessionStorage["HUserName"],"ModRightNameCheck":""},
success: function (data1) {
layer.close(loadIndex);
if (data1.count == 1) {
--
Gitblit v1.9.1