From 6a33f04e34add8b1f8d8ad576599e97060069863 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 20 八月 2024 12:34:54 +0800
Subject: [PATCH] 工序出站汇报单增加下推不良评审处理单,不良评审处理单增加选源单工序出站汇报单,设备工艺参数点检,班组或部门为空赋0,各工序质量趋势图把工序输入改为选择
---
WebTM/WebTM.csproj.user | 5
WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html | 47 ++
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdDisposeBillMain.html | 127 ++++++
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 4
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 862 +++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 32 +
WebTM/WebTM.csproj | 1
8 files changed, 1,071 insertions(+), 13 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9537646..a275595 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -448,6 +448,7 @@
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ヤ綔鑱旂郴鍗昞OA_WorkLinkSelfQuery.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 65037ad..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ece0025..4c205c4 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,10 +10,8 @@
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
- /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; */ //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMain.html"
index ce52b08..3d72ec2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdDisposeBillMain.html"
@@ -301,9 +301,10 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷:</label>
<div class="layui-input-inline">
- <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType" >
+ <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
<option value="" selected="selected"></option>
<option value="7512">涓嶈壇鍝佽瘎瀹＄敵璇峰崟</option>
+ <option value="3791">宸ュ簭鍑虹珯姹囨姤鍗�</option>
</select>
</div>
</div>
@@ -614,6 +615,63 @@
}
+ //鏈夋簮鍗曟柊澧�-鍑虹珯鍗曚笅鎺�
+ function set_AddNew() {
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
+ $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ if (HSouceBillType =="3791") {
+ $.ajax({
+ url: GetWEBURL() + "Sc_ProcessMangement/Get_Sc_StationOutBill",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HMainSourceBillNo": data[0]["鍗曟嵁鍙�"]
+ , "HMainSourceInterID": data[0]["hmainid"]
+ , "HBillNos": data[0]["鍗曟嵁鍙�"]
+ , "HDates": formatDate(data[0]["鏃ユ湡"])
+ , "HICMOBillNos": data[0]["浠诲姟鍗�"]
+ , "HICMOInterIDs": data[0]["HICMOInterID"]
+ , "HICMOEntryIDs": data[0]["HICMOEntryID"]
+ , "HProcExchBillNos": data[0]["宸ュ簭娴佽浆鍗″彿"]
+ , "HProcExchInterIDs": data[0]["HProcExchInterID"]
+ , "HProcExchEntryIDs": data[0]["HProcExchEntryID"]
+ , "HHappendDates": Pub_Format(data[0]["鏃ユ湡"], "yyyy-MM-dd hh:mm:ss")
+ , "HMaterIDs": data[0]["HMaterID"]
+ , "HMaterNumbers": data[0]["浜у搧浠ｇ爜"]
+ , "HMaterNames": data[0]["浜у搧鍚嶇О"]
+ , "HMaterModels": data[0]["瑙勬牸鍨嬪彿"]
+ , "HUnitIDs": data[0]["HUnitID"]
+ , "HUnitNames": data[0]["璁￠噺鍗曚綅"]
+
+ , "HUnRightQtys": data[0]["涓嶈壇鏁伴噺"]
+ , "HProcIDs": data[0]["HProcID"]
+ , "HProcNames": data[0]["褰撳墠宸ュ簭"]
+ });
+ $('#HMainSourceBillType').find("option[value='" + data[0]["HSouceBillType"] + "']").attr("selected", true);
+ form.render('select');
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
+
//缂栬緫
function set_EditFromGrid() {
@@ -806,7 +864,7 @@
var HMainSourceBillType = $("#HMainSourceBillType").val();
if (HMainSourceBillType == null || HMainSourceBillType == '') {
layer.msg("璇烽�夋嫨婧愬崟")
- } else {
+ } else if (HMainSourceBillType=="7512") {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -871,6 +929,71 @@
}
});
+ } else if (HMainSourceBillType =="3791") {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓嶈壇鍝佽瘎瀹＄敵璇峰崟鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HBillNos").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HDates").val(formatDate(checkStatus.data[0].鏃ユ湡));
+ $("#HICMOBillNos").val(checkStatus.data[0].浠诲姟鍗�);
+ $("#HICMOInterIDs").val(checkStatus.data[0].HICMOInterID);
+ $("#HICMOEntryIDs").val(checkStatus.data[0].HICMOEntryID);
+ $("#HProcExchBillNos").val(checkStatus.data[0].宸ュ簭娴佽浆鍗″彿);
+ $("#HProcExchInterIDs").val(checkStatus.data[0].HProcExchInterID);
+ $("#HProcExchEntryIDs").val(checkStatus.data[0].HProcExchEntryID);
+ $("#HHappendDates").val(Pub_Format(checkStatus.data[0].鏃ユ湡, "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaterIDs").val(checkStatus.data[0].HMaterID);
+ $("#HMaterNumbers").val(checkStatus.data[0].浜у搧浠ｇ爜);
+ $("#HMaterNames").val(checkStatus.data[0].浜у搧鍚嶇О);
+ $("#HMaterModels").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+ $("#HUnitIDs").val(checkStatus.data[0].HUnitID);
+ $("#HUnitNames").val(checkStatus.data[0].璁￠噺鍗曚綅);
+ /* $("#HMaterTypes").val(checkStatus.data[0].浜у搧绫诲瀷);*/
+ $("#HUnRightQtys").val(checkStatus.data[0].涓嶈壇鏁伴噺);
+ //$("#HDeptIDs").val(checkStatus.data[0].HDeptID);
+ //$("#HDeptNames").val(checkStatus.data[0].杞﹂棿鍚嶇О);
+ $("#HProcIDs").val(checkStatus.data[0].HProcID);
+ $("#HProcNames").val(checkStatus.data[0].褰撳墠宸ュ簭);
+ //$("#HBadPhenomenaNames").val(checkStatus.data[0].涓嶈壇鐜拌薄);
+ //$("#HBadPhenomenaIDs").val(checkStatus.data[0].HBadPhenomenaID);
+ //$("#HBarCodes").val(checkStatus.data[0].涓嶈壇鍝丼N鐮�);
+ //$("#HSeOrderBillNos").val(checkStatus.data[0].閿�鍞鍗�);
+ //$("#HReasonNotes").val(checkStatus.data[0].闂鐜拌薄绠�杩�);
+ //$('#HLevs').find("option[value='" + checkStatus.data[0].绱ф�ョ▼搴� + "']").attr("selected", true);
+ //$('#HIsStops').find("option[value='" + checkStatus.data[0].鏄惁鍋滅嚎 + "']").attr("selected", true);
+ //$('#HIsBatchUnRights').find("option[value='" + checkStatus.data[0].鏄惁鎵归噺闂 + "']").attr("selected", true);
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
}
});
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index b04c729..1377bce 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -1392,9 +1392,9 @@
"HProcID": data.HProcID,
"HProcName": data.宸ュ簭鍚嶇О,
"HProcNo": data.宸ュ簭鍙�,
- "HGroupID": data.HGroupID,
+ "HGroupID": data.HGroupID == undefined ? 0 : data.HGroupID,
"HGroupName": data.鐝粍,
- "HDeptID": data.HDeptID,
+ "HDeptID": data.HDeptID == undefined ? 0 : data.HDeptID,
"HDeptName": data.鍔犲伐杞﹂棿,
"HSourceID": data.HSourceID,
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/QC_EquipMentCollectionTechParam.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/QC_EquipMentCollectionTechParam.html"
new file mode 100644
index 0000000..400a670
--- /dev/null
+++ "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/QC_EquipMentCollectionTechParam.html"
@@ -0,0 +1,862 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </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="HEquipNumber" id="HEquipNumber" value="" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</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: 75%; 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 class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" lay-verify="HTechParamName" name="HTechParamName" id="HTechParamName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHTechParam" id="btnHTechParam" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ <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>
+
+ </div>
+
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <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="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" 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 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>
+ <div>
+ <div style="width:99%;height:calc(100vh);">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "SB_TechnologyParameterList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["骞�", "鏈�", "宸ュ簭"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ $("#HDate").val(Format(new Date, "yyyy-MM-dd"));
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+ get_FastQuery();
+ ////鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , data: []
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ , { field: '璁惧缂栫爜', title: '璁惧缂栫爜', sort: true }
+ , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟', sort: true }
+ , { field: '鍗曚綅 ', title: '鍗曚綅 ',sort: true }
+ , { field: '涓婇檺鍊�', title: '涓婇檺鍊�', sort: true }
+ , { field: '鏍囧噯鍊�', title: '鏍囧噯鍊�', sort: true }
+ , { field: '涓嬮檺鍊�', title: '涓嬮檺鍊�', sort: true }
+ , { field: '瀹為檯鍊�', title: '瀹為檯鍊�', sort: true }
+
+ ]]
+ };
+ table.render(option)
+ }
+
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ 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 {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鍔犺浇鎶樼嚎鍥�
+ set_Graphics();
+
+ layer.close(ajaxLoad);
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HEquipNumber = $("#HEquipNumber").val();
+ var HEquipName = $("#HEquipName").val();
+ var HProcName = $("#HProcName").val();
+ var HTechParamName = $("#HTechParamName").val();
+ var HDate = $("#HDate").val();
+
+ var ColName = $("#ColName").val();//澶嶉�夋
+ 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) {
+ 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;
+ }
+ 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 (HEquipNumber != "" && HEquipName != "" && HProcName != "" && HTechParamName != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HEquipName: HEquipName
+ , HProcName: HProcName
+ , HTechParamName: HTechParamName
+ , HDate: HDate
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HEquipNumber").val("");
+ $("#HEquipName").val("");
+ $("#HTechParamName").val("");
+ $("#HProcName").val("");
+ $("#HDate").val(Format(new Date, "yyyy-MM-dd"));
+
+ $("#btnSearch").click();
+ $("#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 = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 銆愭姌绾垮浘銆�
+ function set_Graphics() {
+ var chartDom = document.getElementById('histogram');
+ var myChart = echarts.init(chartDom);
+ var option_ZZT;
+
+ //鎶樼嚎鍥剧粦瀹氭暟鎹�
+ var H_X = [];//X杞存爣棰�
+ var HVaule = [];//瀹為檯鍊�
+ var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�";//鍥惧舰鏍囬
+ if (option.data.length > 0) {
+ for (let i = 0; i < option.data.length ; i++) {
+ H_X.push(option.data[i].閲囬泦鏃ユ湡);
+ }
+ // 濉厖鏁版嵁
+ for (let i = 0; i < option.data.length; i++) {
+
+ HVaule.push(option.data[i].鏁伴噰鍊�);
+ }
+ }
+ option_ZZT = {
+ title: {
+ text: HTitle,
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['鏁伴噰鍊�'],
+ top: 'bottom',
+ left: 'center'
+ },
+ toolbox: {
+ show: true,
+ orient: 'vertical',
+ left: 'right',
+ top: 'center',
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ magicType: { show: true, type: ['line', 'bar', 'stack'] },
+ restore: { show: true },
+ saveAsImage: { show: true }
+ }
+ },
+ xAxis: [
+ {
+ type: 'category',
+ axisTick: { show: false },
+ data: H_X
+ }
+ ],
+ yAxis: [
+ {
+ type: 'value'
+ }
+ ],
+ series: [
+ {
+ name: '鏁伴噰鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ data: HVaule
+ }
+ ]
+ };
+
+
+ option_ZZT && myChart.setOption(option_ZZT);
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //宸ュ簭娴佽浆鍗″脊绐�
+ form.on('submit(btnHEquip)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧妗ｆ鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipNumber").val(checkStatus.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ get_EquipList();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //宸ヨ壓鍙傛暟
+ form.on('submit(btnHTechParam)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
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 791b048..b013925 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"
@@ -67,9 +67,12 @@
</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="HProcName" id="HProcName">
+ <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>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -504,6 +507,43 @@
$("#btnSearch").trigger('click');
}
+ //宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//#region 銆愭煴鐘跺浘銆�
function set_Graphics() {
var chartDom = document.getElementById('histogram');
@@ -796,6 +836,7 @@
})
}
//#endregion
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 76d646c..babad37 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -189,6 +189,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck">宸ュ簭妫�楠�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-NoPassProd" id="btn-NoPassProd">涓嬫帹涓嶈壇鍝佽瘎瀹″鐞嗗崟</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>-->
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>榛樿鍒楀</button>-->
@@ -679,6 +680,9 @@
break;
//宸ュ簭妫�
case 'btn-ProcessCheck': set_ProcessCheck();
+ break;
+ //涓嬫帹宸ュ簭鍑虹珯姹囨姤鍗�
+ case 'btn-NoPassProd': set_NoPassProd();
break;
//棰勮
case 'btn-Cell': layer.msg('棰勮锛�');
@@ -1472,6 +1476,34 @@
}
}
+ //涓嬫帹涓嶈壇鍝佽瘎瀹″鐞嗗崟
+ function set_NoPassProd() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=&HSouceBillType=3791', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鏂板鍗曟嵁
function set_AddNew() {
layer.open({
--
Gitblit v1.9.1