From a4635e8a0457390b815e582fc9ff76b076e3baf6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 18 八月 2025 12:47:03 +0800
Subject: [PATCH] 在工序出站汇报单维护模块研究下或与过滤条件，在高级自定义过滤中做就行。 现在条件过滤都是单一的，比如根据车间过滤一次性只能过滤查询一个车间的数据，通过添加或与查询方式实现同时过滤查询多个车间的数据。 同时评估下是否能把高级自定义过滤封装到js文件中，页面引用js文件就能实现高级自定义过滤的显示与过滤功能
---
WebTM/layuiadmin/SetColumn.js | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 insertions(+), 0 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 44b79eb..2ca97ef 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -734,3 +734,123 @@
}
return count;
}
+
+
+function buildFilterWhere(colName, comparator, colContent, Logical_judgement, sWhere) {
+ if (!colName || !comparator || comparator === "0") return "";
+ else if (sWhere == "") {
+ 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;
+ }
+ return " and " + "("+colName + " " + com ;
+ }
+ else if (sWhere != "")
+ {
+ 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;
+ }
+ return Logical_judgement === "鎴�" ? " or " + colName + " " + com + ")" : " and " + colName + " " + com + ")";
+ }
+ else {
+
+ 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;
+ }
+ return " and " + colName + " " + com;
+
+ }
+
+}
+function fixParenthesesMatching(swhere) {
+ const keywordEndPositions = [];
+ const keywordRegex = /\b(and|or)\b/gi;
+ let match;
+ while ((match = keywordRegex.exec(swhere)) !== null) {
+ keywordEndPositions.push(match.index + match[0].length);
+ }
+ keywordEndPositions.sort((a, b) => a - b);
+
+
+ let leftCount = 0;
+ const insertPositions = [];
+ const workingKeywordPositions = [...keywordEndPositions];
+
+ for (let i = 0; i < swhere.length; i++) {
+ if (swhere[i] === '(') {
+ leftCount++;
+ } else if (swhere[i] === ')') {
+ leftCount--;
+
+ if (leftCount < 0) {
+
+ let insertIndex = -1;
+ for (let j = workingKeywordPositions.length - 1; j >= 0; j--) {
+ if (workingKeywordPositions[j] < i) {
+ insertIndex = workingKeywordPositions[j];
+ workingKeywordPositions.splice(j, 1);
+ break;
+ }
+ }
+
+ insertPositions.push(insertIndex !== -1 ? insertIndex : 0);
+ leftCount = 0;
+ }
+ }
+ }
+
+ let result = swhere;
+ insertPositions
+ .sort((a, b) => b - a)
+ .forEach(pos => {
+ result = result.slice(0, pos) + '(' + result.slice(pos);
+ });
+
+ return result;
+}
+
+
--
Gitblit v1.9.1