From 727ee25aeb5fcaf84e2cf009b2eacd3a86bcb3ca Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 28 十一月 2024 12:55:23 +0800
Subject: [PATCH] 新增 环境检测方案,环境检测单
---
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 153 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 134 insertions(+), 19 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
index f08b48a..88acb19 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/Sc_StationOutBil_HProc.html"
@@ -61,6 +61,14 @@
</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;">
+ <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </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;">
<select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
@@ -69,24 +77,46 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
+ </select>
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" lay-verify="HDeptName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHDept" style="width:20px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
</div>
<div>
@@ -176,6 +206,38 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnHDept)', function () {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "閮ㄩ棬鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index]; //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable"); //鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ //鍒锋柊鍒楄〃
+ get_FastQuery();
+ }
+ })
+ });
+ //#endregion
//#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -203,6 +265,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
@@ -261,6 +324,31 @@
})
}
//#endregion
+
+ //#region 鑾峰彇椤圭洰鍙�
+ function Get_HProject() {
+ //鑾峰彇椤圭洰鍙�
+ var HProjectList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_HProject",
+ async: false,
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HProject").append(HProjectList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
//鏌ヨ
function get_Display(sWhere) {
@@ -342,16 +430,23 @@
function get_FastQuery() {
var HYear = $("#HYear").val();
var HMonth = $("#HMonth").val();
+ var HProject = $("#HProject").val();//椤圭洰鍙�
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
var HProcName = $("#HProcName").val();
- var HMaterName = $("#HMaterName").val();
-
+ var HMaterName = $("#HMaterName").val();
+ var HDeptID = $("#HDeptID").val();
+
+
sWhere = {
HYear: HYear
, HMonth: HMonth
, HDivisionName: HDivisionName
, HProcName: HProcName
, HMaterName: HMaterName
+ , HProject: HProject
+ , HBatchWork: HBatchWork
+ , HDeptID: HDeptID
}
get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�
@@ -367,7 +462,8 @@
$("#HProcName").val("");
$("#HMaterName").val("");
$("#HDivisionName").val("");
- $("#btnSearch").click();
+ $("#HProject").val("");
+ $("#HBatchWork").val("");
form.render('select');
sWhere = "";
@@ -427,8 +523,14 @@
var HBadCount = [];//涓嶈壇鏁伴噺
var HBackWorkQty = [];//杩斿伐鏁�
var FistPass = [];//涓�娆″悎鏍�
+ var HProcTarGetVal = [];//鍚勫伐搴忕洰鏍囧��
var Pass = [];//鍚堟牸
- var HTitle = "鍚勫伐搴忚秼鍔垮浘";//鍥惧舰鏍囬
+ var HTitle = "";//鍥惧舰鏍囬
+ if ($("#HProcName").val() == "") {
+ HTitle = "鍚勫伐搴忚秼鍔垮浘";
+ } else {
+ HTitle = $("#HProcName").val() + "瓒嬪娍鍥�";
+ }
if (option.data.length > 0) {
for (let i = 0; i < option.data.length; i++) {
H_X.push(option.data[i].鏃ユ湡);
@@ -442,7 +544,7 @@
HBackWorkQty.push(option.data[i].杩斿伐鏁�);
FistPass.push((option.data[i].涓�娆″悎鏍肩巼 == null ? '0.00%' : option.data[i].涓�娆″悎鏍肩巼 ).replace('%', ''));
Pass.push((option.data[i].鍚堟牸鐜� == null ? '0.00%' : option.data[i].鍚堟牸鐜�).replace('%', ''))
-
+ HProcTarGetVal.push(option.data[i].鍚勫伐搴忕洰鏍囧��);
}
}
option_ZZT = {
@@ -472,7 +574,7 @@
},
legend: {
- data: ['鐢熶骇鎬绘暟', '鑹搧鏁�', '涓嶈壇鏁�','杩斿伐鏁�','涓�娆″悎鏍肩巼','鍚堟牸鐜�'],
+ data: ['鐢熶骇鎬绘暟', '鑹搧鏁�', '涓嶈壇鏁�', '杩斿伐鏁�', '涓�娆″悎鏍肩巼', '鍚堟牸鐜�','鍚勫伐搴忕洰鏍囧��'],
top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
@@ -641,6 +743,19 @@
lineStyle: {
color: '#1E90FF' // 璁剧疆鎶樼嚎鍥捐摑鑹�
}
+ },
+ {
+ name: '鍚勫伐搴忕洰鏍囧��',
+ type: 'line',
+ yAxisIndex: 1, // 浣跨敤绗簩涓� yAxis 鏄剧ず鐧惧垎姣�
+ data: HProcTarGetVal,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ lineStyle: {
+ color: '#FF0000' // 璁剧疆鎶樼嚎鍥捐摑鑹�
+ }
}
]
};
--
Gitblit v1.9.1