From 1822a15d5a1d5f9cbb8a8b604c67286df33575e4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 22 十一月 2023 14:02:47 +0800
Subject: [PATCH] 生产订单维护、工序流转卡维护、工序子流转卡维护、(按生产订单)客户订单报表、生产入库报表、生产日记、半成品报表、工序异常过站报表、白坯发布汇总报表、染厂汇总报表：根据用户关联客户进行过滤 生产订单(无列表)：客户弹窗根据用户关联客户进行过滤显示
---
WebTM/views/车间管理/报表分析/Kf_ProdProcessSumReport_DyeColor.html | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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.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.html"
index 4d972b2..591e57e 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.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.html"
@@ -175,6 +175,8 @@
var sWhere = "";
var option = [];
var HModName = "ProdProcessSumReport_DyeColor";
+
+ var titleData = ["HCusID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -319,6 +321,10 @@
com = " and (" + ColName + " " + com + ")";
}
+ //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+ var OtherSearch = getSWhereByHUser();
+
+
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
@@ -327,6 +333,7 @@
, HProductName: HProductName
, HProductModel: HProductModel
, RandomSearch: com
+ , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
}
sWhere = JSON.stringify(sWhere);
@@ -351,7 +358,7 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -1) {
+ if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else if (data[i].ColName == '鐧藉澂鍙戝竷') {
@@ -532,14 +539,19 @@
com = " and (" + ColName + " " + com + ")";
}
+ //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+ var OtherSearch = getSWhereByHUser();
+
+
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
- ,HMaterNumber: HMaterNumber
+ , HMaterNumber: HMaterNumber
, HBillNo: HBillNo
, HProductName: HProductName
, HProductModel: HProductModel
- , RandomSearch:com
+ , RandomSearch: com
+ , OtherSearch: (OtherSearch == null || OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
}
//set_InitGrid(JSON.stringify(sWhere));
get_Display(JSON.stringify(sWhere));
@@ -602,7 +614,7 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ /*var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
dataCol = data1.data[0].HGridString.split(',');
@@ -700,6 +712,31 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
+
+ //#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 });
+ }
+ });
+ return res;
+ }
+ //#endregion
//#endregion
});
</script>
--
Gitblit v1.9.1