From 5a41caded26a3b4a5aeb9cbcd83ba4fcf60fd3ee Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html | 176 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 122 insertions(+), 54 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.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.html"
index 9a2ba7a..850dda6 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.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.html"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/HideButton_New.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/common.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -34,12 +35,12 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -75,14 +76,7 @@
<div class="layui-inline" style="margin-left:5px;">
<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
</div>
- <div class="layui-colla-content">
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- </div>
+ <div class="layui-colla-content">
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -114,12 +108,12 @@
<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 name="ColName1" id="ColName1" lay-filter="ColName1" class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -134,19 +128,19 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ <input type="text" class="layui-input ForFilteringSchemes" 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 name="ColName2" id="ColName2" lay-filter="ColName2" class="ForFilteringSchemes" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -161,7 +155,7 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -177,8 +171,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_UnDelete" id="btn_UnDelete"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
@@ -312,6 +306,13 @@
};
});
+ //鑷畾涔変簨浠�
+ table.on("tool(mainTable)", function (obj) {
+ let data = obj.data;
+ switch (obj.event) {
+ case "onBillNumberClickHandler": onBillNumberClickHandler(data); break;
+ }
+ })
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -390,10 +391,10 @@
$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
- //set_InitGrid();
+ set_InitGrid();
//鏌ヨ
- //get_Display(sWhere);
+ get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -447,6 +448,7 @@
function get_Display(sWhere) {
var index = layer.load();
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList',
@@ -466,6 +468,13 @@
for (var i = 0; i < data.length; i++) {
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].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'onBillNumberClickHandler', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -492,7 +501,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 780
+ , height: "full-130"
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -774,9 +783,17 @@
function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
-
+ debugger
if (data.length == 1) {
- layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ if (num == 1 && isEmpty(data[0]["瀹℃牳浜�"]) === false) {
+ layer.alert("瀹℃牳澶辫触: 鍗曟嵁宸茶瀹℃牳!", { icon: 5 })
+ return
+ }
+ else if (num == 2 && isEmpty(data[0]["瀹℃牳浜�"]) === true) {
+ layer.alert("鍙嶅鏍稿け璐�: 鍗曟嵁鏈瀹℃牳!", { icon: 5 })
+ return
+ }
+ layer.confirm("纭瑕�"+ (num == 1 ? "瀹℃牳" : "鍙嶅鏍�") +"鍚�?", function (index) {
var wait = layer.load();
var HInterID = data[0].hmainid;
$.ajax({
@@ -804,38 +821,38 @@
}
//鍏抽棴/鍙嶅叧闂�
- function set_CloseBill(num) {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ //function set_CloseBill(num) {
+ // var checkStatus = table.checkStatus('mainTable')
+ // , data = checkStatus.data;
- if (data.length == 1) {
- layer.confirm("纭瑕佸叧闂悧?", function (index) {
- var wait = layer.load();
- var HInterID = data[0].hmainid;
- $.ajax({
- url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
- type: "GET",
- data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- get_FastQuery();
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- else {
- layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
- }
- }
+ // if (data.length == 1) {
+ // layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ // var wait = layer.load();
+ // var HInterID = data[0].hmainid;
+ // $.ajax({
+ // url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/CloseSb_EquipDotCheckRuleBill',
+ // type: "GET",
+ // data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // get_FastQuery();
+ // layer.msg(result.Message, { icon: 1 });
+ // layer.close(wait);
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // layer.close(wait);
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.close(wait);
+ // }
+ // });
+ // })
+ // }
+ // else {
+ // layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ // }
+ //}
//#region 浣滃簾/鍙嶄綔搴�
function btn_Delete(num) {
@@ -951,6 +968,32 @@
form.render('select');
$("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ 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;
+ }
+ //#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var addSWhere = "";
+ if (typeof (openType) != "undefined") {
+ addSWhere = " and isnull(鍏抽棴浜�,'') = '' and 瀹℃牳浜� != ''";
+ }
+ return addSWhere;
}
//#endregion
@@ -1178,6 +1221,31 @@
})
}
+ //#region 鑷畾涔変簨浠剁洃鍚�
+ function onBillNumberClickHandler(data) {
+ var linterid = data.hmainid;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1