From 865eb3bcd1a25d5f9233f85c2549c6fe3da3ceb0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 11 六月 2024 23:45:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor_third.html | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
index 24c1f04..21803c2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_ProdProcessSumReport_DyeColor_third.html"
@@ -310,6 +310,9 @@
com = " and (" + ColName + " " + com + ")";
}
+ //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+ var OtherSearch = getSWhereByHUser();
+
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
@@ -318,6 +321,7 @@
, HProductName: HProductName
, HProductModel: HProductModel
, RandomSearch: com
+ , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
}
sWhere = JSON.stringify(sWhere);
@@ -527,6 +531,9 @@
com = " and (" + ColName + " " + com + ")";
}
+ //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+ var OtherSearch = getSWhereByHUser();
+
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
@@ -535,6 +542,7 @@
, HProductName: HProductName
, HProductModel: HProductModel
, RandomSearch: com
+ , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
}
//set_InitGrid(JSON.stringify(sWhere));
get_Display(JSON.stringify(sWhere));
@@ -705,7 +713,31 @@
})
}
-
+ //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮繃婊ゆ潯浠�
+ function getSWhereByHUser() {
+ var res = "";
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ res = result.data;
+ } else {
+ res = result.data;
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function (err) {
+ res = " and 1 = 0";
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ res = res.replaceAll("'", "''");
+ return res;
+ }
+ //#endregion
+
//#endregion
});
</script>
--
Gitblit v1.9.1