From 479cb8fde695f8eb92a37d0b8ceaf7fcfd728a80 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 22 八月 2023 16:34:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/产线组装追溯/Cj_AssemblyTraceability.html | 569 ++++
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 50
WebTM/views/Baseset/基础资料/Gy_InspectInstruMentList.html | 118
WebTM/views/系统管理/用户管理/Xt_UserList.html | 6
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 49
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 58
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 24
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 242 +
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html | 6
WebTM/views/车间管理/产线组装追溯/Cj_AssemblyTraceabilityList.html | 764 +++++
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html | 6
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 2195 ++++++++++++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 87
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 858 +++++-
WebTM/views/index.html | 9
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 4
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html | 6
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 644 ++--
WebTM/views/计划管理/工艺路线/Gy_RoutingBillSubList.html | 832 ++++++
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 3
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html | 10
WebTM/views/PublicPage/HSourceReportHtml.html | 15
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html | 6
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html | 2
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 62
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 225 -
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html | 540 ++++
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSet.html | 390 ++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html | 6
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 6
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 8
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 21
WebTM/WebTM.csproj | 6
35 files changed, 7,041 insertions(+), 794 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e7fb324..b0ed863 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -119,6 +119,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectInstruMentList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectValueList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
@@ -251,6 +252,8 @@
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘MaterialShorAnalysisReport.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
@@ -260,6 +263,9 @@
<Content Include="views\璁″垝绠＄悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html"
new file mode 100644
index 0000000..8d6d4a6
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html"
@@ -0,0 +1,118 @@
+锘�<!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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ //寮曠敤鐨勫崟鎹強妯″潡锛氶浠舵楠屽崟銆�
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ var titleData = ["HItemID", "HUSEORGID","HCREATEORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ form.on('submit(HQuery)', function () {
+ //var sMainStr = JSON.stringify(table.cache['mainTable']);
+ RoadQuery($('#Value').val());
+ });
+ RoadQuery($('#Value').val());
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var ajaxLoad = layer.load();
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/Web/GetGy_InspectInstruMent',
+ type: "GET",
+ data: { "InspectInstruMent": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+ 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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ 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-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ };
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 2e61ae0..9d21aa2 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -478,6 +478,21 @@
}
return sWhere;
break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ return sWhere;
+ break;
case '閫�璐ч�氱煡鍗�':
return sWhere;
break;
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index a1e10dd..e67e69b 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -366,7 +366,7 @@
<a>鎶ヨ〃</a>
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>-->
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/MaterialShorAnalysisReport.html" style="margin: 0 0 0 13px;">缂烘枡鍒嗘瀽鎶ヨ〃</a></dd>
@@ -555,6 +555,13 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>浜х嚎缁勮杩芥函</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceability.html">浜х嚎缁勮杩芥函鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎缁勮杩芥函/Cj_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍒楄〃</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 璐ㄩ噺绠＄悊 -->
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
index 1a876ee..74098e8 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_FastList.html"
@@ -266,8 +266,8 @@
}else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1207'
$.ajax(
{
@@ -308,7 +308,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index ff2ebb8..e7ce3e2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -226,6 +226,7 @@
//鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
element.on('tab(tab-TabTest)', function (data) {
+ HMaterInfo = table.cache['mainTable'];
var cur_title = data.elem.context.innerText;
if (cur_title == "鐗╂枡淇℃伅") {
HModName = "Gy_BarCodeBill";
@@ -1414,7 +1415,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 63cbbe6..5bec0ab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -492,9 +492,9 @@
if (Source) {
sWhere += " and 鐢熶骇璧勬簮 like '%" + Dept + "%'";
}
- if (HOrgID) {
- sWhere += " and HOrgID = '" + HOrgID + "'";
- }
+ //if (HOrgID) {
+ // sWhere += " and HOrgID = '" + HOrgID + "'";
+ //}
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
index 3917e5e..fef3f11 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList.html"
@@ -177,8 +177,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));
//鐢熶骇缁勭粐鍔犺浇
Organ();
////鍒濆鍖栬〃鏍�
@@ -200,7 +200,7 @@
columns.push({ field: '渚涘簲鍟�', title: '渚涘簲鍟�' });
columns.push({ field: 'FSUMQTY', title: '鍚堣' });
columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�' });
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�' });
+ columns.push({ field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿' });
columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
@@ -345,8 +345,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMATERIALID").val("");//鐗╂枡/浜у搧
$("#HMATERIALNAME").val("");
$("#HSUPPLIERID").val("");//渚涘簲鍟�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index 492c631..92eb6d4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -160,12 +160,11 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -174,12 +173,6 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐' });
@@ -195,11 +188,37 @@
columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
- }
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
@@ -245,7 +264,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList_S',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], HBEGINDATE: $("#HBEGINDATE").val(), HENDDATE: $("#HENDDATE").val() },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -281,6 +300,10 @@
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
+
if (HORGID != "") {
sWhere += " and a.HPURCHASEORGID= " + HORGID+" ";
}
@@ -300,7 +323,8 @@
if (HPURORDERNO) {
sWhere += " and HPOOrderBillNo like''%" + HPURORDERNO + "%'' ";
}
-
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(sWhere);
sWhere = " where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -309,8 +333,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMATERIALID").val("");//鐗╂枡/浜у搧
$("#HMATERIALNAME").val("");
$("#HSUPPLIERID").val("");//渚涘簲鍟�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index d102302..4e44a7c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -146,12 +146,11 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -160,12 +159,6 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
columns.push({ type: 'checkbox', fixed: 'left' });
columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐' });
@@ -178,11 +171,37 @@
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd + (SumMonth - MonthCount)); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i - (SumMonth - MonthCount)), 'MM.dd'), width: 70 })//0
- }
- for (var i = 1; i <= dd; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ //鑾峰彇骞�
+ var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
columns.push({ field: '', title: '璁″垝鏄庣粏_鍚堣' });
@@ -261,6 +280,9 @@
var HENDDATE = $("#HENDDATE").val();//鑷�
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
sWhere = {
HORGID: HORGID
@@ -269,6 +291,8 @@
, HMATERIALID: HMATERIALID
, HDeptID: HDeptID
}
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -277,8 +301,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
$("#HMATERIALID").val("");//鐗╂枡/浜у搧
$("#HMATERIALNAME").val("");
$("#HDeptID").val("");//鐢熶骇杞﹂棿
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 310fd12..4ad9c91 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -255,16 +255,27 @@
$.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].HItemID + '" >' + data[i].HName + '</option>';
- else
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ if (i == 0)
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ else
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
}
$("#HDeptName").append(HDeptName);
if (!isNaN(HDeptID)) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html"
new file mode 100644
index 0000000..847c6a7
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSet.html"
@@ -0,0 +1,390 @@
+锘�<!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>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏈湴MAC鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍖归厤绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HType" id="HType" lay-filter="HType" class="layui-input" value="" style="float:left;width:150px">
+ <option value="鎸夊伐浣嶅尮閰�">鎸夊伐浣嶅尮閰�</option>
+ <option value="鎸夊伐搴忓尮閰�">鎸夊伐搴忓尮閰�</option>
+ <option value="鎸夊伐浣�+宸ュ簭鍖归厤">鎸夊伐浣�+宸ュ簭鍖归厤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙嗛鎾斁</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <select name="HVideo" id="HVideo" lay-filter="HVideo" class="layui-input" value="" style="float:left;width:150px">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璧勬簮鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HWorkStationName" name="HWorkStationName" id="HWorkStationName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HWorkStationID" id="HWorkStationID" lay-verify="HWorkStationID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkStation" id="btnHWorkStation" 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" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="datetime" class="layui-input" name="HCreateDate" id="HCreateDate">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ $('#HCreator').val(sessionStorage["HUserName"])
+ $('#HCreateDate').val(Format(new Date(), "yyyy-MM-dd"))
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HItemID").val(0);
+ }
+ else if (OperationType == 3) {//缂栬緫
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) {//娴忚
+ $("#HItemID").val(linterid);//
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ get_checkHSource();
+ });
+ //閫夋嫨宸ヤ綅
+ form.on('submit(btnHWorkStation)', function () {
+ get_checkHWorkStation();
+ });
+ //閫夋嫨宸ュ簭
+ form.on('submit(btnHProc)', function () {
+ get_checkHProc();
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ sWhere = " and HItemID = " + linterid
+ $.ajax({
+ url: GetWEBURL() + "Gy_SourceWorkStationSet/list",
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HMacAddr": data.MAC鍙�
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+ , "HWorkStationID": data.HWorkStationID
+ , "HWorkStationName": data.宸ヤ綅鍚嶇О
+ , "HProcID": data.HProcID
+ , "HProcName": data.宸ュ簭鍚嶇О
+ , "HType": data.鍖归厤绫诲瀷
+ , "HVideo": data.鏄惁榛樿鎾斁瑙嗛 == "鏄�" ? 1 : 0
+ , "HRemark": data.澶囨敞
+ , "HCreateDate": Format(data.鍒涘缓鏃ユ湡, "yyyy-MM-dd")
+ , "HCreator": data.鍒涘缓浜�
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ var sMainStr = JSON.stringify(data.field);
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Gy_SourceWorkStationSet/Save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
+ function get_checkHSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸ヤ綅鏂规硶
+ function get_checkHWorkStation() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ヤ綅鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWorkStationName").val(checkStatus.data[0].宸ヤ綅鍚嶇О);
+ $("#HWorkStationID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鏂规硶
+ function get_checkHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , 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].宸ュ簭鍚嶇О);
+ $("#HProcID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
new file mode 100644
index 0000000..d49d5f6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\267\245\344\275\215/Gy_SourceWorkStationSetList.html"
@@ -0,0 +1,540 @@
+锘�<!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>
+
+</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;padding: 9px 18px;">璧勬簮鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" 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">
+ <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-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" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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>
+ 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 Organization = sessionStorage["Organization"]
+ var HModName = "Gy_SourceWorkStationSetList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HSourceID", "HProdOrgID", "HProcID","HWorkStationID"];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HSourceName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ //$("#btnSearch").click();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ //, cols: [[
+
+ //]]
+ };
+ }
+ //#endregion
+
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Gy_SourceWorkStationSet/list',
+ type: "GET",
+ 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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ 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: [500, 2000, 5000, 50000]
+ , limit: 500
+ , cellMinWidth: 90
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HSourceName = $("#HSourceName").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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 (HSourceName) {
+ sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HSourceName + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鐢熶骇宸ヤ綅鍒楄〃-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_SourceWorkStationSet.html?OperationType=1&linterid=&HSouceBillType='
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: './Gy_SourceWorkStationSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_PackType',
+ type: "GET",
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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 - 2; 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
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index c16c86c..0d6b331 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -430,21 +430,20 @@
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
-
- layer.open({
+ var index = layer.open({
type: 1, // page 灞傜被鍨�
- area: ['500px', '300px'],
- title: 'Hello layer',
+ area: ['20%', '20%'],
shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: true, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�
- maxmin: true, // 鍏佽鍏ㄥ睆鏈�灏忓寲
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 32px;">涓�涓櫘閫氱殑椤甸潰灞傦紝浼犲叆浜嗚嚜瀹氫箟鐨� HTML</div>'
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
});
- setTimeout(get_btnProPC(HWorkShopID), 3000);
- layer.closeAll();
+ setTimeout(function () {
+ get_btnProPC(HWorkShopID);
+ layer.close(index);
+ }, 1000)
}
-
})
//琛屽唴浜嬩欢
@@ -706,6 +705,28 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ //, done: function (res, page, count) {
+ // var that = this.elem.next();
+ // res.data.forEach(function (item, index) {
+ // var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
+ // for (var i = 0; i < Days; i++) {
+ // var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
+ // if (item[dateNowTime] != null) {
+ // if (NumCount > parseFloat(item[dateNowTime])) {
+ // NumCount -= parseFloat(item[dateNowTime]);
+ // } else {
+ // var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ // tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ // rq = tr.children()[num + 1 + i];
+ // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ // rq = tr.children()[num];
+ // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ // }
+ // }
+ // }
+ // });
+ // $('.layui-table-cell').css({ 'height': 'auto' });
+ //}
};
}
@@ -1162,6 +1183,9 @@
var data = table.cache["mainTable"];
var HICOMNum = [];
for (var i = 0; i < data.length; i++) {
+ if (isNaN(data[i]["HICMOInterID"])) {
+ return layer.msg("璇峰厛杩涜淇濆瓨!!")
+ }
HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
}
$('#HProgressBar').html(`
@@ -1267,12 +1291,14 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
- var ajaxLoad = layer.load();
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
var HinterID_S = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["灏忔椂浜ц兘"] == "0") {
+ return layer.msg("璇峰厛鐐瑰嚮鍑嗗鎸夐挳,纭繚灏忔椂浜ц兘涓嶄负0!!!")
+ }
HinterID_S.push(option.data[i]["hmainid"]);
}
$.ajax({
@@ -1295,13 +1321,13 @@
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
$.ajax({
- url: GetWEBURL() +'/Gy_SOPBillList/UpDelSQL',
+ url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
async: false,
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
- HDelData = 1;
+
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -1310,274 +1336,288 @@
}
});
- get_FastQuery(2);
+ get_HFData(0, 0);
- if (HDelData == 1) {
- //鎸変换鍔″崟浼樺厛绾� 寰幆
- for (var i = 0; i < option.data.length; i++) {
- //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
- lMainID = option.data[i]["HICMOInterID"];
- sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
- dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
- sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
- sPlanQty = option.data[i]["璁″垝鏁伴噺"];
- lHGroupID = option.data[i]["HGroupID"];
- sGroupName = option.data[i]["HGroupName"];
- lMaterID = option.data[i]["HMaterID"];
- sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
- sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
- sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
- sYX = option.data[i]["浼樺厛绾�"];
- //鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty;
- if (sWorkQty <= 0) {
- sLeftProdTimes = 0;
- }
- else {
- sLeftProdTimes = iLeftQty / sWorkQty;
- }
- //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
- if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = option.data[i]["HSourceID"];
- sSourceName = option.data[i]["鐢熶骇璧勬簮"];
- sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
- {
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
- {
- //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
- $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
- continue;
- }
- else {
- $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
- //寮�濮嬫帓鍗�
- bFind = false;
- //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
- if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
- {
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
- }
- if (dsSub != null)//涓嶅姞鐝帓绋�
- {
- iRow = i + 1;
- //灏嗘暟鎹帓鍒扮綉鏍间腑
- //grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- //Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, false, oClsGridValues);
- SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
- }
- bFind = true;
- }
- }
- }
- if (!bFind) {
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
- if (iLeftQty > 0) {
-
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- grdMain.RowCount = grdMain.RowCount + 1;
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
- bFind = true;
- }
- }
- }
-
- if (!bFind) {
- //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[ds.length - 1]["HitemID"];
- sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
+ //鍒濆鍖栬〃鏍兼暟鎹�
+ for (var i = 0; i < option.data.length; i++) {
+ for (var j = (22 + HPlanDay); j < 53; j++) {
+ if (option.data[i][option.cols[0][j].field] != null) {
+ option.data[i][option.cols[0][j].field] = "";
}
}
- table.render(option);
- set_AddNew();
- } else {
- layer.msg("鏁版嵁娓呯┖澶辫触!")
}
- layer.close(ajaxLoad);
+
+ //get_FastQuery(2);
+
+ //鎸変换鍔″崟浼樺厛绾� 寰幆
+ for (var i = 0; i < option.data.length; i++) {
+ //鑾峰彇閿佸畾鐨勬帓浜ф暟閲�
+ var SDSum = 0;
+ if (HPlanDay > 0) {
+ for (var j = 22; j < (22 + HPlanDay); j++) {
+ SDSum += TableData[i][option.cols[0][j].field];
+ }
+ }
+
+ //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
+ lMainID = option.data[i]["HICMOInterID"];
+ sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
+ dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
+ sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
+ sPlanQty = option.data[i]["璁㈠崟鍙帓鏁伴噺"];
+ lHGroupID = option.data[i]["HGroupID"];
+ sGroupName = option.data[i]["HGroupName"];
+ lMaterID = option.data[i]["HMaterID"];
+ sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
+ sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
+ sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
+ sWorkQty = option.data[i]["灏忔椂浜ц兘"];
+ sYX = option.data[i]["浼樺厛绾�"];
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+ //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
+ if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = option.data[i]["HSourceID"];
+ sSourceName = option.data[i]["鐢熶骇璧勬簮"];
+ sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
+ {
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
+ {
+ get_HFData(1, i);
+ //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ continue;
+ }
+ else {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
+ //寮�濮嬫帓鍗�
+ bFind = false;
+ //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
+ for (var j = 0; j < ds.length; j++) {
+ //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
+ if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
+ if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
+ {
+ //鍦ㄦ湰璧勬簮涓婄敓浜�
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = ds[j]["HitemID"];
+ sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ option.data[i]["HSourceID"] = lSourceID;
+ option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dsSub = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ if (dsSub == null || dsSub.length == 0) {
+ get_HFData(1, i);
+ continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
+ }
+ if (dsSub != null)//涓嶅姞鐝帓绋�
+ {
+ iRow = i + 1;
+ //灏嗘暟鎹帓鍒扮綉鏍间腑
+ SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
+
+ set_AddNew1(option.data[i]);
+ }
+ bFind = true;
+ }
+ } else {
+ get_HFData(1, i);
+ }
+ }
+ //if (!bFind) {
+ // for (var j = 0; j < ds.length; j++) {
+ // //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
+ // if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
+ // if (iLeftQty > 0) {
+
+ // //鍦ㄦ湰璧勬簮涓婄敓浜�
+ // grdMain.RowCount = grdMain.RowCount + 1;
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[j]["HitemID"];
+ // sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ // }
+ // bFind = true;
+ // }
+ // }
+ //}
+
+ //if (!bFind) {
+ // //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[ds.length - 1]["HitemID"];
+ // sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ //}
+ }
+ }
+ table.render(option);
+ }
+
+ var TableData = [];
+ function get_HFData(num,nums) {
+ if (num == 0) {
+ TableData = option.data;
+ } else {
+ option.data[nums] = TableData[nums];
+ }
}
//灏嗘暟鎹帓绋嬪埌缃戞牸
@@ -1684,7 +1724,7 @@
else {
for (var i = 0; i < ds.length; i++) {
//鎵惧埌瀵瑰簲鐨勫垪
- for (var j = 22; j < grd.cols[0].length; j++) {
+ for (var j = 22; j < 53; j++) {
if (sLeftQty > 0) {
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) {
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
@@ -1743,33 +1783,36 @@
}
else {
if (sLeftQty > parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"])) {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
+ grd.data[iRow][grd.cols[0][j].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HUseTimes"] = ds[i]["鍓╀綑宸ユ椂"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j].field] = sLeftQty;
+ //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
}
}
- }
+ }
}
}
}
+
}
}
@@ -1936,6 +1979,9 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["璁㈠崟鍙帓鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
+ return layer.msg("绗�" + (i + 1) + "琛屾帓浜ф暟閲忚秴鍑鸿鍗曟暟閲�!");
+ }
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
@@ -1962,6 +2008,36 @@
}
layer.close(index);
layer.msg("淇濆瓨鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ function set_AddNew1(num) {
+
+ //var sMainStr = JSON.stringify(data.field);
+ var sSubStr = "["+JSON.stringify(num)+"]";
+ var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("淇濆瓨鎴愬姛");
+ layer.close(index);
}
else {
layer.close(index);
@@ -2199,7 +2275,7 @@
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
+ for (var i = 1; i < option.cols[0].length - 1; 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>';
}
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
index a3de4a5..98ba410 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserList.html"
@@ -222,7 +222,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_User/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -465,7 +465,9 @@
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index d90b2ee..8d50602 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -142,39 +142,36 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline" id="HIDDEN" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" 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" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
-
-
-
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" 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" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-inline">
@@ -609,15 +606,21 @@
//}
var params = getUrlVars();
- var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫 4娣诲姞瀛愬伐鑹鸿矾绾�
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
//var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- //linteridSub = -1;
- OperationType = 1;
+ //$("#HIDDEN").hide();
+ if (OperationType == null) {
+ OperationType = 1;
+ } else if (OperationType == 4) {
+ //鏄剧ず宸ュ簭
+ $("#HIDDEN").show();
+ }
+
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
@@ -960,150 +963,6 @@
}
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨宸ュ簭璁″垝鍗�
- form.on('submit(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '宸ュ簭璁″垝鍗曞垪琛�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- // }
- });
-
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
-
-
- form.on('submit(Saver)', function (data) { //淇濆瓨
- //debugger;
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- });
-
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -1325,7 +1184,6 @@
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- console.log("绱㈠紩涓�:" + rowIndex);
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
@@ -1797,6 +1655,11 @@
else {
$("input[name='checkboxHStandard']").prop("checked", false);
}
+
+ if (d.data[0].HBillSubType == "SUB") {
+ //鏄剧ず宸ュ簭
+ $("#HIDDEN").show();
+ }
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": OperationType == 2 ? "" : d.data[0].鍗曟嵁鍙�
@@ -2217,8 +2080,6 @@
//#endregion
});
-
-
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index a83e4b5..562b2d2 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -106,6 +106,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -168,7 +169,10 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鏂板
- case 'set_AddNew': set_AddNew();
+ case 'set_AddNew': set_AddNew();
+ break;
+ //鏂板瀛愯矾绾�
+ case 'set_AddNewSub': set_AddNewSub();
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
@@ -470,7 +474,7 @@
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
}
- sWhere += " and 宸ュ簭浠ｇ爜 != '9999'"
+ sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType=''"
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -493,6 +497,22 @@
}
//#endregion
+ //娣诲姞瀛愯矾绾�
+ function set_AddNewSub() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=4&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
//#region 缂栬緫
function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html"
new file mode 100644
index 0000000..8423c65
--- /dev/null
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillSubList.html"
@@ -0,0 +1,832 @@
+锘�<!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/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+ <script src="../../../layuiadmin/pubcustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.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">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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:10px;margin-left:5%;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>鏂板瀛愯矾绾�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></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 = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+ var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "Gy_RoutingBillSubList";
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //鏂板瀛愯矾绾�
+ case 'set_AddNewSub': set_AddNewSub();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
+ //娴忚
+ case 'get_PrintReport': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+
+ get_btnHMaterID();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ Organ();
+ //鏌ヨ
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ //, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+ , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
+ , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
+ , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
+ //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
+ //, { field: '缁勭粐', title: '缁勭粐' }
+ ////, { field: 'hsubid', title: 'hsubid', width: 80 }
+ //, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+ ////, { field: 'hprocid', title: 'hprocid', width: 105 }
+ ////, { field: 'HSupID', title: 'HSupID', width: 105 }
+ //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+ //, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
+ //, { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+ //, { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
+ //, { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
+ //, { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+ //, { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+ //, { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+ //, { field: '鑹巼', title: '鑹巼' }
+ //, { field: '绱鑹巼', title: '绱鑹巼' }
+ //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
+ ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
+ ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
+ ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
+ //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
+ ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
+ //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
+ //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ ]]
+ };
+ }
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#HMaterID").val(0);//鐗╂枡
+ $("#HMaterName").val("");//鐗╂枡
+ $("#HMaterNumber").val("");//鐗╂枡
+ $("#HModel").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+ var HOrgID = "";
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ //var HMaterID = $("#HMaterID").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HModel = $("#HModel").val();
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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 (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
+
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (HMaterName) {
+ sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModel) {
+ sWhere += "and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HOrgID = '" + HOrgID + "'";
+ }
+ sWhere += " and 宸ュ簭浠ｇ爜 != '9999' and HBillSubType='SUB'"
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ //#endregion
+
+ //娣诲姞瀛愯矾绾�
+ function set_AddNewSub() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=4&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ //var linteridSub = data[0].hsubid;
+
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+
+ //瀵煎嚭Execel
+ function get_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+
+
+ //#endregion
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ 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 = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; 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 });
+ }
+ })
+ }
+
+ //#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
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index afe3d87..4fec0d4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -164,11 +164,11 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
</div>
</div>
</div>
@@ -184,8 +184,8 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="鍚堟牸" title="鍚堟牸" checked>
- <input type="radio" name="HCheckerResult" id="HCheckerResult" value="涓嶅悎鏍�" title="涓嶅悎鏍�">
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
+ <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
</div>
@@ -266,7 +266,333 @@
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">妫�楠岄」鐩�</li>
+ <li>鎶芥牱妫�楠�</li>
+ <li>妫�娴嬪��</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--妫�楠岄」鐩�-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--鎶芥牱妫�楠�-->
+ <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
+ <div class="layui-row">
+ <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="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:30px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱鏂规</span>
+ </label>
+ </div>
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:70px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱妫�楠�</span>
+ </label>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎶芥牱鏂规</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSampleSchemeName" id="HSampleSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckSampleScheme" id="btnSearchCheckSampleScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" value="0">
+ </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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" 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="HSampleDamageQty" id="HSampleDamageQty" style="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: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" name="HSamplingType" id="HSamplingType" style="background-color:#efefef4d;" 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="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" value="0" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HInspectResultToSee" id="HInspectResultToSee" value="" style="" readonly>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block">
+ <select name="HResult" lay-filter="HResult" style="width:190px;">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row" style="margin-top: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" name="HInspectionLevel" id="HInspectionLevel" style="background-color:#efefef4d;" 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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" 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="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row" style="margin-top: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" name="HStrictness" id="HStrictness" style="background-color:#efefef4d;" 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="HSampleUnRightQty" id="HSampleUnRightQty" style="" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">AQL</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HAQL" id="HAQL" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <!--<table class="layui-hide" id="samplingTable" lay-filter="samplingTable"></table>-->
+ </div>
+ <div class="layui-tab-item" style="height:590px">
+ <!--妫�娴嬪��-->
+ <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+ </div>-->
+ <div class="left" style="width:50%;height:450px;float:left;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">椤圭洰搴忓彿</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HInspectResultToSee2" id="HInspectResultToSee2" value="" style="" readonly>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HInspectResult" lay-filter="HInspectResult">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓嶅悎鏍兼暟</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">淇濈暀灏忔暟浣�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HResDec" id="HResDec" value="2" style="" onfocus="this.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;">
+ <input type="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
+ <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+ <span style="text-align:center;margin-right:2.8px;color:white">鎸囨爣</span>
+ </label>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+ <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HStatus" lay-filter="HStatus" id="HStatus">
+ <option value="1" selected="selected">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px !important;">姣旇緝绗�</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+ <select name="HComparator" lay-filter="HComparator" id="HComparator">
+ <option value="=" selected="selected">=</option>
+ <option value=">">></option>
+ <option value=">=">>=</option>
+ <option value="<"><</option>
+ <option value="<="><=</option>
+ <option value="<>"><></option>
+ <option value="between">between</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:white;width: 53%;float:left;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">妫�楠屽��</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HInspectVal" id="HInspectVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchInspectValB" id="btnSearchInspectValB" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HInspectValB" id="HInspectValB" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鐩爣鍊�</label>
+ <div class="layui-input-block" style="margin-left: 45px;">
+ <input type="text" class="layui-input" name="HTargetVal" id="HTargetVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTargetValB" id="btnSearchTargetValB" style="float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input type="hidden" name="HTargetValB" id="HTargetValB" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓婇檺鍊�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓嬮檺鍊�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓婂亸宸�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓嬪亸宸�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="right" style="width:50%;height:450px;float:left;">
+ <table class="layui-hide" id="ValueTable" lay-filter="ValueTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -292,9 +618,30 @@
<script type="text/html" id="HResult">
<select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
<option value="">璇烽�夋嫨</option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
</select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岀粨鏋�)-->
+ <script type="text/html" id="HInSpectResult">
+ <select name="HInSpectResult" lay-filter="HInSpectResult" id="HInSpectResult{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+ <script type="text/html" id="HAnalysisMethod">
+ <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1">瀹氭�у垎鏋�</option>
+ <option value="2">瀹氶噺鍒嗘瀽</option>
+ <option value="3">鍏朵粬鍒嗘瀽</option>
+ </select>
+ </script>
+ <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+ <script type="text/html" id="HKeyInspect">
+ <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
</script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -317,6 +664,18 @@
//鍏敤鍙橀噺
var rowdata = [];
var option = [];
+
+ var rowdata_Value = [];
+ var option_Value = [];
+ var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
+ var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
+ var checkobj = ""; //澶嶉�夋
+ var trindex = ""; //榛樿閫変腑琛屼笅鏍�
+ var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
+ var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
+ var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
+ var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
+ var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -380,7 +739,7 @@
});
}
else if (OperationType == 2) {
- if (HICMOEntryID < 0 || HICMOEntryID == "" ) {
+ if (HICMOEntryID < 0 || HICMOEntryID == "") {
layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
$('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
@@ -421,6 +780,9 @@
RoadBillMain(linterid);
//RoadBillSub(linterid);
}
+
+ $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -465,7 +827,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var data = result.data[0];
if (result.count == 1) {
@@ -500,8 +862,11 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HResult": "",
- "HRemark": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -510,6 +875,7 @@
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
}
form.render('select');
break;
@@ -529,6 +895,7 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
}
form.render('select');
}
@@ -638,11 +1005,150 @@
});
}
+ if (obj.event == 'HInspectInstruMentID') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ , HInspectInstruMentID: checkStatus.data[0].HItemID
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
obj.event = "";
return false;
}
})
+ });
+
+ //琛屽唴浜嬩欢--妫�楠屽��
+ table.on('tool(ValueTable)', function (obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HInSpectValueB_Open') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+ var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
+
+ if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+
+ addUnRightQty();//缁熻涓嶅悎鏍兼暟閲�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ });
+
+ table.on('edit(ValueTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ var MBValue = $("#HTargetVal").val();//鐩爣鍊�
+ var HComparator = $("#HComparator").val();//姣旇緝绗�
+
+ switch (field) {
+ //瀹氭�ф娴�
+ case "HInSpectValueB":
+
+ break;
+ //瀹氶噺妫�娴�
+ case "HInSpectValue":
+ Qualified_Value(HComparator, MBValue, value, obj);
+ addUnRightQty();
+ break;
+ //鍏朵粬妫�娴�
+ case "HInSpectValueT":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+ addUnRightQty();
+ break;
+ }
});
//淇濆瓨鎸夐挳
@@ -652,6 +1158,11 @@
//淇濆瓨
function set_SaveBill(data) {
+ //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
+ Assignment(LastIndex, LastIndex);
+ //淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
+ set_SaveValue($("#HEntryID").val());
+
if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -671,10 +1182,33 @@
layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+ if (sSubTable[i].HSampleSchemeID == '') {
+ sSubTable[i].HSampleSchemeID = 0
+ }
+ if (sSubTable[i].HSampleQty == '') {
+ sSubTable[i].HSampleQty = 0
+ }
+ if (sSubTable[i].HSampleDamageQty == '') {
+ sSubTable[i].HSampleDamageQty = 0
+ }
+ if (sSubTable[i].HAcceptQty == '') {
+ sSubTable[i].HAcceptQty = 0
+ }
+ if (sSubTable[i].HRejectQty == '') {
+ sSubTable[i].HRejectQty = 0
+ }
+ if (sSubTable[i].HSampleUnRightQty == '') {
+ sSubTable[i].HSampleUnRightQty = 0
+ }
+ if (sSubTable[i].HUnitID == '') {
+ sSubTable[i].HUnitID = 0
+ }
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sSubValue = JSON.stringify(table.cache['ValueTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
var index = layer.load();
$.ajax({
type: "POST",
@@ -722,8 +1256,22 @@
})
}
+ //#region 鏃堕棿杞崲
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //#endregion
+
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
- form.on('submit(btnSearchCheckProject)', function () {
+ form.on('submit(btnSearchQCScheme)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -743,8 +1291,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
- $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
get_CheckItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -761,14 +1309,280 @@
});
});
+ //琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
+ form.on('submit(btnSearchCheckItemID)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠岄」鐩垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+ form.on('submit(btnSearchUnit)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HUnitID").val(checkStatus.data[0].HItemID);
+ $("#HUnit").val(checkStatus.data[0].HName);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅妫�楠屽�煎脊绐�
+ form.on('submit(btnSearchInspectValB)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HInspectValB").val(checkStatus.data[0].hmainid);
+ $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+ //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+ Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鐩爣鍊煎脊绐�
+ form.on('submit(btnSearchTargetValB)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐩爣鍊煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HTargetValB").val(checkStatus.data[0].hmainid);
+ $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+ $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+ //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+ Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+ form.render('select');
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
+ form.on('submit(btnSearchCheckSampleScheme)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鎶芥牱鏂规鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+ $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+ $("#HSamplingType").val(checkStatus.data[0].鎶芥牱绫诲瀷);
+ $("#HInspectionLevel").val(checkStatus.data[0].妫�楠屾按骞�);
+ $("#HStrictness").val(checkStatus.data[0].涓ユ牸搴�);
+ $("#HAQL").val(checkStatus.data[0].AQL);
+ $("#HSampleQty").val(checkStatus.data[0].鏍锋湰閲�);
+ $("#HSampleQty2").val(checkStatus.data[0].鏍锋湰閲�);
+ $("#HAcceptQty").val(checkStatus.data[0].鍏佽鏁�);
+
+ $("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
+ $("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
+ $("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
+
+ rowdata_Value = [];
+ for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
+ rowdata_Value.push({
+ "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+ });
+ }
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //#endregion
+
function get_CheckItem() {
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
+ data: { "CheckProjectID": $("#HQCSchemeID").val() },
success: function (result) {
- option.data = result.data;
+ //option.data = result.data;
+ //table.render(option);
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
+
+ option.data = rowdata;
table.render(option);
+
+ for (var i = 1; i <= result.data.length; i++) {
+ //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ option_Check = result.data;
+
+ $("[name='HEntryID']").attr("value", result.data.length);
+ $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+ $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+ //榛樿閫変腑鏈�鍚庝竴琛�
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+ //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+ $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+ trindex = result.data.length - 1;
+ $("#HEntryID").val() - 1
}
})
}
@@ -979,8 +1793,11 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HResult": "",
- "HRemark": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}];
option = {
elem: '#mainTable'
@@ -990,12 +1807,44 @@
, cellMinWidth: 150
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
- , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
- , { field: 'HQCRelValue', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult' }
- , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ //, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+ , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+ , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+ , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+ //, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+
+ , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+ , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
+ , { field: 'HSampleQty', title: '鏍锋湰閲�', edit: 'text', hide: true }
+ , { field: 'HSampleDamageQty', title: '鏍锋湰鐮村潖鏁�', edit: 'text', hide: true }
+ , { field: 'HSamplingType', title: '鎶芥牱绫诲瀷', edit: 'text', hide: true }
+ , { field: 'HAcceptQty', title: '鍏佽鏁�', edit: 'text', hide: true }
+ , { field: 'HInspectionLevel', title: '妫�楠屾按骞�', edit: 'text', hide: true }
+ , { field: 'HRejectQty', title: '鎷掔粷鏁�', edit: 'text', hide: true }
+ , { field: 'HStrictness', title: '涓ユ牸搴�', edit: 'text', hide: true }
+ , { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
+ , { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
+ , { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
+ , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
+ , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+ , { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
+ , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
+ , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
+ , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
+ , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
+ , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
+ , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
, done: function (res, curr, count) {
@@ -1020,6 +1869,48 @@
//鍔犺浇绌鸿〃鏍�
option.data = rowdata;
table.render(option);
+
+ //鍒濆琛ㄦ牸鏁版嵁
+ rowdata_Value = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ option_Value = {
+ elem: '#ValueTable'
+ //, toolbar: '#toolbarDemo_Value'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , height: 'full-50'
+ , cellMinWidth: 150
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { field: 'HSEQ', title: '搴忓彿' }
+ , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
+ , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+ , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
+ , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , done: function (res, curr, count) {
+ option_Value.data = res.data;
+ //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+ $('.layui-form-select').find('input').unbind("blur");
+ //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+ $('tr').each(function (e) {
+ var $cr = $(this);
+ var dataIndex = $cr.attr("data-index");
+ $.each(option_Value.data, function (index, value) {
+ if (value.LAY_TNDEX == dataIndex) {
+ $cr.find('input').val(value.HInSpectResult);
+ }
+ });
+ });
+ }
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ //鍔犺浇绌鸿〃鏍�
+ option_Value.data = rowdata_Value;
+ table.render(option_Value);
}
//琛岄�夋嫨澶勭悊锛堢粨璁猴級
@@ -1032,7 +1923,1265 @@
value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+ if (selectValue == 1) {
+ selectValue = "鍚堟牸"
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ selectValue = "涓嶅悎鏍�"
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ $("#HInspectResultToSee").val(selectValue);
+ $("#HInspectResultToSee2").val(selectValue);
+ //$("#HInSpectResult" + Guid).val(selectValue);
+ //$("[name='HResult']").val(selectValue);
+
+ //$("[name='HInspectResult']").val(selectValue);
+ form.render('select');
+
+ LastResult();
});
+
+ //鍒ゆ柇琛ㄥご鍒ゆ柇缁撹鏄惁鍚堟牸
+ function LastResult() {
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HResult == 2) {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+ }
+
+ //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+ form.on('select(HInSpectResult)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option_Value.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ UnRightQty_isFied = UnRightQty;
+ $("#HSampleUnRightQty").val(UnRightQty);
+ $("#HSampleUnRightQty2").val(UnRightQty);
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ form.render('select');
+ });
+
+ //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+ form.on('select(HAnalysisMethod)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ //闅愯棌妫�娴嬪�煎瓧娈�
+ IsHide(data.value);
+ });
+
+ //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+ form.on('select(HStatus)', function (data) {
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+ Qualified(HComparator, HEntryID, HAnalysisMethod)
+ });
+
+ ////鐩戝惉涓嬫媺妗嗙紪杈�
+ //form.on('select(HInspectResult)', function (data) {
+ // //鑾峰彇褰撳墠琛宼r瀵硅薄
+ // var elem = data.othis.parents('tr');
+ // //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+ // var Guid = elem.first().find('td').eq(1).text();
+ // //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ // var selectValue = data.value;
+ // //$("#HInSpectResult" + Guid).val(selectValue);
+ // $("[name='HResult']").val(selectValue);
+ // form.render('select');
+ //})
+
+ //鐩戝惉涓嬫媺妗嗙紪杈�--姣旇緝绗�
+ form.on('select(HComparator)', function (data) {
+ //鑾峰彇褰撳墠琛宼r瀵硅薄
+ var elem = data.othis.parents('tr');
+ //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+ var Guid = elem.first().find('td').eq(1).text();
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ //鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
+ if (HAnalysisMethod == 2) {
+ if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
+ $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+ $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+ } else if (selectValue.toString() == 'between') {
+ $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HTargetVal").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉鐩爣鍊艰緭鍏ユ鑳屾櫙棰滆壊
+ $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+ $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+ } else if (selectValue.toString() == '=') {
+ $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+ $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+ $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+ $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+ $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+ $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+ $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+ $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+ $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+ form.render("select");
+ }
+ }
+
+
+ form.render('select');
+ })
+
+ //鏄惁閲嶇偣妫�鏌�
+ form.on('checkbox(HKeyInspect)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ //#region銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
+ table.on('rowDouble(mainTable)', function (obj) {
+ $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
+ //鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+ var dataindex = $("#HEntryID").val() - 1;
+
+ //鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
+ var nowindex = $(obj.tr).attr("data-index");
+ LastIndex = nowindex;
+
+ $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+ //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+
+ //閫変腑琛屾敼鍙橀鑹�
+ check_row(obj);
+ //鑾峰彇褰撳墠閫変腑琛屽彿
+ var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
+ //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
+ //createArr(rowIndex);
+
+ //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+ var table_value = table.cache['ValueTable'];
+
+ set_SaveValue(dataindex + 1);
+ if (isHavingCount == false) {
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ }
+ //璧嬪�间笌鍥炴樉
+ Assignment(nowindex, dataindex);
+ if (isFristClick != true) {
+ //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
+ //console.log('aaa');
+
+ // return;
+ //}
+ //淇濆瓨妫�楠屽��
+ } else {
+ isFristClick = false;
+ }
+ });
+ //#endregion
+
+
+ //#region銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
+ $("#HInspectVal").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ //鍏朵粬鍒嗘瀽
+ if (HAnalysisMethod == 3) {
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ })
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
+ $("#HTargetVal").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ //====================璧嬪��/浼犲��===========================
+ var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ $("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
+ $("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ //鍏朵粬鍒嗘瀽
+ if (HAnalysisMethod == 3) {
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ })
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
+ $("#HUpLimit").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+ //====================璧嬪��/浼犲��===========================
+ var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+ var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
+
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ $("#HUpOffSet").val((Number(HUpLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓婂亸宸�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ })
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
+ $("#HDownLimit").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+ //====================璧嬪��/浼犲��===========================
+ var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+ var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
+
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ $("#HDownOffSet").val((Number(HDownLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓嬪亸宸�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ })
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
+ $("#HUpOffSet").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+ //====================璧嬪��/浼犲��===========================
+ var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+ var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
+
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ $("#HUpLimit").val((Number(HUpOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓婇檺鍊�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ }
+ })
+
+ //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
+ $("#HDownOffSet").blur(function () {
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+ //====================璧嬪��/浼犲��===========================
+ var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+ var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
+
+ //瀹氶噺鍒嗘瀽
+ if (HAnalysisMethod == 2) {
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ $("#HDownLimit").val((Number(HDownOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓嬮檺鍊�
+ }
+ })
+
+ //#endregion
+
+ //#region銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
+ function Qualified(HComparator, HEntryID, HAnalysisMethod) {
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ var HUpLimit = $("#HUpLimit").val() //涓婇檺鍊�
+ var HDownLimit = $("#HDownLimit").val() //涓嬮檺鍊�
+ var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
+ var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
+ var HStatus = $("#HStatus").val() //鐘舵��
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+
+ //#region銆愬畾鎬у垎鏋愭柟娉曘��
+ if (HAnalysisMethod == 1) {
+ //鐘舵�佷负鍚堟牸
+ if (HStatus == 1) {
+ switch (HComparator) {
+ //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+ case '=':
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ default: break;
+ }
+ }
+ else {
+ switch (HComparator) {
+ //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+ case '=':
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ default: break;
+ }
+ }
+ }
+ //#endregion
+ //#region銆愬畾閲忓垎鏋愭柟娉曘��
+ else if (HAnalysisMethod == 2) {
+ //鐘舵�佷负鍚堟牸
+ if (HStatus == 1) {
+ switch (HComparator) {
+ case '=':
+ //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
+ //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
+ //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ case '>':
+ //姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ case '>=':
+ //姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ case '<':
+ //姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ case '<=':
+ //姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break
+ case '<>':
+ //姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ case 'between':
+ //姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ default: break;
+ }
+ }
+ else { //鐘舵�佷负涓嶅悎鏍�
+ switch (HComparator) {
+ case '=':
+ //姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
+ //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
+ //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ case '>':
+ //姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ case '>=':
+ //姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ case '<':
+ //姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ case '<=':
+ //姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break
+ case '<>':
+ //姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ case 'between':
+ //姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ default: break;
+ }
+ }
+ }
+ //#endregion
+ //#region銆愬叾浠栧垎鏋愭柟娉曘��
+ else if (HAnalysisMethod == 3) {
+ //鐘舵�佷负鍚堟牸
+ if (HStatus == 1) {
+ switch (HComparator) {
+ case '=':
+ //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ }
+ break;
+ default: break;
+ }
+ }
+ else { //鐘舵�佷负涓嶅悎鏍�
+ switch (HComparator) {
+ case '=':
+ //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
+ }
+ break;
+ default: break;
+ }
+ }
+ }
+ //#endregion
+
+ form.render('select');
+ //鑾峰彇琛ㄤ綋缁撹鏁版嵁璧嬪�肩粰妫�楠岀粨鏋�
+ var HEntryID = $('#HEntryID').val();
+ var HInspectResultToSee = $("#HResult" + HEntryID).val()
+ if (HInspectResultToSee == 1) {
+ HInspectResultToSee = "鍚堟牸"
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ HInspectResultToSee = "涓嶅悎鏍�"
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ $("#HInspectResultToSee").val(HInspectResultToSee);
+ $("#HInspectResultToSee2").val(HInspectResultToSee);
+ LastResult();
+ };
+ //#endregion
+
+ //#region銆愯祴鍊间笌鍥炴樉銆�
+ function Assignment(nowindex, dataindex) {
+ if (SummaryIndex.indexOf(nowindex) == -1) {
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnit: $("#HUnit").val(), //鍗曚綅
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: $("#HAQL").val(), //AQL
+ HSamplingType: $("#HSamplingType").val(),
+
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnitName: $("#HUnitName").val(), //鍗曚綅
+ HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ };
+
+ //鑾峰彇鏂囨湰妗嗗��
+ var maindata = table.cache['mainTable'];
+ //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+ maindata[dataindex].HStatus = dataobj.HStatus;
+ maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[dataindex].HUnitID = dataobj.HUnitID;
+ maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+ maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+ maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+ maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+ maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[dataindex].HUnit = dataobj.HUnit;
+ maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+ maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+ maindata[dataindex].HStrictness = dataobj.HStrictness;
+ maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[dataindex].HAQL = dataobj.HAQL;
+ maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+ maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+ maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[dataindex].HUnitID = dataobj.HUnitID;
+ maindata[dataindex].HUnitName = dataobj.HUnitName;
+ maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+ maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+ maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+ maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+ maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+ maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+ maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+ SummaryIndex.push(nowindex);
+
+ $("#HSampleSchemeID").val(0);
+ $("#HSampleSchemeName").val("");
+ //xxx: $("#xxx").val();
+ $("#HUnitID").val(0);
+ $("#HUnit").val("");
+ $("#HInspectVal").val("");
+ $("#HTargetVal").val("");
+ $("#HUpLimit").val(0);
+ $("#HDownLimit").val(0);
+ $("#HUpOffSet").val(0);
+ $("#HDownOffSet").val(0);
+ $("#HSampleDamageQty").val("")
+ $("#HSampleQty").val("")
+ $("#HSampleQty2").val("")
+ $("#HAcceptQty").val("")
+ $("#HInspectionLevel").val("")
+ $("#HRejectQty").val("")
+ $("#HStrictness").val("")
+ $("#HSampleUnRightQty").val("")
+ $("#HSampleUnRightQty2").val("")
+ $("#HAQL").val("")
+ $("#HSamplingType").val("")
+ $("#HSampleQty").val("")
+ $("#HInspectResultToSee").val("")
+ $("#HInspectResultToSee2").val("")
+ $("#HSampleUnRightQty").val("")
+ $("#HUnitID").val("0")
+ $("#HUnitName").val("")
+ $("#HInspectValB").val("0")
+ $("#HInspectVal").val("")
+ $("#HTargetValB").val("0")
+ $("#HTargetVal").val("")
+ $("#HUpLimit").val("0")
+ $("#HDownLimit").val("0")
+ $("#HUpOffSet").val("0")
+ $("#HDownOffSet").val("0")
+
+ } else { //琛ㄤ綋鏂囨湰妗嗗�煎洖鏄�
+ //鑾峰彇鏂囨湰妗嗗��
+ var maindata = table.cache['mainTable'];
+
+ var dataobj = {
+ HEntryID: $("#HEntryID").val(), //琛屽彿
+ HStatus: $("#HStatus").val(), //鐘舵��
+ HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+ HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+ //xxx: $("#xxx").val(),
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnit: $("#HUnit").val(), //鍗曚綅
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+ HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+ HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+ HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HAQL: $("#HAQL").val(), //AQL
+ HSamplingType: $("#HSamplingType").val(),
+
+ HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+ HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+ HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+ HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+ HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+ HUnitName: $("#HUnitName").val(), //鍗曚綅
+ HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+ HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+ HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+ HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+ HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+ HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+ HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+ HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+ };
+ //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+ maindata[dataindex].HStatus = dataobj.HStatus;
+ maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+ maindata[dataindex].HUnitID = dataobj.HUnitID;
+ maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+ maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+ maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+ maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+ maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+ maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+ maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+ maindata[dataindex].HUnit = dataobj.HUnit;
+ maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+ maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+ maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+ maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+ maindata[dataindex].HStrictness = dataobj.HStrictness;
+ maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[dataindex].HAQL = dataobj.HAQL;
+ maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+ maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+ maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+ maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+ maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+ maindata[dataindex].HUnitID = dataobj.HUnitID;
+ maindata[dataindex].HUnitName = dataobj.HUnitName;
+ maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+ maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+ maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+ maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+ maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+ maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+ maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+ maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+ //鍥炴樉
+ $("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
+ $("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
+ //xxx: $("#xxx").val();
+ $("#HUnitID").val(maindata[nowindex].HUnitID);
+ $("#HUnit").val(maindata[nowindex].HUnit);
+ $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+ $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+ $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
+ $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+ $("#HSampleQty2").val(maindata[nowindex].HSampleQty);
+ $("#HAcceptQty").val(maindata[nowindex].HAcceptQty);
+ $("#HInspectionLevel").val(maindata[nowindex].HInspectionLevel);
+ $("#HRejectQty").val(maindata[nowindex].HRejectQty);
+ $("#HStrictness").val(maindata[nowindex].HStrictness);
+ $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+ $("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
+ $("#HAQL").val(maindata[nowindex].HAQL);
+ $("#HSamplingType").val(maindata[nowindex].HSamplingType);
+ $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+ $("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
+ $("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
+ $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+ $("#HUnitID").val(maindata[nowindex].HUnitID);
+ $("#HUnitName").val(maindata[nowindex].HUnitName);
+ $("#HInspectValB").val(maindata[nowindex].HInspectValB);
+ $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+ $("#HTargetValB").val(maindata[nowindex].HTargetValB);
+ $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+ $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+ $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+ $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+
+ if (maindata[nowindex].HInspectResultToSee == "鍚堟牸") {
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+
+ var HInterID = $("#HInterID").val();
+ var HEntryID = $("#HEntryID").val();
+ isHavingCount = false;
+ //鍥炴樉妫�楠屽��
+ $.ajax({
+ url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
+ type: "GET",
+ async: false,
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ isHavingCount = true
+
+ var data = result.data;
+
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛欒〃 璧嬪��
+ rowdata.push({
+ "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
+ });
+ }
+
+ option_Value.data = rowdata;
+ table.render(option_Value);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ form.render('select');
+ } else {
+ //layer.msg(result.code + result.Message, { icon: 5 });
+ }
+ }
+ })
+ }
+ }
+ //#endregion
+
+ //鑾峰彇涓嶅悎鏍兼暟鎬绘暟
+ function addUnRightQty() {
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ UnRightQty_isFied = UnRightQty;
+ $("#HSampleUnRightQty").val(UnRightQty);
+ $("#HSampleUnRightQty2").val(UnRightQty);
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ form.render('select');
+ LastResult();
+ }
+
+ //妫�楠屽�艰嚜鍔ㄥ垽鏂槸鍚﹀悎鏍�
+ function Qualified_Value(HComparator, MBValue, value, obj) {
+ var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+ var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+ var HStatus = $("#HStatus").val() //鐘舵��
+
+ if (HStatus == 1) {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ }
+ } else {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ }
+ }
+
+
+ form.render('select');
+ }
+
+ //妫�楠屽�间繚瀛�
+ function set_SaveValue(dataindex) {
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "") {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
+ }
+ var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ var HInterID = $("#HInterID").val();
+ var HEntryID = dataindex;
+
+ var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_ProcessCheckBill/set_SaveValue",
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //#region銆愰殣钘忔娴嬪�煎瓧娈点��
+ function IsHide(HAnalysisMethod_Value) {
+ if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
+ option_Value.cols[0][3].hide = false; //瀹氭��
+ option_Value.cols[0][4].hide = true; //瀹氶噺
+ option_Value.cols[0][5].hide = true; //鍏朵粬
+
+ $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+ $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+ $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+
+ $('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
+ $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
+
+ } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
+ option_Value.cols[0][4].hide = false; //瀹氶噺
+ option_Value.cols[0][3].hide = true; //瀹氭��
+ option_Value.cols[0][5].hide = true; //鍏朵粬
+
+ $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+ $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+ $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+ $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+ $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+ $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+ $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+ $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+ $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+
+
+ } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
+ option_Value.cols[0][5].hide = false; //鍏朵粬
+ option_Value.cols[0][3].hide = true; //瀹氭��
+ option_Value.cols[0][4].hide = true; //瀹氶噺
+
+ $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+ $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+ $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+ $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+ $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+ $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+ $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+ $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+ $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+ $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+
+ }
+ //閲嶆柊娓叉煋琛ㄦ牸
+ table.render(option_Value);
+ //涓嬫媺妗嗗洖鏄�
+ for (var i = 0; i < option_Value.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + option_Value.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+ form.render("select");
+ }
+ //#endregion
+
+ //#region銆愭敼鍙橀�変腑琛岄鑹层��
+ function check_row(obj) {
+ if (trindex != "") {
+ $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ trindex = "";
+ }
+
+ if (checkobj != "") {
+ checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //$('#HKeyInspect2').attr("checked", false);
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ var a = $('#HKeyInspect' + (i + 1)).prop("checked");
+ num.push(a);
+ }
+
+ 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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ checkobj = obj;
+ } 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;
+ }
+ });
+ for (var i = 0; i < option.data.length; i++) {
+
+ if (num[i]) {
+ $('#HKeyInspect' + (i + 1)).prop("checked", true);
+ } else {
+ $('#HKeyInspect' + (i + 1)).prop("checked", false);
+ }
+ }
+ form.render('checkbox');
+ }
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index 0ed4dac..9d9cde8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -87,6 +87,7 @@
, util = layui.util
var option = [];
var HModName = "QC_ProcessCheckBillList";
+ var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
//鏌ヨ鏉′欢
var sWhere = "";
@@ -196,23 +197,87 @@
]]
};
}
+ ////#region 鏌ヨ
+ //function get_Display(sWhere) {
+ // var ajaxLoad = layer.load();
+ // $.ajax({
+ // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ // url: GetWEBURL() + '/QC_ProcessCheckBill/GetProcessCheckBillList',
+ // type: "GET",
+ // data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = data1.data;
+ // table.render(option);
+ // layer.close(ajaxLoad);
+ // //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ //}
+ ////#endregion
+
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/QC_ProcessCheckBill/GetProcessCheckBillList',
+ url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 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'
+ , height: 'full-50'
+ , page: true //寮�鍚垎椤�
+ , limit: 500
+ , limits: [500, 2000, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ };
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ table.render(option);
+
+ //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ //}
} else {
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.msg(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -312,7 +377,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var ItemID = data[0];
+ var HItemID = data[0].hmainid;
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
@@ -320,7 +385,7 @@
url: GetWEBURL() + '/QC_ProcessCheckBill/Delete_Json',
type: "GET",
- data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -467,12 +532,14 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["鍗曟嵁ID", "琛ㄥご澶囨敞", "鐗╂枡", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 6fb232c..4b11114 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -168,11 +168,11 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屾柟妗�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
</div>
</div>
</div>
@@ -436,14 +436,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
- <div class="layui-input-block" style="margin-left: 100px;">
- <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px;">
- <div class="layui-inline">
<label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
<div class="layui-input-block" style="margin-left: 45px;">
<input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
@@ -451,6 +443,14 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -471,9 +471,15 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">鏍锋湰涓嶅悎鏍兼暟</label>
+ <label class="layui-form-label" style="width: 70px;">涓嶅悎鏍兼暟</label>
<div class="layui-input-block" style="margin-left: 100px;">
<input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">淇濈暀灏忔暟浣�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HResDec" id="HResDec" value="2" style="" onfocus="this.select();">
</div>
</div>
<!--<div class="layui-inline">
@@ -639,7 +645,7 @@
</select>
</script>
<!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
- <script type="text/html" id="HKeyInspect_Sub">
+ <script type="text/html" id="HKeyInspect">
<input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
</script>
<script>
@@ -663,17 +669,18 @@
//鍏敤鍙橀噺
var rowdata = [];
var option = [];
+
var rowdata_Value = [];
var option_Value = [];
-
var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
var checkobj = ""; //澶嶉�夋
var trindex = ""; //榛樿閫変腑琛屼笅鏍�
var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
- var isFristClick = true;
- var isHavingCount = false;
+ var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
+ var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
+ var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -924,9 +931,13 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
- "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
};
+
switch (obj.event) {
case 'btn-AddLine':
table.cache["mainTable"].push(NewRow);
@@ -1039,7 +1050,7 @@
Pub_Close(1);
}
- //琛屽唴浜嬩欢
+ //琛屽唴浜嬩欢--妫�楠岄」鐩�
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
@@ -1075,11 +1086,9 @@
});
}
-
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == 'HQCCheckItemID') //妯″叿淇℃伅
- {
+ if (obj.event == 'HQCCheckItemID') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1116,6 +1125,44 @@
}
});
}
+ if (obj.event == 'HInspectInstruMentID') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼华鍣ㄥ垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+ , HInspectInstruMentID: checkStatus.data[0].HItemID
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
obj.event = "";
return false;
@@ -1124,13 +1171,114 @@
})
});
+ //琛屽唴浜嬩欢--妫�楠屽��
+ table.on('tool(ValueTable)', function (obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HInSpectValueB_Open') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+ var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
+
+ if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+
+ addUnRightQty();//缁熻涓嶅悎鏍兼暟閲�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ });
+
+ table.on('edit(ValueTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ var MBValue = $("#HTargetVal").val();//鐩爣鍊�
+ var HComparator = $("#HComparator").val();//姣旇緝绗�
+
+ switch (field) {
+ //瀹氭�ф娴�
+ case "HInSpectValueB":
+
+ break;
+ //瀹氶噺妫�娴�
+ case "HInSpectValue":
+ Qualified_Value(HComparator, MBValue, value, obj);
+ addUnRightQty();
+ break;
+ //鍏朵粬妫�娴�
+ case "HInSpectValueT":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+ addUnRightQty();
+ break;
+ }
+ });
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
});
//淇濆瓨
- function set_SaveBill(data) {
+ function set_SaveBill(data) {
//璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
Assignment(LastIndex, LastIndex);
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
@@ -1155,7 +1303,6 @@
layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- console.log(sSubTable);
if (sSubTable[i].HSampleSchemeID == '') {
sSubTable[i].HSampleSchemeID = 0
}
@@ -1182,7 +1329,7 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubValue = JSON.stringify(table.cache['ValueTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
- console.log(sSubStr);
+
var index = layer.load();
$.ajax({
type: "POST",
@@ -1219,18 +1366,21 @@
//缂栬緫鏃跺姞杞借〃澶�
function RoadBillMain(linterid) {
var ajaxLoad = layer.load();
+ var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/GetQC_FirstPieceCheckDetail",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
type: "GET",
- data: { "HID": linterid },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ //var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
- , "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HSourceID": data.HSourceID
, "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HICMOQty": data.浠诲姟鍗曟暟閲�
@@ -1242,16 +1392,14 @@
, "HProcExchBillNo": data.HProcExchBillNo
, "HProcExchInterID": data.HProcExchInterID
, "HProcExchEntryID": data.HProcExchEntryID
- , "HFirstCheckEmp": data.妫�楠屽憳ID
- , "HFirstCheckEmpName": data.妫�楠屽憳鍚嶇О
- //, "HQCCheckProjectID": data.妫�楠屾柟妗圛D
- //, "HQCCheckProjectName": data.妫�楠屾柟妗堝悕绉�
- //, "HQCCheckProjectID": data.HManagerID
+ , "HFirstCheckEmp": data.HFirstCheckEmp
+ , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
+ //, "HQCSchemeID": data.妫�楠屾柟妗圛D
+ //, "HQCSchemeName": data.妫�楠屾柟妗堝悕绉�
+ //, "HQCSchemeID": data.HManagerID
//, "HPSStyleID": data.HPSStyleID
-
, "HRemark": data.琛ㄥご澶囨敞
//, "HSSID": data.HSSID
-
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡
, "HChecker": data.瀹℃牳浜�
@@ -1260,15 +1408,48 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleQty": data.鏍锋湰閲�
+ , "HSampleQty2": data.鏍锋湰閲�
+ , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+ , "HSamplingType": data.鎶芥牱绫诲瀷
+ , "HAcceptQty": data.鍏佽鏁�
+ //, "HInspectResultToSee": data.浣滃簾鏃ユ湡 //妫�楠岀粨鏋�
+ , "HInspectionLevel": data.妫�楠屾按骞�
+ , "HRejectQty": data.鎷掔粷鏁�
+ , "HStrictness": data.涓ユ牸搴�
+ , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HAQL": data.AQL
+ , "HUnitID": data.HUnitID
+ , "HUnit": data.鍗曚綅
+ , "HInspectValB": data.妫�娴嬪�煎熀纭�璧勬枡
+ , "HInspectVal": data.妫�娴嬪��
+ , "HTargetValB": data.鐩爣鍊煎熀纭�璧勬枡
+ , "HTargetVal": data.鐩爣鍊�
+ , "HUpLimit": data.涓婇檺鍊�
+ , "HDownLimit": data.涓嬮檺鍊�
+ , "HUpOffSet": data.涓婂亸宸�
+ , "HDownOffSet": data.涓嬪亸宸�
+ , "HEntryID": data.hsubid
+ , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
+ , "HQCCheckItemID": data.HQCCheckItemID
});
- data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
+ data = result.data;
+ //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HQCStd": data[i].HQCStd, "HUnit": data[i].HUnit, "HQCNote": data[i].HQCNote, "HResult": data[i].HResult,
- "HMax": data[i].HMax, "HMin": data[i].HMin, "HAvg": data[i].HAvg, "HRemark": data[i].HRemark
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "","HQCStd": data[i].妫�楠屾爣鍑�,
+ "HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
}
)
}
@@ -1276,7 +1457,13 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].HResult)
+ $("#HResult" + (j + 1)).val(data[j].缁撹)
+ }
+ for (let j = 0; j < data.length; j++) {
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶)
+ }
+ for (var i = 1; i <= data.length; i++) {
+ $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == 0 ? false : true) + "']").attr("selected", true);
}
form.render('select');
@@ -1290,49 +1477,6 @@
layer.alert("鍙戠敓閿欒!", { icon: 5 });
}
})
- }
-
- //妫�楠屽�间繚瀛�
- function set_SaveValue(dataindex) {
- for (let i = 0; i < table.cache['ValueTable'].length; i++) {
- if (table.cache['ValueTable'][i].HInSpectValueB == "") {
- table.cache['ValueTable'][i].HInSpectValueB = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValueT == "") {
- table.cache['ValueTable'][i].HInSpectValueT = 0
- }
- if (table.cache['ValueTable'][i].HInSpectValue == "") {
- table.cache['ValueTable'][i].HInSpectValue = 0
- }
- }
- var sValueTable = JSON.stringify(table.cache['ValueTable']);
- var HInterID = $("#HInterID").val();
- var HEntryID = dataindex;
-
- var msg = sValueTable + ";" + HInterID + ";" + HEntryID
-
- var index = layer.load();
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
- async: true,
- data: { "msg": msg },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- layer.close(index);
- //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
- }
- else {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.close(index);
- layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
}
//#region 鏃堕棿杞崲
@@ -1350,7 +1494,7 @@
//#endregion
//琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
- form.on('submit(btnSearchCheckProject)', function () {
+ form.on('submit(btnSearchQCScheme)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1370,8 +1514,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
- $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
get_CheckItem();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -1410,8 +1554,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
- $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О);
+ $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
+ $("#HQCSchemeName").val(checkStatus.data[0].鏂规鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -1626,9 +1770,22 @@
$.ajax({
url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
type: "GET",
- data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
+ data: { "CheckProjectID": $("#HQCSchemeID").val() },
success: function (result) {
- option.data = result.data;
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
+
+ option.data = rowdata;
table.render(option);
for (var i = 1; i <= result.data.length; i++) {
@@ -1643,7 +1800,7 @@
$("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
$("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
//榛樿閫変腑鏈�鍚庝竴琛�
- //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").click();
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
@@ -1862,7 +2019,7 @@
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆琛ㄦ牸鏁版嵁
rowdata = [{
- "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+ "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
"HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -1879,9 +2036,11 @@
, { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+ , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+ , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
- , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect_Sub', unresize: false }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
@@ -1950,7 +2109,7 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
, { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
- , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text' }
+ , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
, { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
, { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -1989,7 +2148,47 @@
value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+ if (selectValue == 1) {
+ selectValue = "鍚堟牸"
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ selectValue = "涓嶅悎鏍�"
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ $("#HInspectResultToSee").val(selectValue);
+ $("#HInspectResultToSee2").val(selectValue);
+ //$("#HInSpectResult" + Guid).val(selectValue);
+ //$("[name='HResult']").val(selectValue);
+
+ //$("[name='HInspectResult']").val(selectValue);
+ form.render('select');
+
+ LastResult();
});
+
+
+ //鍒ゆ柇琛ㄥご鍒ゆ柇缁撹鏄惁鍚堟牸
+ function LastResult() {
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HResult == 2) {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ } else {
+ document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ }
+ form.render('radio');
+ }
////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
//form.on('select(HInSpectResult)', function (data) {
@@ -2016,12 +2215,14 @@
//寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
var HValueTable = table.cache["ValueTable"];
- var UnRightQty = 0;
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
for (let i = 0; i < HValueTable.length; i++) {
if (HValueTable[i].HInSpectResult == 2) {
UnRightQty++;
}
}
+ UnRightQty_isFied = UnRightQty;
$("#HSampleUnRightQty").val(UnRightQty);
$("#HSampleUnRightQty2").val(UnRightQty);
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
@@ -2040,6 +2241,7 @@
$("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
}
form.render('select');
+ LastResult();
});
//琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
@@ -2055,33 +2257,6 @@
//闅愯棌妫�娴嬪�煎瓧娈�
IsHide(data.value);
});
-
- //鐩戝惉涓嬫媺妗嗙紪杈�--缁撹
- form.on('select(HResult)', function (data) {
- //鑾峰彇褰撳墠琛宼r瀵硅薄
- var elem = data.othis.parents('tr');
- //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
- var Guid = elem.first().find('td').eq(1).text();
- //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
- var selectValue = data.value;
-
- if (selectValue == 1) {
- selectValue = "鍚堟牸"
- $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- } else {
- selectValue = "涓嶅悎鏍�"
- $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- }
- $("#HInspectResultToSee").val(selectValue);
- $("#HInspectResultToSee2").val(selectValue);
- //$("#HInSpectResult" + Guid).val(selectValue);
- //$("[name='HResult']").val(selectValue);
-
- //$("[name='HInspectResult']").val(selectValue);
- form.render('select');
- })
//琛岄�夋嫨澶勭悊锛堢姸鎬侊級
form.on('select(HStatus)', function (data) {
@@ -2149,19 +2324,21 @@
//鏄惁閲嶇偣妫�鏌�
form.on('checkbox(HKeyInspect)', function (data) {
- //$("#HKeyInspect").val(data.elem.checked);
- $("[name='HKeyInspect']").attr("value", data.elem.checked);
-
- if ($("#HKeyInspect").val() == 'true') {
- $("[name='HKeyInspect']").prop("checked", true);
- } else {
- $("[name='HKeyInspect']").prop("checked", false);
- }
- form.render('checkbox');//鍒锋柊鍊�
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
});
- //#region銆愮偣鍑绘楠岄」鐩浜嬩欢銆�
+ //#region銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
table.on('rowDouble(mainTable)', function (obj) {
+ $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
//鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
var dataindex = $("#HEntryID").val() - 1;
@@ -2170,8 +2347,8 @@
LastIndex = nowindex;
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2183,6 +2360,14 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
+ set_SaveValue(dataindex + 1);
+ if (isHavingCount == false) {
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ }
//璧嬪�间笌鍥炴樉
Assignment(nowindex, dataindex);
if (isFristClick != true) {
@@ -2195,14 +2380,6 @@
} else {
isFristClick = false;
}
- set_SaveValue(dataindex + 1);
- if (isHavingCount == false) {
- //鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
- table.render(option_Value);
- }
//console.log(maindata);
//Array.some(item => {
// console.log("==============item===============");
@@ -2249,7 +2426,7 @@
if (HAnalysisMethod == 2) {
$("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
$("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
//鍏朵粬鍒嗘瀽
if (HAnalysisMethod == 3) {
@@ -2262,14 +2439,15 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
//====================璧嬪��/浼犲��===========================
var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
- $("#HUpOffSet").val(Number(HUpLimit) - Number(HTargetVal)) //涓婂亸宸�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ $("#HUpOffSet").val((Number(HUpLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓婂亸宸�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2278,14 +2456,15 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
//====================璧嬪��/浼犲��===========================
var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
- $("#HDownOffSet").val(Number(HDownLimit) - Number(HTargetVal)) //涓嬪亸宸�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ $("#HDownOffSet").val((Number(HDownLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓嬪亸宸�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2294,14 +2473,15 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
//====================璧嬪��/浼犲��===========================
var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
- $("#HUpLimit").val(Number(HUpOffSet) + Number(HTargetVal)) //涓婇檺鍊�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ $("#HUpLimit").val((Number(HUpOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓婇檺鍊�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2310,14 +2490,15 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
//====================璧嬪��/浼犲��===========================
var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
- $("#HDownLimit").val(Number(HDownOffSet) + Number(HTargetVal)) //涓嬮檺鍊�
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
+ $("#HDownLimit").val((Number(HDownOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓嬮檺鍊�
}
})
@@ -2332,6 +2513,7 @@
var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
var HStatus = $("#HStatus").val() //鐘舵��
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
//#region銆愬畾鎬у垎鏋愭柟娉曘��
if (HAnalysisMethod == 1) {
@@ -2340,10 +2522,12 @@
switch (HComparator) {
//瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
case '=':
- if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
default: break;
@@ -2353,10 +2537,12 @@
switch (HComparator) {
//瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
case '=':
- if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
default: break;
@@ -2373,58 +2559,72 @@
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
//涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
//涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
- if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
case '>':
//姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) > Number(HTargetVal)) {
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
case '>=':
//姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) >= Number(HTargetVal)) {
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
case '<':
//姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal)) {
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
case '<=':
//姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) <= Number(HTargetVal)) {
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break
case '<>':
//姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
case 'between':
//姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
default: break;
@@ -2436,58 +2636,72 @@
//姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
//涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
//涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
- if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
case '>':
//姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) > Number(HTargetVal)) {
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
case '>=':
//姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) >= Number(HTargetVal)) {
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
case '<':
//姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal)) {
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
case '<=':
//姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) <= Number(HTargetVal)) {
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break
case '<>':
//姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
case 'between':
//姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
default: break;
@@ -2502,10 +2716,12 @@
switch (HComparator) {
case '=':
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
- if (HInspectVal.toString() == HTargetVal.toString()) {
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
}
break;
default: break;
@@ -2515,10 +2731,12 @@
switch (HComparator) {
case '=':
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
- if (HInspectVal.toString() == HTargetVal.toString()) {
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ table.cache["mainTable"][HEntryID].HResult = 2
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ table.cache["mainTable"][HEntryID].HResult = 1
}
break;
default: break;
@@ -2542,6 +2760,7 @@
}
$("#HInspectResultToSee").val(HInspectResultToSee);
$("#HInspectResultToSee2").val(HInspectResultToSee);
+ LastResult();
};
//#endregion
@@ -2784,6 +3003,13 @@
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+ if (maindata[nowindex].HInspectResultToSee == "鍚堟牸") {
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
var HInterID = $("#HInterID").val();
var HEntryID = $("#HEntryID").val();
@@ -2814,7 +3040,7 @@
$('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
}
- //IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
form.render('select');
} else {
//layer.msg(result.code + result.Message, { icon: 5 });
@@ -2824,6 +3050,282 @@
}
}
//#endregion
+
+ //鑾峰彇涓嶅悎鏍兼暟鎬绘暟
+ function addUnRightQty() {
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ UnRightQty_isFied = UnRightQty;
+ $("#HSampleUnRightQty").val(UnRightQty);
+ $("#HSampleUnRightQty2").val(UnRightQty);
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ form.render('select');
+ LastResult();
+ }
+
+ //妫�楠屽�艰嚜鍔ㄥ垽鏂槸鍚﹀悎鏍�
+ function Qualified_Value(HComparator, MBValue, value, obj) {
+ var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+ var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+ var HStatus = $("#HStatus").val() //鐘舵��
+
+ if (HStatus == 1) {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ }
+ } else {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ }
+ }
+
+
+ form.render('select');
+ }
+
+ //妫�楠屽�间繚瀛�
+ function set_SaveValue(dataindex) {
+ for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+ if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+ table.cache['ValueTable'][i].HInSpectValueB = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+ table.cache['ValueTable'][i].HInSpectValueT = 0
+ }
+ if (table.cache['ValueTable'][i].HInSpectValue == "") {
+ table.cache['ValueTable'][i].HInSpectValue = 0
+ }
+ }
+ var sValueTable = JSON.stringify(table.cache['ValueTable']);
+ var HInterID = $("#HInterID").val();
+ var HEntryID = dataindex;
+ console.log(sValueTable);
+ var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+ async: true,
+ data: { "msg": msg },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+ }
+ else {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
//#region銆愰殣钘忔娴嬪�煎瓧娈点��
function IsHide(HAnalysisMethod_Value) {
@@ -2837,7 +3339,7 @@
$("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
$("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
$("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
- form.render("select");
+
$('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
$('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
@@ -2855,7 +3357,7 @@
$('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
$('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
$("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
- form.render("select");
+
} else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
option_Value.cols[0][5].hide = false; //鍏朵粬
@@ -2873,9 +3375,15 @@
$('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
$('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
$("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
- form.render("select");
+
}
+ //閲嶆柊娓叉煋琛ㄦ牸
table.render(option_Value);
+ //涓嬫媺妗嗗洖鏄�
+ for (var i = 0; i < option_Value.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + option_Value.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+ form.render("select");
}
//#endregion
@@ -2912,6 +3420,8 @@
layui.each(table.cache.mainTable, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
+ } else {
+ l.LAY_CHECKED = false;
}
});
for (var i = 0; i < option.data.length; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index 7d5241e..a1593cf 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -59,9 +59,18 @@
</form>
<!--</div>-->
</div>
-
-
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">妫�娴嬪��</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--妫�娴嬪��-->
+ <table class="layui-hide" id="mainTable_Value" lay-filter="mainTable_Value"></table>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
@@ -83,6 +92,9 @@
<script>
var _cur_page = 1;
var sql = " ";
+ var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
+ var checkobj = ""; //澶嶉�夋
+ var trindex = ""; //榛樿閫変腑琛屼笅鏍�
//var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -142,6 +154,8 @@
//鍏敤鍙橀噺
var option = [];
var HModName = "QC_FirstPieceCheckBillList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟娴嬪�硷級
+ var titleData_Value = [];
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
//甯歌鐢ㄦ硶
@@ -286,41 +300,177 @@
});
///鍔犺浇鏄剧ず鏁版嵁
+ //function RoadHBillNo(sqlWhere) {
+ // where = sqlWhere;
+ // var index0 = layer.load();
+ // $.ajax({
+ // type: "get",
+ // url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+ // async: true,
+ // data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
+ // success: function (result) {
+ // if (result.count == 1) {
+ // ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ // table.reload('mainTable', {
+ // data: ajaxReturnData
+ // , height: 'full-10'
+ // , page: {
+ // curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+ // }
+ // , loading: false
+ // , done: function (index, res) {
+
+ // }
+ // });
+ // layer.close(index0);
+ // } else {
+ // layer.close(index0);
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+
+ // },
+ // error: function (result) {
+ // layer.close(index0);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //};
+
+ // 鏌ヨ
function RoadHBillNo(sqlWhere) {
- where = sqlWhere;
- var index0 = layer.load();
+ var ajaxLoad = layer.load();
$.ajax({
- type: "get",
- url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
- async: true,
- data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
- success: function (result) {
- if (result.count == 1) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , page: {
- curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
- }
- , loading: false
- , done: function (index, res) {
+ url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
+ type: "GET",
+ data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ 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 });
}
- });
- layer.close(index0);
- } else {
- layer.close(index0);
- layer.alert(result.code + result.Message, { icon: 5 });
- }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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'
+ , height: 'full-50'
+ , page: true //寮�鍚垎椤�
+ , limit: 500
+ , limits: [500, 2000, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ };
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ table.render(option);
- },
- error: function (result) {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ //}
+ } else {
+ layer.close(ajaxLoad);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- };
+
+ }
+
+ //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ //閫変腑琛屾敼鍙橀鑹�
+ check_row(obj);
+
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ HBillNo = datas["鍗曟嵁鍙�"].toString();
+ var HInterID = datas.hmainid;
+ var HEntryID = datas.hsubid;
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/QC_ValueTable/getValueList',
+ type: "GET",
+ data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ async: false,
+ 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 (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData_Value) > -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 HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option_Value = {
+ elem: '#mainTable_Value'
+ //, toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option_Value);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(wait);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ });
+
form.on('submit(f_Query)', function (data) {//鏌ヨ
var sqlWhere = " and 1=1 ";
//if ($("#HStatus").val() != "")
@@ -395,6 +545,32 @@
_cur_page = 1;
RoadHBillNo(sqlWhere);
});
+
+ //鏀瑰彉閫変腑琛岄鑹�
+ function check_row(obj) {
+ if (checkobj != "") {
+ checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+
+ 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鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ checkobj = obj;
+ } 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;
+ }
+ });
+ }
//鏂板
function set_AddNew() {
@@ -495,12 +671,14 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "hsubid", "浣滃簾浜�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html"
new file mode 100644
index 0000000..b3edfbd
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceability.html"
@@ -0,0 +1,569 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浜х嚎缁勮杩芥函鍗�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <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/PubCustom.js"></script>
+
+ <style>
+ .main-btn { /*澶撮儴涓绘寜閽�*/
+ padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .btn-title {
+ font-size: 16px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px;">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">閫�鍑�</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">閲囬泦淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HBarCode" lay-verify="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ </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="HMaker" lay-verify="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 68px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" id="HICMOInterID" name="HICMOInterID" value="0" />
+ <input type="hidden" id="HICMOEntryID" name="HICMOEntryID" value="0" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMateMAC" name="HMateMAC" id="HMateMAC" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧SN</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBarCode_P" lay-verify="HBarCode_P" id="HBarCode_P" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" id="HMaterID" name="HMaterID" value="0" />
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" 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" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 100px; width: 184px;">
+ <select name="HAssemblyStatus" id="HAssemblyStatus" lay-verify="HAssemblyStatus">
+ <option value="鐢熶骇涓�" selected>鐢熶骇涓�</option>
+ <option value="姹囨姤">姹囨姤</option>
+ <option value="妫�楠�">妫�楠�</option>
+ <option value="鍖呰">鍖呰</option>
+ <option value="鍏ュ簱">鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 56%;">
+ <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="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 50%;">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="width: 49%; float: left;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍏抽敭浠舵竻鍗�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鍏抽敭浠舵竻鍗�-->
+ <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" style="width: 49%; float: left; margin-left: 1%; ">
+ <ul class="layui-tab-title">
+ <li class="layui-this">閲囬泦璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--閲囬泦璁板綍-->
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine2"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine2"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" />
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script type="text/html" id="barDemo2">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ var option = [];
+ var option2 = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+ var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ OperationType = 1;
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //璧嬪��
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBarCode);
+ }
+ });
+
+
+
+ ////琛屽唴浜嬩欢
+ //table.on('tool(mainTable)', function (obj) {
+ // set_GridDelete(obj); //琛屽唴鍒犻櫎
+ //});
+
+ ////琛屽唴浜嬩欢
+ //table.on('tool(mainTable2)', function (obj) {
+ // set_GridDelete2(obj); //琛屽唴鍒犻櫎
+ //});
+
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ //涓虹┖楠岃瘉
+ if (AllowLoadData(data)) {
+ set_AddNew(data,3);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ $("#HBarCode").focus(); //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ set_InitGrid();
+ set_InitGrid2();
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);//缁勭粐
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_Display();
+ }
+
+ function set_InitGrid() {
+ //瀛愯〃 鍒濆鍖栬〃鏍兼暟鎹�
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }//f7
+ , { field: 'HMaterID', title: 'HMaterID ', hide: true }//f7
+ , { field: '浜у搧鏉＄爜', title: 'SN鐮�' }
+ , { field: '閰嶄欢鏉＄爜', title: '閰嶄欢SN鐮�' }
+ , { field: '浠诲姟鍗曞彿', title: '璁㈠崟鍙�' }
+ , { field: 'HPRDORGID', title: 'HPRDORGID', hide: true }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ };
+ //var rowdata = [{
+ // "HDate": "", "HMaterName": "", "HMaterID": 0, "HBarCode": "", "HBarCode_P": "",
+ // "HICMOBillNo": ""
+ //}];
+ option.data = [];
+ table.render(option);
+
+ }
+
+ function set_InitGrid2() {
+ //瀛愯〃 鍒濆鍖栬〃鏍兼暟鎹�
+ option2 = {
+ elem: '#mainTable2'
+ //, toolbar: '#toolbarDemo2'
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , cellMinWidth: 120
+ , height: 400
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿', totalRow: true }
+ , { field: 'HDate', title: '鏃ユ湡', edit: 'text' }
+ , { field: 'HMaterName', title: '閰嶄欢鍚嶇О' }//f7
+ , { field: 'HMaterID', title: 'HMaterID ', hide: true }//f7
+ , { field: 'HMaterModel', title: '閰嶄欢瑙勬牸' }
+ , { field: 'HQty', title: '閰嶄欢鏁伴噺' }
+ , { field: 'HBardQty', title: '宸叉壂鏁伴噺' }
+ , { field: 'HPRDORGID', title: 'HPRDORGID', hide: true }
+ , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ , { field: 'HEQty', title: 'HEQty', hide: true }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo2' }
+ ]]
+ };
+ var rowdata = [{
+ "HDate": "", "HMaterName": "", "HMaterID": 0, "HMaterModel": "", "HQty": 0,
+ "HBardQty": 0, "HPRDORGID": $("#HProdOrgID").val(), "HBarCode": "","HEQty":0
+ }];
+ option2.data = rowdata;
+ table.render(option2);
+
+ }
+
+ //鍒濆鍖栨煡璇�
+ function get_Display() {
+ var sWhere = " and HProdOrgID=" + sessionStorage["OrganizationID"] + " and 鍒跺崟浜�='" + $("#HMaker").val() +"' and DATEDIFF(DAY,GETDATE(),鏃ユ湡)=0";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_AssemblyBill/Sc_AssemblyBillAddList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //鏉＄爜鍥炶溅鏌ヨ
+ function txtHBarCode_KeyDown(HBarCode) {
+
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_AssemblyBill/HBardCodeList",
+ async: true,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HICMOBillNo": $("#HICMOBillNo").val()},
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ var data_1 = null;
+ var option_s = [];
+ if ($("#HICMOBillNo").val() == "") {
+ $("#HICMOBillNo").val(data.data[0]["FMOBILLNO"]);
+ $("#HICMOInterID").val(data.data[0]["HSourceInterID"]);
+ $("#HICMOEntryID").val(data.data[0]["HSourceEntryID"]);
+ $("#HBarCode_P").val($("#HBarCode").val());
+ $("#HMaterID").val(data.data[0]["HItemID"]);
+ $("#HMaterNumber").val(data.data[0]["HMaterNumber"]);
+ $("#HMaterName").val(data.data[0]["HMaterName"]);
+ $("#HMaterModel").val(data.data[0]["HMaterModel"]);
+ var num = [];
+ for (var i = 0; i < data.data.length; i++) {
+ num.push({
+ "HDate": Format(new Date().getTime(), 'yyyy-MM-dd hh:mm:ss'), "HMaterName": data.data[i]["HMaterName_z"], "HMaterID": data.data[i]["HMaterID"], "HMaterModel": data.data[i]["HMaterModel_z"], "HQty": data.data[i]["FMUSTQTY"],
+ "HBardQty": 0, "HPRDORGID": $("#HProdOrgID").val(), "HBarCode": "","HEQty":0
+ });
+ }
+ option2.data = num;
+ data_1 = set_AddNew({ "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val() } }, 1);
+
+ } else {
+ option_s = JSON.stringify(option2.data);
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HMaterID"] == data.data[0]["HMaterID"]) {
+ option2.data[i]["HBardQty"] += data.data[0]["HQty"];
+ option2.data[i]["HBarCode"] = $("#HBarCode").val();
+ option2.data[i]["HEQty"] = data.data[0]["HQty"];
+ } else {
+ option2.data[i]["HBarCode"] = "";
+ }
+ }
+ data_1 = set_AddNew({ "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val() } }, 2);
+
+ }
+ if (data_1.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛");
+ layer.close(index);
+ table.render(option2);
+ }
+ else {
+ option2.data = JSON.parse(option_s);
+ layer.msg(data_1.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ $("#HBarCode").val("");
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ ////琛屽唴鍒犻櫎
+ //function set_GridDelete(obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'del') {
+ // layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ // if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ // } else {
+ // var oldData = table.cache["mainTable"];
+ // oldData.splice(obj.tr.data('index'), 1)
+ // option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ // table.render(option);
+ // layer.close(index);
+ // }
+ // });
+ // }
+ //}
+
+ ////琛屽唴鍒犻櫎
+ //function set_GridDelete2(obj) {
+ // var data = obj.data;
+ // var rowIndex = $(obj.tr).attr("data-index");
+ // if (obj.event === 'del') {
+ // layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ // if (rowIndex === '0') {
+ // layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ // } else {
+ // var oldData = table.cache["mainTable2"];
+ // oldData.splice(obj.tr.data('index'), 1)
+ // option2.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ // table.render(option2);
+ // layer.close(index);
+ // }
+ // });
+ // }
+ //}
+
+ //淇濆瓨鏁版嵁
+ function set_AddNew(data, num) {
+ var data_1 = [];
+ //杩囨护瀛愯〃鍒犻櫎涔嬪悗鐣欎笅鐨勭┖鏁版嵁
+ var num2 = [];
+ for (var i = 0; i < option2.data.length; i++) {
+ //缁欎笉鑳戒负绌虹殑鏁版嵁 璧嬪��(瀛�)
+ if (option2.data[i] != "") {
+ num2.push(option2.data[i]);
+ }
+ }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num2);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + num + ";" + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_AssemblyBill/AddBill",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (res) {
+ layer.close(index);
+ if (num != 3) {
+ data_1 = res;
+ } else {
+ if (res.count == 1) {
+ layer.msg("鎻愪氦鎴愬姛", { time: 1 * 1000, icon: 1 }, function () {
+ location.replace('Cj_AssemblyTraceability.html');
+ });
+ }
+ else {
+ layer.msg(res.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ }
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ return data_1;
+ }
+
+ //鏁版嵁楠岃瘉
+ function AllowLoadData(data) {
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟
+ if (HICMOBillNo == "") {
+ layer.msg("璇锋壂浜у搧鐮�!");
+ return false;
+ }
+ var count = 0;
+ for (var i = 0; i < option2.data.length; i++) {
+ if (option2.data[i]["HBardQty"] != 0) {
+ count += 1;
+ }
+ }
+ if (count == 0) {
+ layer.msg("璇锋壂閰嶄欢鐮�!");
+ return false;
+ }
+ return true;
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html"
new file mode 100644
index 0000000..08216f6
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277\347\273\204\350\243\205\350\277\275\346\272\257/Cj_AssemblyTraceabilityList.html"
@@ -0,0 +1,764 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>浜х嚎缁勮杩芥函鍒楄〃</title>
+ <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/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
+ <script src="../../../layuiadmin/pubcustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.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">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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;">鐢熶骇璁㈠崟缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HProdOrgID" id="HProdOrgID" lay-verify="HProdOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </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-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+ <!--鍏朵粬鏉′欢-->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 76px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 107px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HModel" id="HModel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" 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" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<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 = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+ var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "Cj_AssemblyTraceabilityList";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ DisPlay_HideColumn();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
+ //娴忚
+ case 'get_PrintReport': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳
+ case 'set_CheckBill': set_CheckBill(1);
+ break;
+ //鍙嶅鏍�
+ case 'set_AbandonCheck': set_CheckBill(2);
+ break;
+ //鍏抽棴
+ case 'set_CloseBill': set_CloseBill(1);
+ break;
+ //鍙嶅叧闂�
+ case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery(2);
+ });
+ //#endregion
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+
+ get_btnHMaterID();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HProdOrgID").append(Organization);
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ Organ();
+ //鏌ヨ
+ get_FastQuery(1);
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#HMaterID").val(0);//鐗╂枡
+ $("#HMaterName").val("");//鐗╂枡
+ $("#HMaterNumber").val("");//鐗╂枡
+ $("#HModel").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#HProdOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //鐗╂枡
+ function get_btnHMaterID() {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ }
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ //sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_AssemblyBill/list1',
+ type: "GET",
+ 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', totalRowText: '鍚堣' });
+ 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:
+ if (data[i].name == '鐢熶骇鏁伴噺' || data[i].name == '娴佽浆鍗℃暟閲�' || data[i].name == '鍏ュ簱鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ 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: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ 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
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(number) {
+ var HProdOrgID = "";
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ //var HMaterID = $("#HMaterID").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HModel = $("#HModel").val();
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").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 (number == 1) {
+ HProdOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HProdOrgID = $("#HProdOrgID").val();//缁勭粐
+ }
+
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (HMaterName) {
+ sWhere += "and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ }
+ if (HMaterNumber) {
+ sWhere += "and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HModel) {
+ sWhere += "and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ if (HProdOrgID) {
+ sWhere += " and HProdOrgID = '" + HProdOrgID + "'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+ //var linteridSub = data[0].hsubid;
+
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hmainid = data[0].hmainid;
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
+ type: "GET",
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳 [1 瀹℃牳銆�2 鍙嶅鏍竇
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ } else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+ //鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
+ function set_CloseBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (data.length == 1) {
+ layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var wait = layer.load();
+ var HInterID = data[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
+ type: "GET",
+ data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ }
+ }
+
+
+ //#endregion
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; 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);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ 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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; 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 });
+ }
+ })
+ }
+
+ //#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
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+</script>
\ No newline at end of file
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_StationOutBill.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_StationOutBill.html"
index 58646bd..47aaec6 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_StationOutBill.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_StationOutBill.html"
@@ -177,7 +177,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" value="0" name="HProcID" id="HProcID">
+ <!--<input type="hidden" value="0" name="HProcID" id="HProcID">-->
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 5d2ae52..ef92c37 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -94,6 +94,16 @@
<input type="text" class="layui-input" name="HErpID" id="HErpID">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
@@ -411,6 +421,7 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
+ get_Dept();
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栦富琛ㄥ垪琛�
@@ -460,6 +471,7 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var HDeptName = $("#HDeptName").val();//杞﹂棿
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -514,6 +526,9 @@
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
+ if (HDeptName!="0") {
+ sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
}
if (HErpID) {
sWhere += " and 鍞竴ID like '%" + HErpID + "%'";
@@ -707,6 +722,40 @@
}
//#endregion
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ 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;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
function check_row(obj) {
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 0d5e6d9..00312e9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -81,13 +81,12 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐝粍</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block">
+ <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
</div>
</div>
</div>
@@ -259,6 +258,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
+ get_Dept();
//鍒濆鍖栨椂闂�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
@@ -362,13 +362,47 @@
});
}
+ //鐢熶骇杞﹂棿
+ function get_Dept() {
+ //鑾峰彇杞﹂棿鍒�
+ 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;
+ if (sessionStorage["OrganizationID"] == 100014) {
+ HDeptName += '<option style="color:blue;" value="2679633" >姘寸涓�鏉℃祦</option>';
+ HDeptName += '<option style="color:blue;" value="1592361" >閮ㄤ欢娌瑰喎鍣ㄥ反</option>';
+ HDeptName += '<option style="color:blue;" value="1592371" >灏忚溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1592374" >灏忚溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743766" >鍗¤溅瑁呰姱宸�</option>';
+ HDeptName += '<option style="color:blue;" value="1743767" >鍗¤溅鎬绘垚宸�</option>';
+ HDeptName += '<option style="color:blue;" value="2679647" >鍗¤溅姘寸涓�鏉℃祦</option>';
+ } else {
+ for (var i = 0; i < data.length; i++) {
+ HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
+ }
+ }
+
+ $("#HDeptName").append(HDeptName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//蹇�熻繃婊�
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//娴佽浆鍗″彿
var HICMOBillNo = $("#HICMOBillNo").val(); //鎵瑰彿
- var HWorkShopID = $("#HWorkShopID").val();//鐝粍
+ var HWorkShopID = $("#HDeptName").val();//杞﹂棿
var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HState = $("#HState").val();//鐘舵��
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
index 736a550..4f50ad1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
@@ -97,8 +97,8 @@
<table class="" id="mainTable1" lay-filter="mainTable1"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
</div>
</script>
</form>
@@ -243,7 +243,7 @@
}
option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
@@ -314,7 +314,7 @@
}
option = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
index 5cebee3..3715bcf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
@@ -397,7 +397,7 @@
success: function (data1) {
if (data1.count == 1) {
layer.msg(data1.Message);
- get_FastQuery();
+ //get_FastQuery();
} else {
layer.msg(data1.Message);
}
@@ -427,7 +427,7 @@
data: { "sMainSub": sMainSub },
success: function (data1) {
if (data1.count == 1) {
- get_FastQuery();
+ //get_FastQuery();
layer.close(index);
layer.msg(data1.Message);
} else {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index 513ba83..d3c6235 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -227,8 +227,8 @@
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1206'
$.ajax(
{
@@ -268,7 +268,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
$.ajax(
{
type: "Get",
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
index 9b5831c..9c4b93c 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
@@ -219,8 +219,8 @@
}else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1205'
$.ajax(
{
@@ -259,7 +259,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
index b48c680..2f3d879 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
@@ -265,8 +265,8 @@
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1204'
$.ajax(
{
@@ -307,7 +307,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
index 9e701ac..9d4fcb5 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_FastList.html"
@@ -313,8 +313,8 @@
} else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1202'
$.ajax(
{
@@ -356,7 +356,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
index a3ad574..470a92a 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_FastList.html"
@@ -253,8 +253,8 @@
}else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
- var sBillNo = data[0].HBillNo = 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sBillNo = data[0].HBillNo == 'undefined' ? data[0].鍗曟嵁鍙� : data[0].HBillNo;
var sBillType = '1203'
$.ajax(
{
@@ -296,7 +296,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
index f8dbf15..b89a7a9 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
@@ -278,7 +278,7 @@
var checkStatus = table.checkStatus('dj-table')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var sInterID = data[0].HInterID = 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
+ var sInterID = data[0].HInterID == 'undefined' ? data[0].鍗曟嵁鍐呯爜 : data[0].HInterID;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax(
--
Gitblit v1.9.1