From fa3ae99aff8d1727897455d2e53c98538208b177 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 26 八月 2024 17:37:25 +0800
Subject: [PATCH] 异常反馈单 :自动生产内容增加一个单据号, 设备启动点检,被下推的时候,子表为空就赋值0 修改制程绩效趋势图(合格率与一次合格率查询) 查询 现在人机料法环测全面追溯报表
---
WebTM/WebTM.csproj.user | 4
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 157 +++++++
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 811 ++++++++++++++++++++++++++++++++++++++
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 154 +++++++
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterType.html | 2
WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html | 55 ++
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 3
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 14
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 35
WebTM/WebTM.csproj | 1
11 files changed, 1,189 insertions(+), 49 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c48ac6..1ebb2ea 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_FiveMenOneRingList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 6cd52dd..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8f7ef38..0877cb1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
index 498a396..0390ba5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameterType.html"
@@ -279,7 +279,7 @@
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_BadReason/GechnologyTypeList',
- type: "GET", y_T
+ type: "GET",
async:false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index ce83246..132762d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -527,6 +527,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
@@ -1376,7 +1377,7 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber) {
// 鎷兼帴瀛楃涓�
- var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ var result = '寮傚父鍙嶉鍗曞彿:' + $("#HBillNo").val()+',寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
+ ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName + ',璁惧缂栫爜:' + EquipNumber;
return result;
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 1377bce..b4b4428 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"
@@ -538,7 +538,7 @@
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HTechParamID": result.data[i].HTechParamID
+ "HTechParamID": result.data[i].HTechParamID
, "HTechParamNumber": result.data[i].HTechParamNumber
, "HTechParamName": result.data[i].HTechParamName
, 'HTechParamUnitID': result.data[i].HTechParamUnitID
@@ -1421,16 +1421,16 @@
for (var i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HTechParamClassID": result.data[i]["HTechParamClassID"],
+ "HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamClassName": result.data[i]["宸ヨ壓鍙傛暟澶х被鍚嶇О"],
- "HTechParamID": result.data[i]["HTechParamID"],
+ "HTechParamID": result.data[i]["HTechParamID"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamNumber": result.data[i]["宸ヨ壓鍙傛暟浠ｇ爜"],
"HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"],
- "HTechParamUnitID": result.data[i]["HTechParamUnitID"],
+ "HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
- "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"],
- "HSNO": result.data[i]["宸ヨ壓娆″簭"],
- "HTechParamIDStd": result.data[i]["HTechParamIDStd"],
+ "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"] ,
+ "HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["HTechParamClassID"],
+ "HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamClassID"],
"HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
"HResultStd": "",
"HVaule": result.data[i]["鏁伴噰鍊�"],
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"
index 400a670..8634b46 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/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"
@@ -293,14 +293,10 @@
, 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 }
- , { field: '瀹為檯鍊�', title: '瀹為檯鍊�', sort: true }
+ , { field: '鏁伴噰鍊�', title: '鏁伴噰鍊�', sort: true }
]]
};
@@ -313,7 +309,7 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/QC_CustomerAppealReport/SB_EquipICMOTechParamList',
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList',
type: "GET",
async:false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -461,17 +457,21 @@
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));
+
+ if (HEquipNumber) {
+ sWhere += " and 璁惧缂栫爜 = '" + HEquipNumber + "'";
+ }
+ if (HTechParamName) {
+ sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) = '" + HDate + "'";
+ }
+ if (HEquipNumber != "" || HTechParamName!="") {
+ get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
@@ -603,7 +603,7 @@
}
//#endregion
- //宸ュ簭娴佽浆鍗″脊绐�
+ //璁惧寮圭獥
form.on('submit(btnHEquip)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
@@ -627,7 +627,6 @@
$("#HEquipNumber").val(checkStatus.data[0].璁惧缂栫爜);
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- get_EquipList();
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
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_FiveMenOneRingList.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_FiveMenOneRingList.html"
new file mode 100644
index 0000000..f05c2b1
--- /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_FiveMenOneRingList.html"
@@ -0,0 +1,811 @@
+锘�<!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/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <style>
+ .layui-tab-title .layui-this {
+ background-color: #f1f1f1; /* 閫変腑鐨勯〉绛捐儗鏅壊 */
+ color: #333; /* 閫変腑鐨勯〉绛炬枃瀛楅鑹� */
+ }
+ </style>
+
+</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">SN鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="SN" id="SN" style="width:300px;">
+ </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>
+ <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 ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterModel" id="HMaterModel" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓绘祦杞崱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo" style="background-color: #efefef4d; width: 215px; display: inline-block;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs5 layui-inline" style="margin-top:20px;">
+ <div class="layui-tab-item layui-show" style="height:800px">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ <div class="layui-col-xs7 layui-inline" style="margin-top:20px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">浜�</li>
+ <li>鏈�</li>
+ <li>鏂�</li>
+ <li>娉�</li>
+ <li>鐜�</li>
+ <li>娴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--浜�-->
+ <table class="layui-hide" id="mainTable_Man" lay-filter="mainTable_Man"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏈�-->
+ <table class="layui-hide" id="mainTable_Machine" lay-filter="mainTable_Machine"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鏂�-->
+ <table class="layui-hide" id="mainTable_Material" lay-filter="mainTable_Material"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娉�-->
+ <table class="layui-hide" id="mainTable_Method" lay-filter="mainTable_Method"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鐜�-->
+ <table class="layui-hide" id="mainTable_Environments" lay-filter="mainTable_Environments"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--娴�-->
+ <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], 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
+ , util = layui.util
+ , soulTable = layui.soulTable
+ var sWhere = "";
+ var option = ""; //浜�
+ var option_Man = ""; //浜�
+ var option_Machine = ""; //鏈�
+ var option_Material = ""; //鏂�
+ var option_Method = ""; //娉�
+ var option_Environments = ""; //鐜�
+ var option_Measure = ""; //娴�
+ var ins;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //
+ var HModName = "QC_FiveMenOneRingList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜汉锛�
+ var titleData = ["涓绘祦杞崱id", "閰嶄欢娴佽浆鍗d", "鎴愬搧鐗╂枡id", "閰嶄欢鐗╂枡id"];
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ if ($('#SN').val() == "") {
+ layer.msg("璇峰厛杈撳叆SN鍚� ");
+ return;
+ }
+ get_FastQuery();//鏌ヨ
+ });
+ //#endregion
+
+ //#region SN鐮佸洖杞︽柟娉�
+ $('#HICNumber').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ get_FastQuery();//鏌ヨ
+ }
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ function set_ClearBill() {
+ //鍒濆鍖栧乏鍒楄〃
+ set_InitGrid();
+ //鍒濆鍖栦汉鍒楄〃
+ set_InitGrid_Man();
+ //鍒濆鍖栨満
+ set_InitGrid_Machine();
+ //鍒濆鍖栨枡鍒楄〃
+ set_InitGrid_Material();
+ //鍒濆鍖栨硶鍒楄〃
+ set_InitGrid_Method();
+ //鍒濆鍖栫幆
+ set_InitGrid_Environments();
+ //鍒濆鍖栨祴鍒楄〃
+ set_InitGrid_Measure();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery( ) {
+
+ var SN = $("#SN").val(); //SN鐮�
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HMaterModel = $("#HMaterModel").val();//瑙勬牸鍨嬪彿
+ var HProcExchBillNo = $("#HProcExchBillNo").val();//涓绘祦杞崱鍙�
+ var HICMOBillNo = $("#HICMOBillNo").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 (SN) {
+ // sWhere += " and 鍞竴鐮� like '%" + SN + "%'";
+ //}
+ //if (HMaterNumber) {
+ // sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ //}
+ //if (HMaterName) {
+ // sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ //}
+ //if (HMaterModel) {
+ // sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
+ //}
+ //if (HProcExchBillNo) {
+ // sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ //}
+ //if (HICMOBillNo) {
+ // sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ //}
+
+ get_Display(SN);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#SN").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HICMOBillNo").val("");
+
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栭〉闈�
+
+ //鍒濆鍖栧乏渚у垪琛�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 660
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '涓绘祦杞崱id', title: '涓绘祦杞崱id', sort: true, hide: true }
+ // , { field: '涓绘祦杞崱', title: '涓绘祦杞崱', sort: true }
+ // , { field: '涓荤敓浜ц鍗�', title: '涓荤敓浜ц鍗�', sort: true }
+ // , { field: '閰嶄欢娴佽浆鍗d ', title: '閰嶄欢娴佽浆鍗d ', sort: true, hide: true }
+ // , { field: '閰嶄欢娴佽浆鍗� ', title: '閰嶄欢娴佽浆鍗� ', sort: true }
+ // , { field: '閰嶄欢鐢熶骇璁㈠崟 ', title: '閰嶄欢鐢熶骇璁㈠崟 ', sort: true }
+ // , { field: '鎴愬搧鐗╂枡id ', title: '鎴愬搧鐗╂枡id ', sort: true, hide: true }
+ // , { field: '鎴愬搧鐗╂枡浠ｇ爜 ', title: '鎴愬搧鐗╂枡浠ｇ爜 ', sort: true }
+ // , { field: '鎴愬搧鐗╂枡 ', title: '鎴愬搧鐗╂枡 ', sort: true }
+ // , { field: '鎴愬搧瑙勬牸鍨嬪彿 ', title: '鎴愬搧瑙勬牸鍨嬪彿 ', sort: true }
+ // , { field: '閰嶄欢鐗╂枡id ', title: '閰嶄欢鐗╂枡id ', sort: true, hide: true }
+ // , { field: '閰嶄欢鐗╂枡浠ｇ爜 ', title: '閰嶄欢鐗╂枡浠ｇ爜 ', sort: true }
+ // , { field: '閰嶄欢鐗╂枡 ', title: '閰嶄欢鐗╂枡 ', sort: true }
+ // , { field: '閰嶄欢瑙勬牸鍨嬪彿 ', title: '閰嶄欢瑙勬牸鍨嬪彿 ', sort: true }
+ //]
+ ]
+ ,data:[]
+ };
+ }
+
+ //鍒濆鍖栦汉鍒楄〃
+ function set_InitGrid_Man() {
+ option_Man = {
+ elem: '#mainTable_Man'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //鍒濆鍖栨満鍒楄〃
+ function set_InitGrid_Machine() {
+ option_Machine = {
+ elem: '#mainTable_Machine'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //鍒濆鍖栨枡鍒楄〃
+ function set_InitGrid_Material() {
+ option_Material = {
+ elem: '#mainTable_Material'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //鍒濆鍖栨硶鍒楄〃
+ function set_InitGrid_Method() {
+ option_Method = {
+ elem: '#mainTable_Method'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ , height: 600
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //鍒濆鍖栫幆鍒楄〃
+ function set_InitGrid_Environments() {
+ option_Environments = {
+ elem: '#mainTable_Environments'
+ , page: false
+ , height: 600
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //鍒濆鍖栨祴鍒楄〃
+ function set_InitGrid_Measure() {
+ option_Measure = {
+ elem: '#mainTable_Measure'
+ , page: false
+ , height: 600
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , cols: [
+ //[
+ // { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
+ // , { field: '鍗曟嵁涓籭d', title: '鍗曟嵁涓籭d', sort: true, hide: true }
+ // , { field: '妯″潡鍚嶇О ', title: '妯″潡鍚嶇О ', sort: true }
+ //]
+ ]
+ , data: []
+ };
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(SN) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList',
+ type: "GET",
+ data: { "SN": SN, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ var Listcol = [];
+ for (var i = 0; i < data1.list.length; i++) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list[i].Columns) {
+ data.push({ "id": data1.list[i].Columns[key].ColmCols, "name": data1.list[i].Columns[key].ColmCols, "Type": data1.list[i].Columns[key].ColmType });
+ }
+ var col = [];
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var j = 0; j < data.length; j++) {
+ if ($.inArray(data[j].name, titleData) > -1) {
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, templet: "<div>{{d." + data[j].name + " ==null ?'':layui.util.toDateString(d." + data[j].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ Listcol.push(col);
+ }
+
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[0]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ option_Man = {
+ elem: '#mainTable_Man'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Man);
+
+ option_Machine = {
+ elem: '#mainTable_Machine'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Machine);
+
+ option_Material = {
+ elem: '#mainTable_Material'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Material);
+
+ option_Method = {
+ elem: '#mainTable_Method'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Method);
+
+ option_Environments = {
+ elem: '#mainTable_Environments'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Environments);
+
+ option_Measure = {
+ elem: '#mainTable_Measure'
+ , toolbar: '#toolbarDemo'
+ , cols: [Listcol[1]]
+ , data: data1.data.h_p_QC_FiveMenOneRingList1
+ , height: 'full-80'
+ , cellMinWidth: 90
+ }
+ table.render(option_Measure);
+
+ $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧鐗╂枡);
+ $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].鎴愬搧瑙勬牸鍨嬪彿);
+ $("#HProcExchBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].涓绘祦杞崱);
+ $("#HICMOBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].涓荤敓浜ц鍗�);
+
+ layer.close(ajaxLoad);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ // 鑾峰彇鏍囩
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+
+ //#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",
+ 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);
+ form.render('select');
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
index 5bb6777..8a8580a 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/QC_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
@@ -38,11 +38,59 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿</label>
+ <div class="layui-input-block" style="width: 190px;">
+ <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
+ <!--鍔ㄦ�佹覆鏌撻儴闂�-->
+ </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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
+ </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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
+ <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;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ </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 ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ </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">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
@@ -244,6 +292,9 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
+ DeptName();//鍒濆鍖栬溅闂�
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
//鍔犺浇鏌辩姸鍥�
@@ -353,6 +404,12 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
+ var HDeptName = $("#HDeptName").val();//杞﹂棿
+ var HProject = $("#HProject").val();//椤圭洰鍙�
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -428,19 +485,31 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HYear) {
- sWhere += " and HYear = '" + HYear + "'";
+
+ sWhere = {
+ HYear: HYear
+ , HDeptName: HDeptName
+ , HProject: HProject
+ , HMaterNumber: HMaterNumber
+ , HMaterName: HMaterName
+ , HBatchWork: HBatchWork
+ , HDivisionName: HDivisionName
}
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�,鎶樼嚎鍥�
set_Graphics();
set_Graphics1();
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
+ $("#HDeptName").val("0");
+ $("#HProject").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HBatchWork").val("");
+ $("#HDivisionName").val("");
$("#btnSearch").click();
$("#ColContent").val("");
@@ -802,6 +871,83 @@
}
//#endregion
+ //鐢熶骇杞﹂棿
+ function DeptName() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ 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++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#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
+
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮�
+ var HDivisionList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ 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++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionName").append(HDivisionList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
@@ -859,6 +1005,7 @@
})
}
//#endregion
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
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_ProcessPerformancePass.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_ProcessPerformancePass.html"
index 8a13d45..fed524e 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/QC_ProcessPerformancePass.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_ProcessPerformancePass.html"
@@ -38,11 +38,59 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿</label>
+ <div class="layui-input-block" style="width: 190px;">
+ <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
+ <!--鍔ㄦ�佹覆鏌撻儴闂�-->
+ </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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">閲忎骇</option>
+ <option value="0">闈為噺浜�</option>
+ </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="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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>
+ <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;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
+ </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 ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ </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">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
@@ -244,6 +292,9 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
+ DeptName();//鍒濆鍖栬溅闂�
+ Get_HProject(); //鑾峰彇椤圭洰鍙�
+ GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
//鍔犺浇鏌辩姸鍥�
@@ -351,6 +402,13 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
+ var HDeptName = $("#HDeptName").val();//杞﹂棿
+ var HProject = $("#HProject").val();//椤圭洰鍙�
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
+ var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -426,10 +484,16 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HYear) {
- sWhere += " and HYear = '" + HYear + "'";
+ sWhere = {
+ HYear: HYear
+ , HDeptName: HDeptName
+ , HProject: HProject
+ , HMaterNumber: HMaterNumber
+ , HMaterName: HMaterName
+ , HBatchWork: HBatchWork
+ , HDivisionName: HDivisionName
}
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
//鍔犺浇鏌辩姸鍥�
set_Graphics();
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -438,6 +502,12 @@
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
+ $("#HDeptName").val("0");
+ $("#HProject").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HBatchWork").val("");
+ $("#HDivisionName").val("");
$("#btnSearch").click();
$("#ColContent").val("");
@@ -623,6 +693,82 @@
}
//#endregion
+ //鐢熶骇杞﹂棿
+ function DeptName() {
+ //鑾峰彇杞﹂棿鍒�
+ var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ 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++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+
+ }
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#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
+
+ //#region 鑾峰彇浜嬩笟閮�
+ function GetGy_Division() {
+ //鑾峰彇浜嬩笟閮�
+ var HDivisionList = '<option value="" style="color:red;" selected></option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
+ 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++) {
+ HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
+ }
+ $("#HDivisionName").append(HDivisionList);
+ form.render('select');
+
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
//#region 瀵煎嚭Execel
function get_Export() {
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_TechnologyParameterClass.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_TechnologyParameterClass.html"
index d80e828..4d742b3 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/QC_TechnologyParameterClass.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_TechnologyParameterClass.html"
@@ -41,6 +41,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="HBatchNo" id="HBatchNo" 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="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
@@ -52,7 +58,7 @@
<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>
+ <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>
@@ -71,9 +77,27 @@
</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;">璁惧</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
+ <input type="text" class="layui-input" name="HEquipName" id="HEquipName" value="" readonly>
+ </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="HMouldNumber" id="HMouldNumber" value="" readonly>
+ </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="HMouldName" id="HMouldName" value="" readonly>
</div>
</div>
</div>
@@ -501,14 +525,16 @@
var chartDom = document.getElementById('histogram');
var myChart = echarts.init(chartDom);
var option_ZZT;
-
+ var HTitle1 = "宸ュ崟:" + $("#HProcExchBillNo").val() + ",鎵规鍙�:" + $("#HBatchNo").val() + ",璁惧:" + $("#HEquipNumber").val() + ",妯″叿:" + $("#HMouldName").val() + "";
+ var HTitle2 = "宸ヨ壓鍙傛暟涓�:" + $("#HTechParamName").val() + "鐨勮秼鍔垮垎鏋愬浘";
//鎶樼嚎鍥剧粦瀹氭暟鎹�
var H_X = [];//X杞存爣棰�
var HVaule = [];//瀹為檯鍊�
var HStd = [];//鏍囧噯鍊�
var HMax = [];//涓婄嚎鍊�
var HMin = [];//涓嬮檺鍊�
- var HTitle = "璁惧宸ヨ壓鍙傛暟澶х被瓒嬪娍鍥�";//鍥惧舰鏍囬
+ var HTitle = HTitle1;//涓绘爣棰�
+ var HTitles = HTitle2;//鍓爣棰�
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].宸ヨ壓娆″簭);
@@ -523,10 +549,14 @@
}
}
option_ZZT = {
- title: {
+ title: [{
text: HTitle,
- left: 'center'
- },
+ left: 'center'
+ }, {
+ subtext: HTitles,
+ left: 'center',
+ top: '5%'
+ }],
tooltip: {
trigger: 'axis'
},
@@ -557,7 +587,10 @@
],
yAxis: [
{
- type: 'value'
+ type: 'value',
+ min: parseInt($("#HMin").val(), 10) - 10, // 璁剧疆鏈�灏忓��
+ max: parseInt($("#HMax").val(), 10) + 10, // 璁剧疆鏈�澶у��
+ interval: Math.floor(((parseInt($("#HMax").val(), 10) + 10) - (parseInt($("#HMin").val(), 10) - 10))/10) // 璁剧疆闂磋窛
}
],
series: [
@@ -694,7 +727,7 @@
}
$("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
- $("#HProcName").val(checkStatus.data[0].褰撳墠宸ュ簭);
+ $("#HBatchNo").val(checkStatus.data[0].鎵规鍙�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_EquipList();
}
@@ -797,8 +830,10 @@
success: function (result) {
if (result.count == 1) {
var data = result.data;
+ $("#HEquipNumber").val(data[0]["HEquipFileNumber"]);
$("#HEquipName").val(data[0]["HName"]);
-
+ $("#HMouldNumber").val(data[0]["HMouldNumber"]);
+ $("#HMouldName").val(data[0]["HMouldName"]);
} else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
--
Gitblit v1.9.1