From d9d78499cf3aaa6165bb1bc9fe3d8a9537e4d26a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 30 十月 2025 17:03:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备状态/Sb_EquipStatusChangeBillList.html | 134 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 129 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
index 15dd2cb..1f3dcd7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\347\212\266\346\200\201/Sb_EquipStatusChangeBillList.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -70,6 +71,60 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -119,6 +174,13 @@
var sWhere = "";
var HModName = "Sb_EquipStatusChangeBillList";
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3916";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ //#endregion
+
var params = getUrlVars();
@@ -220,6 +282,7 @@
, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
+ , totalRow: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
@@ -227,7 +290,7 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
, { field: 'HMainID', title: 'HMainID', sort: true, width: 165, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 165}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
@@ -248,7 +311,7 @@
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true, width: 165 }
, { field: '骞�', title: '骞�', sort: true, width: 170 }
, { field: '鏈�', title: '鏈�', sort: true, width: 170 }
- , { field: '鏁伴噺', title: '鏁伴噺', sort: true, width: 170 }
+ , { field: '鏁伴噺', title: '鏁伴噺', sort: true, width: 170, totalRow: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 165 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 100 }
@@ -319,6 +382,13 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -340,6 +410,48 @@
}
sWhere += " and " + ColName + " " + com;
}
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
@@ -356,6 +468,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
}
@@ -367,7 +485,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '璁惧鐘舵�佸彉鏇村崟鏂板'
+ , title: '鏂板' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: './Sb_EquipStatusChangeBill.html?OperationType=1&linterid='
, end: function () {
@@ -387,7 +505,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '璁惧鐘舵�佸彉鏇村崟缂栬緫'
+ , title: '缂栬緫' + HPageTitle
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: './Sb_EquipStatusChangeBill.html?OperationType=3&linterid=' + linterid +''
, end: function () {
@@ -638,7 +756,8 @@
})
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
@@ -648,8 +767,13 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
+ //#endregion
//鑾峰彇鍙傛暟
--
Gitblit v1.9.1