From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
index 197dde4..905e056 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList_PDA.html"
@@ -92,6 +92,10 @@
, laypage = layui.laypage
, laydate = layui.laydate
, soulTable = layui.soulTable
+
+ var params = getUrlVars();
+ var HEquipID = params[params[0]]; //璁惧ID
+
var sWhere = "";
var option = [];
var HModName = "Sb_EquipDotCheckRuleList_PDA";
@@ -228,11 +232,12 @@
//鏌ヨ
function get_Display(sWhere) {
+ sWhere += " and HInterID = " + HEquipID;
var index = layer.load();
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
+ url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleListPDA',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
@@ -242,6 +247,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
@@ -313,27 +323,27 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName + " " + com;
- }
+ //if (ColName != 0 && Comparator != 0) {
+ // var com = "";
+ // switch (Comparator) {
+ // case "7":
+ // com = "like'%" + ColContent + "%'";
+ // break;
+ // case "8":
+ // com = "like'%" + ColContent + "'";
+ // break;
+ // case "9":
+ // com = "like'" + ColContent + "%'";
+ // break;
+ // case "10":
+ // com = "not like'%" + ColContent + "%'";
+ // break;
+ // default:
+ // com = "" + Comparator + "'" + ColContent + "'";
+ // break;
+ // }
+ // sWhere += " and " + ColName + " " + com;
+ //}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -643,6 +653,18 @@
form.render('select');
}
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1