From f52be2c6ff5ccfd54b2aaa4ea3fee1a2dc969b50 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 17 四月 2025 11:12:33 +0800
Subject: [PATCH] 三升排产页面报表添加过滤，pda添加返回链接
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 44 +++++++++++----------
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 2
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 14 ++-----
WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html | 2
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 34 +++++++++--------
5 files changed, 47 insertions(+), 49 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 211f183..7b880d8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -5,13 +5,14 @@
<title>鐢熶骇璁″垝鎺掍骇</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
<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/soulTable.slim.js"></script>
+ <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
@@ -1382,26 +1383,27 @@
columns.push({ type: 'checkbox', fixed: 'left'});
columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿'});
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true});
- columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150});
- columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
- columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150 });
- columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150});
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150});
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text' });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150 });//0
- columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
- columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150 });//0
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, filter: true, sort: true});
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
+ columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, filter: true, sort: true });
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, filter: true, sort: true});
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text', filter: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });//0
+ columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, filter: true, sort: true });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
- columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150 });
- columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
- columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺' });
- columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
- columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
- columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
+ columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
+ columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true, sort: true });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', filter: true, sort: true });
+ columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true, sort: true });
+ columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID", filter: true, sort: true });
var dateColumns = setInit_columnsData();
var HArrangeProductDayQty = $("#HArrangeProductDayQty").val() * 1;
@@ -1985,7 +1987,7 @@
if (HICMOBillNo_ICMO) {
sWhere_ICMO += " and (瀹㈡埛璁㈠崟鍙� like '%" + HICMOBillNo_ICMO + "%' or 鍗曟嵁鍙� like '%" + + HICMOBillNo_ICMO + "%')";
}
- sWhere_ICMO += " and 鐘舵�� like '%寮�宸�%' or 鐘舵�� like '%璁″垝纭%'";
+ sWhere_ICMO += " and (鐘舵�� like '%寮�宸�%' or 鐘舵�� like '%璁″垝纭%')";
get_Display2(sWhere_ICMO);
sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
index 34a022a..41b484b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html"
@@ -1240,7 +1240,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillType.html',
+ content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillType.html',
end: function () {
},
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 0f6ffe0..013949e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -446,7 +446,8 @@
, { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120, sort: true, filter: true }
, { field: '鐢熶骇杞﹂棿鍚嶇О', title: '鐢熶骇杞﹂棿鍚嶇О', sort: true, filter: true }
, { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', width: 100, sort: true, filter: true }
- , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', sort: true, filter: true }
+ , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', sort: true, filter: true }
+ , { field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true, filter: true }
, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', sort: true, filter: true }
, { field: 'FCOLUMN9', title: '鐢靛帇/鍔熺巼/搴曟澘', sort: true, filter: true }
, { field: '璁㈠崟浜ゆ湡', title: '璁㈠崟浜ゆ湡', templet: "<div>{{d.璁㈠崟浜ゆ湡 ==null ?'':layui.util.toDateString(d.璁㈠崟浜ゆ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } }
@@ -643,25 +644,18 @@
if (result.count == 1) {
data = result.data;
- option.data = data;
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
-
- ins = table.render(option);
-
data.forEach((item) => {
for (let itemobj in item) {
if (item[itemobj] == null) {
item[itemobj] = "";
}
if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
- item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
}
});
- table.exportFile(ins.config.id, data, "xls");
+ table.exportFile('mainTable', data, "xls");
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 8cd624b..2b3fb61 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -5,13 +5,14 @@
<title>鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.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/soulTable.slim.js"></script>
+ <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
<script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
@@ -204,20 +205,21 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left', sort: true});
- columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true});
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true});
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true});
- columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true});
- columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true});
- columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true});
- columns.push({ field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', sort: true});
- columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿', sort: true });
- columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞', sort: true});
- columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�', sort: true});
- columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', sort: true});
- columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true});
- columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true});
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true, filter: true});
+ columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true, filter: true});
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true});
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true, filter: true});
+ columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true, filter: true});
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, filter: true });
+ columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true, filter: true });
+ columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true, filter: true });
+ columns.push({ field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', sort: true, filter: true});
+ columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿', sort: true, filter: true });
+ columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞', sort: true, filter: true});
+ columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�', sort: true, filter: true});
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', sort: true, filter: true});
+ columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true});
+ columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true});
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
@@ -252,7 +254,7 @@
}
}
- columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣' });
+ columns.push({ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true });
option = {
elem: '#mainTable'
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 368f15b..0a0ecab 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -2627,7 +2627,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Process/list',
type: "GET",
- data: { "sWhere": sWhere, "user": '缈佹稕娑�'},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
async: false,
success: function (data1) {
if (data1.count == 1) {
--
Gitblit v1.9.1