From 2b1007bdc290521ad32cc77b24f6e94512b4a363 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 11 十一月 2025 11:02:53 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html | 2
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 14
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html | 645 +++++++-
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 2
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batch.html | 2
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html | 1953 +++++++++++++++++++++++++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 285 +++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateCaseCode.html | 475 +++++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 32
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 4
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html | 517 ++++++-
12 files changed, 3,499 insertions(+), 433 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a9ea8ea..7a951e0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -823,6 +823,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\QC_SpcCenterlineList.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\宸℃璁板綍鍗昞QC_Add_Edit_PatrolProcCheckBill_XW.html" />
<Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_BackSampleCheckBill_PDA.html" />
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 71f28fc..04374cb 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"
@@ -317,6 +317,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PatrolProcCheck" id="btn-PatrolProcCheck"><i class="layui-icon layui-icon-form"></i>宸℃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PatrolProcCheck-Time" id="btn-PatrolProcCheck-Time"><i class="layui-icon layui-icon-form"></i>闂撮殧宸℃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck"><i class="layui-icon layui-icon-form"></i>鏈</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>鍖呰澶囨敞</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -622,6 +623,9 @@
break;
//宸℃
case 'btn-PatrolProcCheck': set_PatrolProcCheck();
+ break;
+ //闂撮殧宸℃
+ case 'btn-PatrolProcCheck-Time': set_PatrolProcCheck_Time();
break;
//鏈
case 'btn-ProcessCheck': set_ProcessCheck();
@@ -2069,6 +2073,34 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+
+ //闂撮殧宸℃
+ function set_PatrolProcCheck_Time() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var HEntryID = data[0].hsubid.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸℃妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill_XW.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=' + HEntryID, 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//鏈
function set_ProcessCheck() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index 8c9dcc6..c3a7303 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -51,6 +51,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display: none;" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="display: none;">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
@@ -364,6 +370,7 @@
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡缂栫爜
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HICOMBillNo = $("#HICOMBillNo").val();//鐢熶骇璁㈠崟鍙�
+ var HSourceName = $("#HSourceName").val();//鐢熶骇璧勬簮
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -389,6 +396,10 @@
if (HICOMBillNo) {
sWhere += " and 鐢熶骇璁㈠崟鍙� like'%" + HICOMBillNo + "%'";
}
+ if (HSourceName) {
+ sWhere += " and 鐢熶骇璧勬簮 like'%" + HSourceName + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -405,6 +416,7 @@
$("#HMaterName").val("");//鐗╂枡鍚嶇О
$("#HMaterNumber").val("");//鐗╂枡缂栫爜
$("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
+ $("#HSourceName").val("");//鐢熶骇璧勬簮
sWhere = "";
}
//#endregion
@@ -685,7 +697,7 @@
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
- titleData = [];
+ titleData = ["鍗曟嵁绫诲瀷"];
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
new file mode 100644
index 0000000..a113dc4
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -0,0 +1,1953 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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">
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <style>
+ /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+ /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <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="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align: center; padding: 10px 0;"><b>宸℃鍗�</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗� 鎹� 鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input id="HInterID" name="HInterID" value="0" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px; width: 110%;">
+ </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="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" 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" 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="HSource" name="HSource" id="HSource" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input id="HSourceID" name="HSourceID" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="display:none;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">宸ュ簭浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 72px;">
+ <input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 63%;display: inline-block;" readonly>
+ <input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMainProcNumber-BT" id="HMainProcNumber-BT" 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="margin-left:5px;">宸ュ簭鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
+ </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="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" 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="HShiftsID" id="HShiftsID" value="0">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 72px;">
+ <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 63%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" 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="margin-left:5px;">浠诲姟鍗曟暟閲�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HICMOQty" id="HICMOQty" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" style="background-color: #efefef4d;" value="0" 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="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
+ <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>
+
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label" style="margin-left:10px;">浠诲姟鍗曞唴鐮�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HICMOInterID" id="HICMOInterID" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="0">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 72px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 63%;display: inline-block;" readonly>
+ <input id="HMaterID" name="HMaterID" type="hidden" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateria-BT" id="HMateria-BT" 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="margin-left:5px;"> 浜у搧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterName" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:5px;"> 瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterModel" onkeyup="this.value=this.value.replace(/\D/g,'')" value="" lay-verify="" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒ゆ柇缁撹</label>
+ <div class="layui-input-block">
+ <input type="radio" name="HLastResult" id="HLastResult" value="1" title="鍚堟牸" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="0" title="涓嶅悎鏍�">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" style="width: 45%;">
+ <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" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 45%">
+ <label class="layui-form-label" style="width: 85px;">寮傚父涓存椂<br />澶勭悊鏂规</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HErrTreatment" id="HErrTreatment" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="margin-top:10px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="display:none">
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label"> 娴佽浆鍗D</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchInterID" value="0" lay-verify="" id="HProcExchInterID" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none">
+ <label class="layui-form-label"> 娴佽浆鍗″瓙ID</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchEntryID" value="0" lay-verify="" id="HProcExchEntryID" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:5px;"> 娴佽浆鍗℃暟閲�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcExchQty" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HProcExchQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left:10px;"> 娴佽浆鍗″彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">妫�楠岄」鐩�</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">
+ <!--涓嶈壇鍘熷洜-->
+ <table class="layui-hide" id="BadReTable" lay-filter="BadReTable"></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-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </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>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
+ <script type="text/html" id="HQCNote1">
+ <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�2)-->
+ <script type="text/html" id="HQCNote2">
+ <select name="HQCNote2" lay-filter="HQCNote2" id="HQCNote2{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�3)-->
+ <script type="text/html" id="HQCNote3">
+ <select name="HQCNote3" lay-filter="HQCNote3" id="HQCNote3{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�4)-->
+ <script type="text/html" id="HQCNote4">
+ <select name="HQCNote4" lay-filter="HQCNote4" id="HQCNote4{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�5)-->
+ <script type="text/html" id="HQCNote5">
+ <select name="HQCNote5" lay-filter="HQCNote5" id="HQCNote5{{d.LAY_TABLE_INDEX+1}}">
+ <option value="">璇烽�夋嫨</option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </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/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script>
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HICMOEntryID = params[params[3]]; //鐢熶骇璁㈠崟瀛愬唴鐮�
+ var closeType = 2; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+ //debugger
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "7506";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
+ var tableReload = table.reload;
+ window.option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
+ , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+ , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
+ , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
+ , { field: 'HQCNote1', title: '妫�楠岃褰�1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
+ , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text' }
+ , { field: 'HQCNote2', title: '妫�楠岃褰�2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
+ , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text' }
+ , { field: 'HQCNote3', title: '妫�楠岃褰�3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
+ , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text' }
+ , { field: 'HQCNote4', title: '妫�楠岃褰�4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
+ , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text' }
+ , { field: 'HQCNote5', title: '妫�楠岃褰�5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
+ , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text' }
+ , { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
+ , { field: 'HQCNote6_SN', title: '鎶芥SN6', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
+ , { field: 'HQCNote7_SN', title: '鎶芥SN7', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
+ , { field: 'HQCNote8_SN', title: '鎶芥SN8', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
+ , { field: 'HQCNote9_SN', title: '鎶芥SN9', width: 185, edit: 'text', hide: true }
+ , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
+ , { field: 'HQCNote10_SN', title: '鎶芥SN10', width: 185, edit: 'text', hide: true }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+
+ var option_BadRe = {
+ elem: '#BadReTable'
+ , toolbar: '#toolbarDemo2'
+ , totalRow: true
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜ID', edit: 'text', hide: true }
+ , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text', width: 120, event: "HBadReason" }
+ , { field: 'HBadReasonName', title: '涓嶈壇鍘熷洜', edit: 'text', width: 120 }
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 120, event: "HQty", totalRow: true }
+ , { field: 'HEmpID', title: '璐ｄ换浜篒D', edit: 'text', hide: true }
+ , { field: 'HEmpNumber', title: '璐ｄ换浜轰唬鐮�', edit: 'text', width: 120, event: "HEmp" }
+ , { field: 'HEmpName', title: '璐ｄ换浜�', edit: 'text', width: 120 }
+ , { field: 'HProcID', title: '璐ｄ换宸ュ簭ID', edit: 'text', hide: true }
+ , { field: 'HProcNumber', title: '璐ｄ换宸ュ簭浠ｇ爜', edit: 'text', width: 120, event: "HProc" }
+ , { field: 'HProcName', title: '璐ｄ换宸ュ簭', edit: 'text', width: 120 }
+ , { field: 'HCheckEmpID', title: '纭浜篒D', edit: 'text', hide: true }
+ , { field: 'HCheckEmpNumber', title: '纭浜轰唬鐮�', edit: 'text', width: 120, event: "HCheckEmp" }
+ , { field: 'HCheckEmpName', title: '纭浜�', edit: 'text', width: 120 }
+ , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', width: 120, event: "HMater" }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 120 }
+ , { field: 'HCreateDate', title: '鐧昏鏃ユ湡', edit: 'text', width: 120, event: 'HCreateDate' }
+ , { field: 'HFinishDate', title: '瀹屾垚鏃ユ湡', edit: 'text', width: 120, event: 'HFinishDate' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+
+ $("#HFirstCheckEmp").val(sessionStorage["HCheckEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳ID
+ $("#HEmpName").val(sessionStorage["HCheckEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭妫�楠屽憳
+
+ //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ option.data = [{
+ "妫�楠岄」鐩垎绫�": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " "
+ , "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
+ , "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
+ , "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""
+ }];
+ table.render(option);
+
+ option_BadRe.data = [{
+ "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ }];
+ table.render(option_BadRe);
+ }
+ else if (OperationType == 2) {
+ //鐢熶骇璁㈠崟鍒楄〃宸℃
+ if (HSouceBillType == 3710) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation_ICMO();
+ }
+ else {
+ layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
+ }
+
+ option_BadRe.data = [{
+ "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ }];
+ table.render(option_BadRe);
+ }
+ else if (OperationType == 3) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁--琛ㄤ綋
+ $.ajax({
+ url: GetWEBURL() + 'MES_QC_PatrolProcCheckDetail_Json',
+ type: "GET",
+ data: { "sqlWhere": "and HInterID=" + linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ //妫�楠岄」鐩�
+ var rowdata = [];
+ var data = result.data;
+ for (let i = 0; i < result.data.length; i++) {
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
+ "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
+ "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
+ "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞,
+ "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7
+ , "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10
+ });
+ }
+
+ option.data = rowdata;
+ table.render(option);
+ for (var i = 0; i < result.data.length; i++) {
+ $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
+ $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
+ $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
+ $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
+ $('#HQCNote5' + (i + 1)).find("option[value='" + result.data[i].HQCNote5 + "']").attr("selected", true);
+ }
+ form.render('select');
+
+ //涓嶈壇鍘熷洜
+ var baddata = [];
+ var HSEQArr = [];
+ for (let i = 0; i < result.data.length; i++) {
+ if (HSEQArr.indexOf(data[i].琛屽彿) == -1) {
+ HSEQArr.push(data[i].琛屽彿);
+ baddata.push({
+ "HBadReasonID": data[i].HBadReasonID, "HBadReasonNumber": data[i].涓嶈壇鍘熷洜浠ｇ爜, "HBadReasonName": data[i].涓嶈壇鍘熷洜鍚嶇О,
+ "HEmpID": data[i].HEmpID, "HEmpNumber": data[i].璐ｄ换浜轰唬鐮�, "HEmpName": data[i].璐ｄ换浜哄悕绉�, "HProcID": data[i].HProcID,
+ "HProcNumber": data[i].璐ｄ换宸ュ簭浠ｇ爜, "HProcName": data[i].璐ｄ换宸ュ簭鍚嶇О, "HCheckEmpID": data[i].HCheckEmpID,
+ "HCheckEmpNumber": data[i].纭浜轰唬鐮�, "HCheckEmpName": data[i].纭浜哄悕绉�, "HMaterID": data[i].HMaterID,
+ "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿,
+ "HCreateDate": Format(new Date(data[i].鐧昏鏃ユ湡), "yyyy-MM-dd"), "HFinishDate": Format(new Date(data[i].瀹屾垚鏃ユ湡), "yyyy-MM-dd"),
+ "HQty": data[i].涓嶈壇鏁伴噺, "HRemark": data[i].涓嶈壇澶囨敞
+ });
+ }
+ }
+
+ option_BadRe.data = baddata;
+ table.render(option_BadRe);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //澶村伐鍏锋爮浜嬩欢
+ var rowid = 0;
+ var rows = 0;
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = {
+ "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": " ", "HQCNote4": " ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " ", "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
+ , "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""};
+ switch (obj.event) {
+ case 'btn-AddLine':
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+ //涓嶈壇鍘熷洜
+ table.on('toolbar(BadReTable)', function (obj) {
+ var checkStatus = table.checkStatus('BadReTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['BadReTable'];
+ var NewRow = {
+ "HQCCheckItemID": 0, "HBadReasonID": 0, "HBadReasonNumber": "", "HBadReasonName": "", "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HProcID": 0,
+ "HProcNumber": "", "HProcName": "", "HCheckEmpID": 0, "HCheckEmpNumber": "", "HCheckEmpName": "", "HMaterID": 0, "HMaterNumber": "",
+ "HMaterName": "", "HMaterModel": "", "HCreateDate": Format(new Date(), "yyyy-MM-dd"), "HFinishDate": Format(new Date(), "yyyy-MM-dd"), "HQty": 0, "HRemark": ""
+ };
+ switch (obj.event) {
+ case 'btn-AddLine_Bad':
+ table.cache["BadReTable"].push(NewRow);
+ option_BadRe.data = table.cache["BadReTable"];
+ table.render(option_BadRe);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine_Bad':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["BadReTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option_BadRe.data = table.cache["BadReTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option_BadRe);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+
+ //琛屽唴浜嬩欢--涓嶈壇鍘熷洜
+ table.on('tool(BadReTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == 'HCreateDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ if (obj.event == 'HFinishDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ //鍒锋柊澶嶉�夋
+ //checkRefresh();
+ }
+ });
+ }
+ if (obj.event == 'HQty') {
+ $(obj.tr).find(".layui-table-edit").keyup(function () {
+ var $input = $(this), val = $input.val();
+ if (!val) val = "0";
+ $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ });
+ }
+
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HBadReason') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓嶈壇鍘熷洜鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.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({
+ HBadReasonID: checkStatus.data[0].HItemID
+ , HBadReasonNumber: checkStatus.data[0].涓嶈壇鍘熷洜浠ｇ爜
+ , HBadReasonName: checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HEmp') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ｄ换浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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({
+ HEmpID: checkStatus.data[0].HItemID
+ , HEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜
+ , HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HProc') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ｄ换宸ュ簭鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HProcID: checkStatus.data[0].HItemID
+ , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ , HProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HCheckEmp') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '纭浜哄垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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({
+ HCheckEmpID: checkStatus.data[0].HItemID
+ , HCheckEmpNumber: checkStatus.data[0].鑱屽憳浠ｇ爜
+ , HCheckEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event == 'HMater') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.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({
+ HMaterID: checkStatus.data[0].HItemID
+ , HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜
+ , HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О
+ , HMaterModel: checkStatus.data[0].瑙勬牸鍨嬪彿
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ layer.close(index);
+ }
+ });
+ }
+ if (obj.event === 'ReasonNameEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+ //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '涓嶈壇鍘熷洜鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html', 'yes']
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ _obj.update({
+ HWasterReasonName: checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О
+ , HBadReasonID: checkStatus.data[0].HItemID
+ });
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ //, end: function () {
+ // _obj.update({
+ // HWasterReasonName: HReasonName
+ // , HBadReasonID: ReasonID
+ // });
+ //}
+ })
+ console.log("瀛楁璧嬪��" + data.HWasterReasonName);
+ console.log("琛屽彿锛�" + rowIndex);
+ break;
+ }
+ }
+ else if (obj.event === 'EmpNameEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+ //寮瑰嚭妗嗛�夋嫨璐ｄ换浜�
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ _obj.update({
+ HEmpName: checkStatus.data[0].鑱屽憳鍚嶇О
+ });
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ //, end: function () {
+ // _obj.update({
+ // HEmpName: EmpName
+ // });
+ //}
+ })
+ console.log("瀛楁璧嬪��" + data.HEmpName);
+ console.log("琛屽彿锛�" + rowIndex);
+ break;
+ }
+ }
+ else if (obj.event === 'SQProcNameEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+ //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢宠宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ _obj.update({
+
+ HSQProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+ , HProcID: checkStatus.data[0].HItemID
+ });
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ //, end: function () {
+ // _obj.update({
+ // HSQProcName: SQProcName
+ // , HProcID: ProcID
+ // });
+ //}
+ })
+ console.log("瀛楁璧嬪��" + data.HSQProcName);
+ console.log("琛屽彿锛�" + rowIndex);
+ break;
+ }
+ }
+ else if (obj.event === 'ZRProcNameEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+ //寮瑰嚭妗嗛�夋嫨璐ｄ换宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '璐ｄ换宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ _obj.update({
+
+ HZRProcName: checkStatus.data[0].宸ュ簭鍚嶇О
+
+ });
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ //, end: function () {
+ // _obj.update({
+ // HZRProcName: ZRProcName
+ // });
+ //}
+ })
+ console.log("瀛楁璧嬪��" + data.HZRProcName);
+ console.log("琛屽彿锛�" + rowIndex);
+ break;
+ }
+ }
+ else if (obj.event === 'BadQtyEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+
+ break;
+ }
+ }
+ else if (obj.event === 'RemarkEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+
+ break;
+ }
+ }
+ else if (obj.event === 'PSProcNameEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+ //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鑱屽憳鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , resize: false
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ _obj.update({
+
+ HPSProcName: checkStatus.data[0].鑱屽憳鍚嶇О
+
+ });
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ //, end: function () {
+ // _obj.update({
+ // HPSProcName: QRName
+ // });
+ // }
+ //}
+ })
+ console.log("瀛楁璧嬪��" + data.HPSProcName);
+ console.log("琛屽彿锛�" + rowIndex);
+ break;
+ }
+ }
+ else if (obj.event === 'CloseManEvent') {
+ var _obj = obj;
+ switch (rowIndex) {
+ case "0":
+
+ break;
+ }
+ }
+ });
+
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "GetQC_PatrolProcCheckDetail",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_QC_Edit_PatrolProcCheckBillList[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ //, "HSource": data.鐢熶骇璧勬簮鍚嶇О
+ //, "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HICMOBillNo": data.鐢熸垚璁㈠崟鍙�
+ , "HICMOQty": data.鐢熶骇璁㈠崟鏁伴噺
+ , "HICMOInterID": data.鐢熶骇璁㈠崟涓诲唴鐮�
+ , "HICMOEntryID": data.鐢熶骇璁㈠崟瀛愬唴鐮�
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterID": data.浜у搧ID
+ , "HMaterNumber": data.浜у搧鍐呯爜
+ //, "HProcExchQty": data.HProcExchQty
+ //, "HProcExchBillNo": data.HProcExchBillNo
+ //, "HProcExchInterID": data.HProcExchInterID
+ //, "HProcExchEntryID": data.HProcExchEntryID
+ , "HEmpName": data.妫�楠屽憳鍚嶇О
+ , "HFirstCheckEmp": data.妫�楠屽憳ID
+ , "HMainProcID": data.HMainProcID
+ , "HMainProcNumber": data.宸ュ簭浠ｇ爜
+ , "HMainProcName": data.宸ュ簭鍚嶇О
+ , "HRemark": data.琛ㄥご澶囨敞
+ , "HShiftsID": data.HShiftsID
+ , "HShiftsName": data.鐝鍚嶇О
+ , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HQCSchemeID": data.HQCSchemeID
+ , "HQCSchemeName": data.璐ㄦ鏂规鍚嶇О
+ });
+
+
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+ function LoadingInformation_ICMO() {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/QC_PatrolProcCheckBill/get_ICMOBill',
+ type: "GET",
+ async: false,
+ data: { "HICMOInterID": linterid, "HICMOEntryID": HICMOEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+ $("#HICMOInterID").val(data.hmainid);
+ $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HSource").val(data.鐢熶骇璧勬簮);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
+ $("#HMaterName").val(data.浜у搧鍚嶇О);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
+ $("#HMainSourceInterID").val(data.hmainid);
+ $("#HICMOEntryID").val(data.HEntryID);
+ $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+ $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+ get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
+ function get_CheckItem() {
+ var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ async: false,
+ data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
+ "HQCStd": "",
+ "HQCNote1": "",
+ "HQCNote2": "",
+ "HQCNote3": "",
+ "HQCNote4": "",
+ "HQCNote5": "",
+ "HQCNote6": "",
+ "HQCNote7": "",
+ "HQCNote8": "",
+ "HQCNote9": "",
+ "HQCNote10": "",
+ "HRemark": "",
+ "HQCNote1_SN": "",
+ "HQCNote2_SN": "",
+ "HQCNote3_SN": "",
+ "HQCNote4_SN": "",
+ "HQCNote5_SN": "",
+ "HQCNote6_SN": "",
+ "HQCNote7_SN": "",
+ "HQCNote8_SN": "",
+ "HQCNote9_SN": "",
+ "HQCNote10_SN": ""
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+ }
+ //#endregion
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1 || OperationType == 2) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val(0);
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '7506' },
+ success: function (d) {
+ //console.log(d.data);
+ /* $("#HInterID").val(d.data[0].HInterID);*/
+
+ $("#HBillNo").val(d.data[0].HBillNo);
+ //$("#HDate").val(shijian);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ RoadBillMain(linterid);
+ /* RoadBillSub(linterid);*/
+ }
+
+ form.on('checkbox(checkboxHCheckerResult)', function (data) {
+ $("#HLastResult").val(data.elem.checked);
+ });
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(HMainProcNumber-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , resize: false
+ , 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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMainProcID").val(checkStatus.data[0].HItemID);
+ $("#HMainProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+ $("#HMainProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+
+ var HQCSchemeID_Patrol = checkStatus.data[0].HQCSchemeID_Patrol;
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": HQCSchemeID_Patrol, "HBatchQty": 0 },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
+ "HQCStd": "",
+ "HQCNote1": "",
+ "HQCNote2": "",
+ "HQCNote3": "",
+ "HQCNote4": "",
+ "HQCNote5": "",
+ "HQCNote6": "",
+ "HQCNote7": "",
+ "HQCNote8": "",
+ "HQCNote9": "",
+ "HQCNote10": "",
+ "HRemark": "",
+ "HQCNote1_SN": "",
+ "HQCNote2_SN": "",
+ "HQCNote3_SN": "",
+ "HQCNote4_SN": "",
+ "HQCNote5_SN": "",
+ "HQCNote6_SN": "",
+ "HQCNote7_SN": "",
+ "HQCNote8_SN": "",
+ "HQCNote9_SN": "",
+ "HQCNote10_SN": ""
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ })
+ });
+
+ //琛ㄥご淇℃伅鐢熶骇鐝寮圭獥
+ form.on('submit(btnHShifts)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇鐝鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HShiftsName").val(checkStatus.data[0].鐝鍚嶇О);
+ $("#HShiftsID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //閫夋嫨浜у搧寮圭獥
+ form.on('submit(HMateria-BT)', function () {//浜у搧
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐗╂枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+ //閫夋嫨宸ュ簭
+ form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨渚涘簲鍟�
+ form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
+ layer.open({
+ type: 2
+ , area: ['666px', '666px']
+ , title: '渚涘簲鍟嗗垪琛�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //閫夋嫨閮ㄩ棬
+ form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '閮ㄩ棬鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+ //閫夋嫨鍗曚綅
+ form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
+ layer.open({
+ type: 2
+ , area: ['666px', '666px']
+ , title: '鍗曚綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ form.on('submit(Exit)', function (data) {//
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ parent.location.href = "../../../views/index.html"
+ });
+
+ //閫夋嫨璐ｄ换浜�
+ 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: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HFirstCheckEmp").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨璐ｄ换宸ュ簭
+ 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(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+ form.on('submit(btnSearchICMOBill)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇浠诲姟鍗曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+ // $("#HICMOEntryID").val(checkStatus.data[0].hsubid);
+ // $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ // $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //, btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ //},
+ //end: function () {
+
+ //},
+ //success: function (layero, index) {
+
+ //}
+ });
+ });
+
+ //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
+ form.on('submit(btnSearchQCScheme)', function () {
+ var HName = $("#HMaterName").val();
+ var HProcName = $("#HProcName").val();
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟妗堝垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '&HProcName=' + HProcName + '', '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].hmainid);
+ $("#HQCSchemeName").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
+ get_CheckItem();
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ form.on('submit(Exit)', function (data) {//閫�鍑�
+
+ });
+
+ form.on('submit(Cancel)', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);
+ } else if (OperationType == 3) {
+ Pub_Close(1);
+ } else if (OperationType == 4) {
+ Pub_Close(1);
+ }
+ else if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ });
+ })
+
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sBadStr = JSON.stringify(table.cache['BadReTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + sBadStr;
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveQC_PatrolProcCheckList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ 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);
+ }
+ });
+ });
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
+ form.on('select(HQCNote1)', 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.HQCNote1 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�2锛�
+ form.on('select(HQCNote2)', 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.HQCNote2 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�3锛�
+ form.on('select(HQCNote3)', 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.HQCNote3 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�4锛�
+ form.on('select(HQCNote4)', 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.HQCNote4 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+ //琛岄�夋嫨澶勭悊锛堟楠岃褰�5锛�
+ form.on('select(HQCNote5)', 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.HQCNote5 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
+ });
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HReasonName, ReasonID, EmpName, SQProcName,
+ ProcID, ZRProcName, QRName
+ ;
+ function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HReasonName = obj[0].HName;
+ ReasonID = obj[0].HItemID;
+ }
+ //杩斿洖鐗╂枡
+ function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].HNumber);
+ $("#HMaterName").val(obj[0].HName);
+ $("#HMaterModel").val(obj[0].HModel);
+ }
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDepName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖鍗曚綅
+ function GetHUnitNameValue(obj) {
+ $("#HUName").val(obj[0].HName);
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitNumber").val(obj[0].HNumber);
+ }
+
+ function GetHSupValue(obj) { //杩斿洖渚涘簲鍟�
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
+ $("#HSupNumber").val(obj[0].HNumber);
+ }
+
+ function GetHKeeperValue(obj) { //杩斿洖妫�楠屽憳
+ $("#HEmpName").val(obj[0].HName);
+ $("#HFirstCheckEmp").val(obj[0].HItemID);
+ }
+
+ //杩斿洖鐢熶骇璧勬簮
+ function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
+
+ $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+ $("#HSourceID").val(obj[0].HItemID);
+ }
+
+ //function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
+ // EmpName = obj[0].HName;
+ // // $("#HEmpName").val(obj[0].HName);
+ // //$("#HItemID").val(obj[0].HItemID);
+ //}
+ //function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
+ // SQProcName = obj[0].宸ュ簭;
+ // ProcID = obj[0].HItemID;
+ // //$("#HSQProcName").val(obj[0].宸ュ簭);
+ // //$("#HProcID").val(obj[0].HItemID);
+ //}
+ function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
+ ZRProcName = obj[0].宸ュ簭;
+ //$("#HZRProcName").val(obj[0].宸ュ簭);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //HWorker
+ function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
+ QRName = obj[0].HName;
+ //$("#HQRName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+
+ function GetICMOBillValue(obj) { //杩斿洖浠诲姟鍗�
+ $("#HICMOInterID").val(obj[0].hmainid);
+ $("#HICMOEntryID").val(obj[0].hsubid);
+ $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+ $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ }
+
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HDeptName").val() == '') {
+ layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HSecManager").val() == '') {
+ layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HKeeper").val() == '') {
+ layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HBillNo").val() == '') {
+ layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HInterID").val() == '') {
+ layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (typeof (sSubStr) == "undefined") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!typeof (sSubStr) == "undefined") {
+ //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+ // {
+ // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // return false;
+ // }
+ // }
+ //}
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ else {
+ return true;
+ }
+ }
+
+ function GetHEmpValue(obj) { //妫�楠屽憳
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HFirstCheckEmp").val(obj[0].HItemID);
+ }
+
+ function GetProcessValue(obj) { //宸ュ簭
+ $("#HMainProcID").val(obj[0].HItemID);
+ $("#HMainProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ $("#HMainProcName").val(obj[0].宸ュ簭鍚嶇О);
+
+ var HQCSchemeID_Patrol = obj[0].HQCSchemeID_Patrol;
+
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
+ type: "GET",
+ data: { "CheckProjectID": HQCSchemeID_Patrol, "HBatchQty": 0 },
+ success: function (result) {
+ if (result.code == 1) {
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
+ "HQCStd": "",
+ "HQCNote1": "",
+ "HQCNote2": "",
+ "HQCNote3": "",
+ "HQCNote4": "",
+ "HQCNote5": "",
+ "HQCNote6": "",
+ "HQCNote7": "",
+ "HQCNote8": "",
+ "HQCNote9": "",
+ "HQCNote10": "",
+ "HRemark": "",
+ "HQCNote1_SN": "",
+ "HQCNote2_SN": "",
+ "HQCNote3_SN": "",
+ "HQCNote4_SN": "",
+ "HQCNote5_SN": "",
+ "HQCNote6_SN": "",
+ "HQCNote7_SN": "",
+ "HQCNote8_SN": "",
+ "HQCNote9_SN": "",
+ "HQCNote10_SN": ""
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ }
+ }
+ })
+ }
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index c525326..f340ab7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -371,7 +371,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill_XW.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
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 51e3f9a..b4ff437 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"
@@ -121,6 +121,22 @@
<input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly value="0">
</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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </div>
+ </div>
<div class="layui-inline" id="hidediv2">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -139,23 +155,22 @@
</div>
</div>
</div>
-
-
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <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="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="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 class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <label class="layui-form-label" style="width: 85px;">鍙栨牱鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -194,21 +209,10 @@
<input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
- <div class="layui-inline" style="margin-left:20px;">
- <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="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HProcID" id="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 class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍙栨牱鍗�</label>
+ <div class="layui-inline" style="width: 45%;">
+ <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="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ <input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
</div>
</div>
</div>
@@ -304,11 +308,11 @@
</div>
</div>
<!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
- <div class="layui-tab layui-tab-card">
+ <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
<ul class="layui-tab-title">
- <li class="layui-this">妫�楠岄」鐩�</li>
- <li>鎶芥牱妫�楠�</li>
- <li>妫�娴嬪��</li>
+ <li lay-id="1" class="layui-this">妫�楠岄」鐩�</li>
+ <li lay-id="2">鎶芥牱妫�楠�</li>
+ <li lay-id="3">妫�娴嬪��</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -1102,7 +1106,8 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "",
+ "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
};
switch (obj.event) {
@@ -1441,6 +1446,147 @@
}
});
}
+ if (obj.event === 'HQualityStdName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璐ㄩ噺鏍囧噯鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.html?openType=2', '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({
+ HQualityStdID: checkStatus.data[0].HItemID,
+ HQualityStdName: checkStatus.data[0].璐ㄩ噺鏍囧噯鍚嶇О,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HQualityStdID": OptionData[0].HItemID
+ , "HQualityStdName": OptionData[0].璐ㄩ噺鏍囧噯鍚嶇О
+ })
+ } else {
+ layer.msg("璇ヨ川閲忔爣鍑嗗凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectMethodName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屾柟娉曞垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', '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({
+ HInspectMethodID: checkStatus.data[0].HItemID,
+ HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectMethodID": OptionData[0].HItemID
+ , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ if (obj.event === 'HInspectBasisName') //
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屼緷鎹垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectBasis.html?openType=2', '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({
+ HInspectBasisID: checkStatus.data[0].HItemID,
+ HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹悕绉�,
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HInspectBasisID": OptionData[0].HItemID
+ , "HInspectBasisName": OptionData[0].妫�楠屼緷鎹悕绉�
+ })
+ } else {
+ layer.msg("璇ユ楠屼华鍣ㄥ凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+ }
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
obj.event = "";
@@ -1759,6 +1905,7 @@
, "HLastResult": data.鍒ゅ畾缁撹 == "鍚堟牸" ? "true" : "false"
, "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
, "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+ , "HRemarkSN": data.HRemarkSN
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
@@ -1773,8 +1920,8 @@
"HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
"HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
"HInspectVal": data[i].妫�娴嬪��, "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HUpOffSet": data[i].涓婂亸宸�, "HDownOffSet": data[i].涓嬪亸宸�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�,
- "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": 0, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�
+ "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HSampleDamageQty": data[i].鏍锋湰鐮村潖鏁�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": 0, "HRejectQty": data[i].鎷掔粷鏁�,
+ "HStrictness": 0, "HSampleUnRightQty": data[i].鏍锋湰涓嶅悎鏍兼暟, "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HStrictness": data[i].涓ユ牸搴�, "HCompareSymbol": data[i].姣旇緝绗�, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].妫�楠屼緷鎹�,"HCompareSymbol":data[i].姣旇緝绗�
}
)
@@ -2161,9 +2308,9 @@
{
"HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣ㄤ唬鐮�": data[i]["妫�楠屼华鍣ㄤ唬鐮�"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
- "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+ "HInspectVal": '', "HTargetVal": data[i].鐩爣鍊�, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HCompareSymbol": data[i].姣旇緝绗�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
"HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
- "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
+ "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].璐ㄩ噺鏍囧噯, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].妫�楠屼緷鎹�
}
);
//SampleNum.push(5);
@@ -2226,11 +2373,13 @@
//鏄剧ず鏈�鍚庝竴琛岀殑妫�娴嬪�奸〉绛句腑鐨勭洰鏍囧�笺�佷笂闄愬�笺�佷笅闄愬��
$("#HTargetVal").val(data[data.length - 1].鐩爣鍊�);
$("#HUpLimit").val(data[data.length - 1].涓婇檺鍊�);
- $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+ $("#HDownLimit").val(data[data.length - 1].涓嬮檺鍊�);
+ //姣旇緝绗�
+ $("#HComparator").val(data[data.length - 1].姣旇緝绗�);
if ($("#HEntryID").val() - 1 >= 0) {
- option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].hmainid;
+ option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
option.data[$("#HEntryID").val() - 1].HSampleSchemeName = data[data.length - 1].鎶芥牱鏂规鍚嶇О;
option.data[$("#HEntryID").val() - 1].HSamplingType = data[data.length - 1].鎶芥牱绫诲瀷;
option.data[$("#HEntryID").val() - 1].HInspectionLevel = data[data.length - 1].妫�楠屾按骞�;
@@ -2242,6 +2391,7 @@
option.data[$("#HEntryID").val() - 1].HRejectQty = data[data.length - 1].鎷掔粷鏁�;
option.data[$("#HEntryID").val() - 1].HUpLimit = data[data.length - 1].涓婇檺鍊�;
option.data[$("#HEntryID").val() - 1].HDownLimit = data[data.length - 1].涓嬮檺鍊�;
+ option.data[$("#HEntryID").val() - 1].HCompareSymbol = data[data.length - 1].姣旇緝绗�;
}
rowdata_Value = [];
@@ -2624,7 +2774,7 @@
"HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
"HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
"HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
- "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": "", "HCompareSymbol": '=', "HQualityStdID": 0, "HQualityStdName": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HInspectBasisID": 0, "HInspectBasisName": ""
}];
option = {
elem: '#mainTable'
@@ -2648,6 +2798,12 @@
, { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+ , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
+ , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
+ , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+ , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName' }
+ , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
+ , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
, { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
@@ -2656,6 +2812,7 @@
, { field: 'HTargetVal', title: '鐩爣鍊�' }
, { field: 'HUpLimit', title: '涓婇檺鍊�' }
, { field: 'HDownLimit', title: '涓嬮檺鍊�' }
+ , { field: 'HCompareSymbol', title: '姣旇緝绗�'}
, { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
, { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
, { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
@@ -2671,7 +2828,6 @@
, { 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: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
@@ -2905,6 +3061,7 @@
var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ option.data[HEntryID].HCompareSymbol = selectValue;
//鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
if (HAnalysisMethod == 2) {
if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
@@ -2969,6 +3126,7 @@
$("#HTargetVal").val(option_Check[nowindex].鐩爣鍊�);
$("#HUpLimit").val(option_Check[nowindex].涓婇檺鍊�);
$("#HDownLimit").val(option_Check[nowindex].涓嬮檺鍊�);
+ $("#HComparator").val(option_Check[nowindex].姣旇緝绗�)
}
@@ -3013,6 +3171,8 @@
isFristClick = false;
}
+ //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
+ element.tabChange('bottomTable', '3'); //璺宠浆椤电
});
//#endregion
@@ -3411,7 +3571,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: $("#HUnitID").val(), //鍗曚綅ID
HUnit: $("#HUnit").val(), //鍗曚綅
HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3489,7 +3649,7 @@
$("#HSampleSchemeID").val(0);
$("#HSampleSchemeName").val("");
- //xxx: $("#xxx").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#HUnitID").val(0);
$("#HUnit").val("");
$("#HInspectVal").val("");
@@ -3537,7 +3697,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3577,7 +3737,7 @@
// HStatus: $("#HStatus").val(), //鐘舵��
// HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
// HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
- // //xxx: $("#xxx").val(),
+ // //HCompareSymbol: $("#HCompareSymbol").val(),
// HUnitID: $("#HUnitID").val(), //鍗曚綅ID
// HUnit: $("#HUnit").val(), //鍗曚綅
// HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
@@ -3617,7 +3777,7 @@
HStatus: $("#HStatus").val(), //鐘舵��
HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //鎶芥牱鏂规ID
HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //鎶芥牱鏂规
- //xxx: $("#xxx").val(),
+ //HCompareSymbol: $("#HCompareSymbol").val(),
HUnitID: option.data[nowindex].HUnitID, //鍗曚綅ID
HUnit: option.data[nowindex].HUnit,//鍗曚綅
HInspectVal: option.data[nowindex].HInspectVal, //妫�楠屽��
@@ -3695,13 +3855,14 @@
//鍥炴樉
$("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
$("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
- //xxx: $("#xxx").val();
+ //HCompareSymbol: $("#HCompareSymbol").val();
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnit").val(maindata[nowindex].HUnit);
$("#HInspectVal").val(maindata[nowindex].HInspectVal);
$("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].鐩爣鍊� : "") : maindata[nowindex].HTargetVal );
$("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓婇檺鍊� : "") : maindata[nowindex].HUpLimit );
- $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit );
+ $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].涓嬮檺鍊� : "") : maindata[nowindex].HDownLimit);
+ $("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].姣旇緝绗� : "=") : maindata[nowindex].HCompareSymbol);
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
$("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
@@ -3776,7 +3937,32 @@
}
IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
- form.render('select');
+
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ //var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) )).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) )).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+
+ form.render('select');
} else {
option_Value.data = [{
"HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
@@ -4619,6 +4805,19 @@
function GetInspectInstruMentValue(obj) {
OptionData = obj;
}
+ //璐ㄩ噺鏍囧噯
+ function GetQualityStdValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屾柟娉�
+ function GetInspectMethodValue(obj) {
+ OptionData = obj;
+ }
+
+ //妫�楠屼緷鎹�
+ function GetInspectBasisValue(obj) {
+ OptionData = obj;
+ }
</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/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
index b305a4d..f37eea9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
@@ -33,11 +33,11 @@
<label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
<input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
</div>
-
+ <button class="layui-btn layui-btn-normal" style="float:left;" type="button" lay-submit="" lay-filter="btnNextProc" id="btnNextProc">鎹骇鍝�</button>
<button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
-
-
+
+
</div>
@@ -77,6 +77,13 @@
<label class="layui-form-label" style="width: 85px;" id="">褰撳墠闀洉鐮�:</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HSNNo" lay-verify="HSNNo" id="HSNNo" 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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
</div>
@@ -237,15 +244,16 @@
</div>
</div>
</div>
- <script type="text/html" id="toolbarDemo">
+ <!--<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
- </script>
+ </script>-->
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -255,6 +263,9 @@
</div>
</body>
</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
<script>
layui.config({
@@ -274,8 +285,8 @@
//瀹氫箟鍏ㄥ眬鍙橀噺
- var HModName = "Cj_ProcessItemStationPlatform_batch";
- var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
+ var HModName = "Cj_ProcessItemStationPlatform_KeyElement";
+ var HModName2 = "Cj_ProcessItemStationPlatform_KeyElement2";
var option = [];
var option2 = [];
//#endregion
@@ -289,6 +300,11 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -303,68 +319,37 @@
table.on('toolbar(mainTable2)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete2': set_DeleteBill2();
+ case 'btn-Delete2': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
break;
+ //鍒锋柊
+ case 'refresh': get_Display();
+ break;
};
});
- //鎵规鐮佸洖杞︽柟娉�
- $('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
- if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHBarCode_KeyDown(HBarCode);
- }
- });
-
//闀洉鐮佸洖杞︽柟娉�
$('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode_SN = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
+
+ if (HBarCode_SN) {
+ createBillNo();
+ txtHBarCodeSN_KeyDown(HBarCode_SN);
}
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
-
+ }
+ });
+ //鍏抽敭浠跺洖杞︽柟娉�
+ $('#HBarCode_Key').on('keydown', function (event) {
+ var HBarCode_Key = $('#HBarCode_Key').val();
+ if (event.keyCode == 13) {
+
+ if (HBarCode_Key) {
+ txtHBarCodeKey_KeyDown(HBarCode_Key);
+ }
+
}
});
@@ -393,7 +378,23 @@
form.on('submit(btnHProc)', function () {
btnHProc();
});
+ //鎹骇鍝�
+ form.on('submit(btnNextProc)', function (data) {
+ //for (var i = 0; i < option.data.length; i++) {
+ // if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
+ // layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
+ // return;
+ // }
+ //}
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+
+ //鍘嗗彶缁戝畾璁板綍鏌ヨ
+ //get_Display();
+ });
//閫�鍑�
form.on('submit(btnExit)', function (data) {
@@ -412,7 +413,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_SN").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -421,7 +422,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -462,29 +463,33 @@
function set_InitGrid() {
option= {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, page: false
, totalRow: true
, cellMinWidth: 120
, data: []
, height: 285
, limit: 10
- , cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
- , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
- , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
- , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true}
- , { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
- , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
- , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
- , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
+ , cols: [[ //缁戝畾淇℃伅琛�
+ { type: 'numbers', title: '搴忓彿', width: 50 }
+ , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+ , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+ , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+ , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+ , { field: 'HBatchNo', title: '鎵规', width: 160, hide: true }
+ , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+ , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+ , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+ , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+ , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
]]
}
option2 = {
@@ -518,77 +523,164 @@
table.render(option2);
}
- //鏉＄爜鍥炶溅鏌ヨ
- function txtHBarCode_KeyDown(HBarCode) {
-
- var HProcExchBillNo = $("#HProcExchBillNo").val();
+ //浜у搧SN闀洉鐮佺爜鍥炶溅鏌ヨ
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+ //涓昏〃淇℃伅鏌ヨ
var indexs = layer.load();
+ //閰嶄欢淇℃伅鏌ヨ
+ var HBillNo = $("#HBillNo").val();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList_XW",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
- layer.close(indexs);
- var index = layer.load();
+ var data = data1.data
+ var rowarr = [];
+ for (var i = 0; i < data.length; i++) {
+ rowarr.push({
+ "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+ , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": data[i].瀛愰」鐗╂枡浠ｇ爜, "HMaterName": data[i].瀛愰」鐗╂枡鍚嶇О, "HMaterModel": data[i].瀛愰」瑙勬牸鍨嬪彿, "HBatchNo": ""
+ , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+ , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+ , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+ });
+ }
+
+ option.data = rowarr;
+
+ table.render(option);
+
+
+
+ //绂佺敤杈撳叆妗�,鑳屾櫙鑹插彉鐏�
+ $("#HBarCode_SN").prop("readonly", true);
+ $("#HBarCode_SN").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ //鑾峰彇瀵瑰簲涓昏〃淇℃伅
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
+ layer.close(indexs);
+ $("#HSNNo").val(HBarCode);
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HICMOBillNo").val(data1.data[0]["HSourceBillNo"])
}
else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ layer.close(indexs);
+ layer.confirm(data1.Message);
}
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
- layer.close(index);
+ layer.close(indexs);
layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ return;
}
});
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
},
error: function (err) {
layer.close(indexs);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
+ }
+ });
+
+ }
+
+ //閰嶄欢鐮佸洖杞︽煡璇�
+ function txtHBarCodeKey_KeyDown(HBarCode) {
+ var indexs = layer.load();
+ var HBillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+ async: false,
+ data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+ option.data[i].HMaterID = data[0].HMaterID
+ option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+ option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+ option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+ option.data[i].HBarCode = data[0].閰嶄欢鐮�
+ option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓厤浠�:" + data[0].鐗╂枡鍚嶇О);
+ break;
+ } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+ } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+ }
+ }
+
+ //option.data = rowarr;
+
+ table.render(option);
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ $("#HBarCode_Key").val("");
+ //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+ if (areQuantitiesEqual(option.data)) {
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ }
+ layer.close(indexs);
+ }
+ else {
+ layer.close(indexs);
+ layer.confirm(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
}
-
- //鍔犺浇缃戞牸
- function get_Display() {
+ //鍔犺浇鍘嗗彶杩囩珯娓呭崟淇℃伅
+ function get_Display(sWhere = '') {
var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var titleData=[]
+ var titleData = []
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -626,15 +718,15 @@
}
}
}
- option.cols = [col]
- option.data = data1.data;
+ option2.cols = [col]
+ option2.data = data1.data;
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
- table.render(option);
+ table.render(option2);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -646,6 +738,170 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill() {
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": "",
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var HBarCode = $("#HBarCode_SN").val();
+ var sSubStr = JSON.stringify(option.data);
+ var sMainSub = sMainStr + ';' + HBarCode + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillAndAssemblyBill",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+
+
+ $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
+ //鍒囨崲浜у搧
+ set_changeHBarCodeSN();
+ get_Display();
+ }
+ else {
+
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+ //#endregion
+
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBillandAssemblyBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HBarCode_P": data[0].闀洉SN鐮�, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
+ //鍒囨崲浜у搧鏂规硶
+ function set_changeHBarCodeSN() {
+ $("#HSNNo").val("");
+ $("#HMaterNumber").val("")
+ $("#HMaterName").val("")
+ $("#HMaterModel").val("")
+ $("#HICMOBillNo").val("")
+
+
+ //鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").css('background', '#FFFFFF')//浜у搧鐮佹枃鏈鑳屾櫙鑹叉仮澶�
+ //娓呯┖鏂囨湰妗嗗唴瀹�
+ $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
+ //鍏夋爣璺宠浆鍒颁骇鍝佺爜鏂囨湰妗嗕笂
+ $("#HBarCode_SN").focus();
+
+ //娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
+ option.data = [];
+ table.render(option);
+ }
+
+ // 鐢熸垚鍗曟嵁鍙�
+ function createBillNo() {
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //$("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ //$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ //$("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
+ }
+
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+ var wait = layer.load();
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ $.ajax({
+ url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+ type: "GET",
+ data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1, time: 500 }, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ option.data[rowIndex].HBarCode = "";
+ option.data[rowIndex].HBindingQty = 0;
+ //option.data[rowIndex].HMaterID = 0;
+ option.data[rowIndex].HMaterNumber = "";
+ option.data[rowIndex].HMaterName = "";
+ option.data[rowIndex].HMaterModel = "";
+ option.data[rowIndex].HBarCode = "";
+
+ table.render(option);
+ layer.close(index);
+ });
+ }
}
//鍛樺伐閫夋嫨椤甸潰
@@ -783,17 +1039,26 @@
//闈炵┖楠岃瘉
function AllowLoadData() {
- var HBarCode = $("#HBarCode_P").val();
+ var HBarCode = $("#HBarCode_SN").val();
if (HBarCode == "") {
layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
return false;
}
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
- var HEmpID2 = $("#HEmpID2").val();
- if (HEmpID2 == 0) {
- layer.msg(get_MessageError("[0000-2-030]鎿嶄綔鍛樹笉鑳戒负绌�!", sessionStorage["HTranSlate"]))
- return false;
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+ layer.msg("缁戝畾淇℃伅绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
+
//var HBadReasonID = $("#HBadReasonID").val();
//if (HBadReasonID == 0) {
@@ -802,7 +1067,23 @@
//}
return true;
}
+ //鍒ゆ柇鏄惁缁戝畾瀹�
+ function areQuantitiesEqual(arr) {
+ if (arr.length === 0) {
+ return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+ }
+ const firstHPartsQty = arr[0].HPartsQty;
+ const firstHBindingQty = arr[0].HBindingQty;
+
+ for (let i = 1; i < arr.length; i++) {
+ if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+ return false;
+ }
+ }
+
+ return true;
+ }
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
index 1138f26..4290378 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
@@ -205,7 +205,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
index 8f054d9..3bd6d03 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
@@ -33,7 +33,8 @@
<label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
<input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
</div>
-
+ <button class="layui-btn layui-btn-normal" style="float:left;" type="button" lay-submit="" lay-filter="btnNextProc" id="btnNextProc">鎹骇鍝�</button>
+ <!--<button class="layui-btn layui-btn-normal" style="float:left;" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>-->
<button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
<button class="layui-btn layui-btn-normal" style="float: right" type="button" lay-submit="" lay-filter="btnChange" id="btnChange">鍙樻洿</button>
@@ -46,7 +47,7 @@
</div>
- <div class="layui-tab layui-tab-card" style="width: 49%; float: left; background-color: white;height:400px">
+ <div class="layui-tab layui-tab-card" style="width: 40%; float: left; background-color: white;height:400px">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">浜у搧淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
@@ -64,11 +65,18 @@
</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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" 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;" id="">褰撳墠鎵规:</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBatchNo" lay-verify="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;" id="">渚涘簲鍟�:</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -213,7 +221,7 @@
</div>
</div>
- <div class="layui-tab layui-tab-card" style="width: 50.5%; float: right;">
+ <div class="layui-tab layui-tab-card" style="width: 59.5%; float: right;">
<ul class="layui-tab-title">
<li class="layui-this">鍏抽敭浠舵竻鍗�</li>
</ul>
@@ -240,15 +248,11 @@
</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-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><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-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -258,6 +262,9 @@
</div>
</body>
</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
<script>
layui.config({
@@ -277,8 +284,8 @@
//瀹氫箟鍏ㄥ眬鍙橀噺
- var HModName = "Cj_ProcessItemStationPlatform_batch";
- var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
+ var HModName = "Cj_ProcessItemStationPlatform_batchKeyElement";
+ var HModName2 = "Cj_ProcessItemStationPlatform_batchKeyElement2";
var option = [];
var option2 = [];
//#endregion
@@ -293,83 +300,141 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
+
+ //缁戝畾淇℃伅琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete': set_DeleteBill();
- break;
+ //case 'btn-Delete': btn_Delete();
+ // break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
break;
+
};
});
table.on('toolbar(mainTable2)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete2': set_DeleteBill2();
+ case 'btn-Delete2': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
break;
+ //鍒锋柊
+ case 'refresh': get_Display();
+ break;
};
});
+
+ //鍙樻洿
+ form.on('submit(btnChange)', function (data) {
+ $("#HBarCode_Batch").val("");
+ $("#HBarCode_Batch").prop("readonly", false);
+ $("#HBarCode_BatchSec").val("");
+ $("#HBatchNo").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ $("#HSupID").val(0)
+ $("#HSupName").val(0)
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ壒娆′笂
+ $("#HBarCode_Batch").focus();
+ });
+
//鎵规鐮佸洖杞︽柟娉�
$('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode = $('#HBarCode_Batch').val();
if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
+ //濡傛灉闀洉鐮佷笉涓虹┖
+ if (HBarCode) {
+ txtHBarCode_KeyDown(HBarCode);
+ }
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHBarCode_KeyDown(HBarCode);
}
});
//闀洉鐮佸洖杞︽柟娉�
$('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode_SN = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
+ if ($("#HBarCode_Batch").val() == "" || $("#HBarCode_Batch").val() == null) {
+ layer.msg("鏈壂鎵规鐮佽鍏堟壂鐮�");
+ $("#HBarCode_Batch").focus();
+ return
}
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
+ if (HBarCode_SN) {
+ createBillNo();
+ txtHBarCodeSN_KeyDown(HBarCode_SN);
+ }
-
}
});
+ //鍏抽敭浠跺洖杞︽柟娉�
+ $('#HBarCode_Key').on('keydown', function (event) {
+ var HBarCode_Key = $('#HBarCode_Key').val();
+ if (event.keyCode == 13) {
+ if ($("#HBarCode_Batch").val() == "" || $("#HBarCode_Batch").val() == null) {
+ layer.msg("鏈壂鎵规鐮佽鍏堟壂鐮�");
+ $("#HBarCode_Batch").focus();
+ return
+ }
+ if ($("#HBarCode_SN").val() == "" || $("#HBarCode_SN").val() == null) {
+ layer.msg("鏈壂SN鐮佽鍏堟壂鐮�");
+ $("#HBarCode_SN").focus();
+ return
+ }
+ if (HBarCode_Key) {
+ txtHBarCodeKey_KeyDown(HBarCode_Key);
+ }
+
+ }
+ });
+
+ //淇濆瓨
+ form.on('submit(btnSave)', function (data) {
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ });
+ //鎹骇鍝�
+ form.on('submit(btnNextProc)', function (data) {
+ //for (var i = 0; i < option.data.length; i++) {
+ // if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
+ // layer.alert("绗�<span style='color: red;'>" + (i + 1) + "</span>琛岋紝閰嶄欢 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> 鏈粦瀹氶綈鏁达紒")
+ // return;
+ // }
+ //}
+
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+
+
+
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ // type: "GET",
+ // data: { "HBillType": '3727' },
+ // success: function (d) {
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ // //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ // $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ // }
+ //});
+
+ //鍘嗗彶缁戝畾璁板綍鏌ヨ
+ //get_Display();
+ });
+
//閫夋嫨鎿嶄綔鍛�
form.on('submit(btnHEmp)', function () {
@@ -415,16 +480,17 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_Batch").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
//閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
GetDefValByUser();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -461,33 +527,55 @@
}
//#endregion
+ // 鐢熸垚鍗曟嵁鍙�
+ function createBillNo() {
+ //閲嶆柊鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ //$("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ //$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //榛樿涓哄綋鍓嶆棩鏈�
+ //閲嶆柊鍚敤淇濆瓨鎸夐挳
+ //$("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ });
+ }
+
//鍏抽敭浠舵竻鍗�
function set_InitGrid() {
option= {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, page: false
, totalRow: true
, cellMinWidth: 120
, data: []
, height: 285
- , limit: 10
- , cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
- , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
- , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
- , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true}
- , { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
- , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
- , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
- , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
+ , limit: 50
+ , cols: [[ //缁戝畾淇℃伅琛�
+ { type: 'numbers', title: '搴忓彿', width: 50 }
+ , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+ , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+ , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+ , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+ , { field: 'HBatchNo', title: '鎵规', width: 160, hide: true }
+ , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+ , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+ , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+ , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+ , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+ , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
]]
}
option2 = {
@@ -524,53 +612,35 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var HProcExchBillNo = $("#HProcExchBillNo").val();
var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
- var index = layer.load();
+ $("#HBarCode_BatchSec").val(HBarCode);
+ const parts = HBarCode.split('@');
+ $("#HBatchNo").val(parts[2]);
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HSupID").val(data1.data[0]["HSupID"])
+ $("#HSupName").val(data1.data[0]["HSupName"])
+ $("#HBarCode_Batch").prop("readonly", true);
+
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN").focus();
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+ layer.msg(data1.Message);
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
layer.close(indexs);
@@ -579,19 +649,235 @@
});
}
- //鍔犺浇缃戞牸
- function get_Display() {
- var ajaxLoad = layer.load();
+ //浜у搧SN闀洉鐮佺爜鍥炶溅鏌ヨ
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+ //涓昏〃淇℃伅鏌ヨ
+ var indexs = layer.load();
+ //閰嶄欢淇℃伅鏌ヨ
+ var HBillNo = $("#HBillNo").val();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList_XW",
+ async: false,
+ data: { "HBillNo": HBillNo,"HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+ var rowarr = [];
+
+ for (var i = 0; i < data.length; i++) {
+ rowarr.push({
+ "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+ , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": data[i].瀛愰」鐗╂枡浠ｇ爜, "HMaterName": data[i].瀛愰」鐗╂枡鍚嶇О, "HMaterModel": data[i].瀛愰」瑙勬牸鍨嬪彿, "HBatchNo": ""
+ , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+ , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+ , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+ });
+ }
+
+ option.data = rowarr;
+
+ table.render(option);
+
+
+
+ //绂佺敤杈撳叆妗�,鑳屾櫙鑹插彉鐏�
+ $("#HBarCode_SN").prop("readonly", true);
+ $("#HBarCode_SN").css('background', '#EDEDED')//鑳屾櫙鑹插彉鐏�
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ //鑾峰彇瀵瑰簲涓昏〃淇℃伅
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
+ async: false,
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ $("#HSNNo").val(HBarCode);
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HICMOBillNo").val(data1.data[0]["HSourceBillNo"])
+ }
+ else {
+ layer.close(indexs);
+ layer.confirm(data1.Message);
+ }
+
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ return;
+ }
+ });
+ }
+ else {
+ layer.close(indexs);
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.confirm(data1.Message);
+ }
+ });
+
+ }
+
+ //閰嶄欢鐮佸洖杞︽煡璇�
+ function txtHBarCodeKey_KeyDown(HBarCode) {
+ var indexs = layer.load();
+ var HBillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+ async: false,
+ data: { "HBillNo": HBillNo,"HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+ option.data[i].HMaterID = data[0].HMaterID
+ option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+ option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+ option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+ option.data[i].HBarCode = data[0].閰嶄欢鐮�
+ option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓厤浠�:" + data[0].鐗╂枡鍚嶇О);
+ break;
+ } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+ } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+ layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+ }
+ }
+
+ //option.data = rowarr;
+
+ table.render(option);
+ //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+ $("#HBarCode_Key").focus();
+ $("#HBarCode_Key").val("");
+ //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+ if (areQuantitiesEqual(option.data)) {
+ //淇濆瓨鍏抽敭浠�
+ if (AllowLoadData(data)) {
+ set_SaveBill(data);
+ }
+ }
+
+ layer.close(indexs);
+ }
+ else {
+ layer.close(indexs);
+ layer.msg(data1.Message);
+ }
+ },
+ error: function (err) {
+ layer.close(indexs);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ //鍒囨崲浜у搧鏂规硶
+ function set_changeHBarCodeSN() {
+ $("#HSNNo").val("");
+ $("#HMaterNumber").val("")
+ $("#HMaterName").val("")
+ $("#HMaterModel").val("")
+ $("#HICMOBillNo").val("")
+
+
+ //鍚敤杈撳叆妗�,鑳屾櫙鑹叉仮澶�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").css('background', '#FFFFFF')//浜у搧鐮佹枃鏈鑳屾櫙鑹叉仮澶�
+ //娓呯┖鏂囨湰妗嗗唴瀹�
+ $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
+ //鍏夋爣璺宠浆鍒颁骇鍝佺爜鏂囨湰妗嗕笂
+ $("#HBarCode_SN").focus();
+
+ //娓呴櫎缁戝畾淇℃伅缃戞牸鎵爜璁板綍
+ option.data = [];
+ table.render(option);
+ }
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill() {
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var HBarCode = $("#HBarCode_SN").val();
+ var sSubStr = JSON.stringify(option.data);
+ var sMainSub = sMainStr + ';' + HBarCode + ';' + sSubStr+';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillAndAssemblyBill",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+
+
+ $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
+ //鍒囨崲浜у搧
+ set_changeHBarCodeSN();
+ get_Display();
+ }
+ else {
+
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+ //#endregion
+
+
+ function get_Display(sWhere = '') {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var titleData=[]
+ var titleData = []
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -629,15 +915,15 @@
}
}
}
- option.cols = [col]
- option.data = data1.data;
+ option2.cols = [col]
+ option2.data = data1.data;
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
- table.render(option);
+ table.render(option2);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -782,21 +1068,74 @@
})
}
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+ var wait = layer.load();
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ $.ajax({
+ url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+ type: "GET",
+ data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1, time: 500 }, function () {
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ option.data[rowIndex].HBarCode = "";
+ option.data[rowIndex].HBindingQty = 0;
+ //option.data[rowIndex].HMaterID = 0;
+ option.data[rowIndex].HMaterNumber = "";
+ option.data[rowIndex].HMaterName = "";
+ option.data[rowIndex].HMaterModel = "";
+ option.data[rowIndex].HBarCode = "";
+
+ table.render(option);
+ layer.close(index);
+ });
+ }
+ }
//闈炵┖楠岃瘉
function AllowLoadData() {
- var HBarCode = $("#HBarCode_P").val();
+ var HBarCode = $("#HBarCode_SN").val();
if (HBarCode == "") {
layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
return false;
}
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
- var HEmpID2 = $("#HEmpID2").val();
- if (HEmpID2 == 0) {
- layer.msg(get_MessageError("[0000-2-030]鎿嶄綔鍛樹笉鑳戒负绌�!", sessionStorage["HTranSlate"]))
- return false;
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+ layer.msg("缁戝畾淇℃伅绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ } else {
+ layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
+
//var HBadReasonID = $("#HBadReasonID").val();
//if (HBadReasonID == 0) {
@@ -806,6 +1145,56 @@
return true;
}
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable2')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBillandAssemblyBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HBarCode_P": data[0].闀洉SN鐮�, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
+ //鍒ゆ柇鏄惁缁戝畾瀹�
+ function areQuantitiesEqual(arr) {
+ if (arr.length === 0) {
+ return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+ }
+
+ const firstHPartsQty = arr[0].HPartsQty;
+ const firstHBindingQty = arr[0].HBindingQty;
+
+ for (let i = 1; i < arr.length; i++) {
+ if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index c35666c..137d559 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -239,7 +239,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
index 5f8552f..1386009 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateCaseCode.html"
@@ -49,8 +49,8 @@
<div class="layui-tab-content" style="">
<div class="layui-tab-item layui-show">
<div class="layui-input-block" style="display: inline-block; margin-left:0px;">
- <label class="layui-form-label" style="padding-left:0px" id="">闇�姹傛暟閲�:</label>
- <input type="text" class="layui-input" name="HNeedQty" lay-verify="HNeedQty" autocomplete="off" id="HNeedQty" value="100" style="width: 100px;float:left">
+ <label class="layui-form-label" style="padding-left:0px" id="">鏈�澶х鏁�:</label>
+ <input type="text" class="layui-input" name="HNeedQty" lay-verify="HNeedQty" autocomplete="off" id="HNeedQty" value="2" style="width: 100px;float:left" readonly>
</div>
<div class="layui-input-block" style="display: inline-block; margin-left:0px;">
@@ -58,14 +58,74 @@
<input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" autocomplete="off" id="HWeight" value="100" style="width: 100px;float:left">
</div>
+ <div class="layui-input-block" style="display: inline-block; margin-left:0px;">
+ <label class="layui-form-label" style="padding-left:0px" id="">鏈�灏忛噸閲�:</label>
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HMinWeight" autocomplete="off" id="HMinWeight" value="0" style="width: 100px;float:left">
+ </div>
+ <div class="layui-input-block" style="display: inline-block; margin-left:0px;">
+ <label class="layui-form-label" style="padding-left:0px" id="">鏈�澶ч噸閲�:</label>
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HMaxWeight" autocomplete="off" id="HMaxWeight" value="101" style="width: 100px;float:left">
+
+ </div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
<!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
<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;padding: 9px 18px;" id="BT_HProcName">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" lay-verify="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 class="layui-inline">
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HDeptName">褰撳墠杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" 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;" id="BT_HEmpName">鎿嶄綔鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" 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;" id="BT_HGroupName">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" 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">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" 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;" id="BT_HSourceName">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="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;">鍒跺崟浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -101,12 +161,13 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><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-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -116,6 +177,9 @@
</div>
</body>
</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
<script>
layui.config({
@@ -135,10 +199,11 @@
//瀹氫箟鍏ㄥ眬鍙橀噺
- var HModName = "Cj_ProcessItemStationPlatform_batch";
- var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
+ var HModName = "Cj_ProcessItemStationPlatform_CaseCode";
+ var HModName2 = "Cj_ProcessItemStationPlatform_CaseCode2";
var option = [];
var option2 = [];
+ var barCodeData = [];//璁板綍SN鏉＄爜淇℃伅
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -150,11 +215,16 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete': set_DeleteBill();
+ case 'btn-Delete': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
@@ -169,62 +239,19 @@
//鍒楄缃�
case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
break;
+ //鍒锋柊
+ case 'refresh': get_Display();
+ break;
};
});
- //鎵规鐮佸洖杞︽柟娉�
- $('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
- if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHBarCode_KeyDown(HBarCode);
- }
- });
+
//闀洉鐮佸洖杞︽柟娉�
$('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode_SN = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- }
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
-
+
+ txtHBarCode_KeyDown(HBarCode_SN);
}
});
@@ -264,7 +291,10 @@
Pub_Close(2);
}
});
-
+ //鎻愪氦
+ form.on('submit(btnSave)', function (data) {
+ set_getCaseCode();
+ });
//#endregion
@@ -273,7 +303,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_SN").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -282,7 +312,13 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
+ var data = localStorage.getItem("CaseCodeDataCache");
+ if (data != null) {
+
+ option.data = JSON.parse(data);
+ table.render(option);
+ }
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -317,13 +353,13 @@
}
})
}
- //#endregion
+ //#endregion
- //鍏抽敭浠舵竻鍗�
+ //褰╃洅娓呭崟
function set_InitGrid() {
option= {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, page: false
, totalRow: true
, cellMinWidth: 120
@@ -331,21 +367,21 @@
, height: 285
, limit: 10
, cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
- , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
- , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
- , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true}
- , { field: 'HBatchNo', title: '褰撳墠鎵规' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { type: 'numbers', title: '搴忓彿' }
+ , { field: 'HItemID', title: 'HItemID', hide: true }
+ , { field: 'HBarCode', title: '浜у搧SN鐮�' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', totalRow: true}
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
- , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
- , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
- , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', hide: true }
+ , { field: 'HInterID', title: 'HInterID', hide: true }
+ , { field: 'HWeight', title: '閲嶉噺' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
+
]]
}
option2 = {
@@ -381,75 +417,158 @@
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
+ getHBarCodeData(HBarCode);
+ //娓呯┖SN闀洉鐮佸唴瀹�
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ }
- var HProcExchBillNo = $("#HProcExchBillNo").val();
- var indexs = layer.load();
+ function getHBarCodeData(HBarCode) {
+ indexs = layer.load();
+ //鑾峰彇瀵瑰簲涓昏〃淇℃伅
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
- var index = layer.load();
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
+ barCodeData = data1.data[0];
+ //$("#HMinWeight").val();鑾峰彇鏈�澶ф暟閲忔渶灏忛噸閲忔渶澶х鏁�
+ //$("#HMaxWeight").val();
+ //$("#HNeedQty").val();
+ if (AllowLoadData()) {
+ set_SaveBill(HBarCode);
+ }
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+
+ layer.confirm(data1.Message);
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
layer.close(indexs);
+
layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
}
});
}
- //鍔犺浇缃戞牸
- function get_Display() {
- var ajaxLoad = layer.load();
+
+ //#region 杩囩珯淇濆瓨鏂规硶
+ function set_SaveBill(HBarCode) {
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": "", "HWeight": $("#HWeight").val(),
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = HBarCode;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillList",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ //娓呭崟鍐呭瀛樺叆
+ barCodeData.HInterID = data1.data//鑾峰彇瀵瑰簲鍑烘垬姹囨姤浣嗗唴鐮�
+ barCodeData.HWeight = $("#HWeight").val()//閲嶉噺
+ option.data.push(barCodeData);
+ table.render(option)
+ //鏈湴瀛樺偍
+ localStorage.setItem("CaseCodeDataCache", JSON.stringify(option.data));
+ //绠辨暟瓒冲鑷姩鎻愪氦
+ if (option.data.length == $("#HNeedQty").val()) {
+ set_getCaseCode()
+ }
+
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+ get_Display();
+ }
+ else {
+
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 涓鐮佺敓鎴�
+ function set_getCaseCode() {
+ const hitmidString = option.data.map(item => item.HItemID).join(",");
+ var sMainSub = hitmidString + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddCaseCode",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ //娓呭崟鍐呭瀛樺叆
+ option.data = [];
+ table.render(option)
+ //鏈湴瀛樺偍
+ localStorage.setItem("CaseCodeDataCache", JSON.stringify(option.data));
+
+ $("#HReturnMessage").text("鎴愬姛鐢熸垚涓�涓�:" + data1.data);
+ get_Display();
+ }
+ else {
+
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+ //#endregion
+
+
+ //鍔犺浇鍘嗗彶杩囩珯娓呭崟淇℃伅
+ function get_Display(sWhere = '') {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var titleData=[]
+ var titleData = []
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -487,15 +606,15 @@
}
}
}
- option.cols = [col]
- option.data = data1.data;
+ option2.cols = [col]
+ option2.data = data1.data;
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
- table.render(option);
+ table.render(option2);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -508,6 +627,80 @@
}
});
}
+
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].HBarCode + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data.HInterID, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ // 鍒犻櫎 id=2 鐨勫璞★紙Bob锛�
+ debugger
+ const index = option.data.findIndex(item => item.HInterID === data.HInterID);
+ if (index !== -1) {
+ option.data.splice(index, 1); // 浠� index 寮�濮嬪垹闄� 1 涓厓绱�
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("CaseCodeDataCache", JSON.stringify(option.data));
+
+ get_Display();
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+
+ });
+ }
+ }
+
//鍛樺伐閫夋嫨椤甸潰
function btnHEmp() {
@@ -644,23 +837,29 @@
//闈炵┖楠岃瘉
function AllowLoadData() {
- var HBarCode = $("#HBarCode_P").val();
- if (HBarCode == "") {
- layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
+ let HMinWeight = +$("#HMinWeight").val();
+ let HMaxWeight = +$("#HMaxWeight").val();
+ let HWeight = +$("#HWeight").val();
+ //绗竴娆℃壂闀洉鐮�
+ if (option.data.length === 0) {
+ if (HWeight < HMinWeight || HWeight > HMaxWeight) {
+ layer.confirm("閲嶉噺鏍￠獙澶辫触")
+ return false;
+ }
+ } else {
+ if (HWeight < HMinWeight || HWeight > HMaxWeight) {
+ layer.confirm("閲嶉噺鏍￠獙澶辫触")
+ return false;
+ }
+ if (option.data[0].HMaterID != barCodeData.HMaterID) {
+ return false;
+ }
+ }
+ if (option.data.length >= $("#HNeedQty").val()) {
+ layer.confirm("绠辨暟宸叉弧璇锋彁浜�")
return false;
}
-
- var HEmpID2 = $("#HEmpID2").val();
- if (HEmpID2 == 0) {
- layer.msg(get_MessageError("[0000-2-030]鎿嶄綔鍛樹笉鑳戒负绌�!", sessionStorage["HTranSlate"]))
- return false;
- }
-
- //var HBadReasonID = $("#HBadReasonID").val();
- //if (HBadReasonID == 0) {
- // layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
- // return false;
- //}
+
return true;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index 0f44f76..cba9f25 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -235,7 +235,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
@@ -423,7 +423,7 @@
, totalRow: true
, cellMinWidth: 120
, data: []
- , height: 285
+ , height: 400
, limit: 10
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
--
Gitblit v1.9.1