From 7ed546192a84e33561330062cdb48790fcdb5eef Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 08:57:55 +0800
Subject: [PATCH] 1.设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码) 4.启动点检单: 新增 子表界面 根据不同的点检类型,点击查看,弹出不同的数据(根据表头日期查询(按照当前月显示)) .工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制
---
WebTM/views/PublicPage/HSourceReportHtml.html | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index becd83c..fa278e8 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -95,7 +95,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" id="ICMOFilter_SPickMtrlStatus">
<label class="layui-form-label">棰嗘枡鐘舵��</label>
<div class="layui-input-block">
<select name="HPickMtrlStatus" id="HSPickMtrlStatus" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
@@ -107,33 +107,47 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
- </select>
+ <div class="layui-row" style="margin-top:5px;margin-left:40px;">
+ <div class="layui-inline" id="ICMOFilter_IsScheduling">
+ <label class="layui-form-label">鏄惁鎺掍骇</label>
+ <div class="layui-input-block">
+ <select name="HIsScheduling" id="HIsScheduling" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
+ <option value="">璇烽�夋嫨</option>
+ <option value="宸叉帓浜�" selected>宸叉帓浜�</option>
+ <option value="鏈帓浜�">鏈帓浜�</option>
+ </select>
+ </div>
</div>
</div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ <div class="layui-row" style="margin-top:5px;margin-left:40px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" 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 ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
</div>
</div>
- </div>
+ </div>
</div>
</div>
<table class="" id="layTable" lay-filter="layTable"></table>
@@ -214,6 +228,14 @@
//#endregion
+ //闅愯棌杩囨护瀛楁
+ if (HSouceBillType != "鐢熶骇璁㈠崟") {
+ document.getElementById("ICMOFilter_SPickMtrlStatus").style.display = "none";
+ document.getElementById("ICMOFilter_IsScheduling").style.display = "none";
+ document.getElementById("ICMOFilter_SPickMtrlStatus").style.visibility = 'hidden';
+ document.getElementById("ICMOFilter_IsScheduling").style.visibility = 'hidden';
+ }
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
//set_InitFrom();
@@ -247,14 +269,14 @@
}
else if (OperationType == 3) {//鏈夋簮鍗�
//get_FastQuery(HSouceBillType);
+ set_ClearBill(sWhere, HSouceBillType);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
- set_ClearBill(sWhere, HSouceBillType);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
-
+
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -440,8 +462,8 @@
, page: true //寮�鍚垎椤�
, totalRow: false //寮�鍚悎璁�
, cellMinWidth: 120
- , height: 520
- , limit: 50 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ , height: 'full-50'
+ , limit: 500 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
, limits: [50, 500, 5000, 20000]
, method: 'get' //鎻愪氦鏂瑰紡
, layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
@@ -507,9 +529,16 @@
if ($("#HBillStatus").val() != "") {
sWhere += " and 鐘舵�� = '" + $("#HBillStatus").val() + "'";
}
- if ($("#HSPickMtrlStatus").val() != "") {
- sWhere += " and 棰嗘枡鐘舵�� = '" + $("#HSPickMtrlStatus").val() + "'";
+ //鍒ゆ柇瀹㈡埛
+ if (sessionStorage["Organization"] == "涔濊彵鐢垫満") {
+ if ($("#HSPickMtrlStatus").val() != "") {
+ sWhere += " and 棰嗘枡鐘舵�� = '" + $("#HSPickMtrlStatus").val() + "'";
+ }
+ if ($("#HIsScheduling").val() != "") {
+ sWhere += $("#HIsScheduling").val() == "鏈帓浜�" ? "and 鏄惁鎺掍骇 = ''" : " and 鏄惁鎺掍骇 = '" + $("#HIsScheduling").val() + "'";
+ }
}
+
return sWhere;
break;
case '鐢熶骇姹囨姤鍗�':
@@ -585,7 +614,7 @@
if (HDeptName && HDeptName != 0) {
sWhere += " and HDeptID = '" + HDeptName + "'";
}
- if (HProcExchBillNo!="") {
+ if (HProcExchBillNo != "") {
sWhere += " and 娴佽浆鍗″彿 like '" + HProcExchBillNo + "%'";
}
return sWhere;
@@ -840,7 +869,8 @@
//鎵ц鏌ヨ鏂规硶
- get_FastQuery(HSouceBillType);
+ //get_FastQuery(HSouceBillType);
+ set_ClearBill(sWhere, HSouceBillType);
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
@@ -848,6 +878,7 @@
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
get_FastQuery(HSouceBillType);
+ set_ClearBill(sWhere, HSouceBillType);
form.render("select");
}
}, error: function () {
@@ -1059,7 +1090,7 @@
}
});
}
- //#endregion
+ //#endregion
</script>
--
Gitblit v1.9.1