From edec40b7b28a0a62a9d5aa72b33eeef0672d6026 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 20 九月 2023 17:25:11 +0800
Subject: [PATCH] 产线返修平台：界面调整 产线返修平台：加载表头报错提醒修改
---
WebTM/views/计划管理/产线返修平台/Sc_SourceLineRepairBill.html | 563 +++++++++++++++++++++++++++++---------------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
2 files changed, 294 insertions(+), 271 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 1885fa3..78d2598 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3822,7 +3822,7 @@
<publishTime>08/22/2023 10:58:17</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/浜х嚎杩斾慨骞冲彴/Sc_SourceLineRepairBill.html">
- <publishTime>09/06/2023 13:37:43</publishTime>
+ <publishTime>09/20/2023 17:24:12</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/浜х嚎杩斾慨骞冲彴/Sc_SourceLineRepairBill_ChangeMater.html">
<publishTime>08/24/2023 08:50:29</publishTime>
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
index 39e6ab0..ce35971 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\344\272\247\347\272\277\350\277\224\344\277\256\345\271\263\345\217\260/Sc_SourceLineRepairBill.html"
@@ -57,282 +57,304 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">鏂板</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">閫�鍑�</button>
</div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">閲囬泦淇℃伅</li>
<li lay-id="2" style="padding:1px;">褰撳墠宸ュ崟</li>
<li lay-id="2" style="padding:1px;">涓嶈壇鐜囧崰姣斿垎鏋�</li>
+ <li lay-id="2" style="padding:1px;">瀛愯〃淇℃伅</li>
</ul>
- <div class="layui-tab-content">
- <!--閲囬泦淇℃伅-->
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item" style="padding-top: 10px;">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
- <input type="hidden" name="HEntryID" id="HEntryID" lay-verify="HEntryID" value="1">
- </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 type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEmp" id="btnSearchHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇鍘熷洜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HBadReasonName" name="HBadReasonName" id="HBadReasonName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HBadReasonID" id="HBadReasonID" lay-verify="HBadReasonID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadReason" id="btnSearchHBadReason" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇绫诲瀷</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HBadTypeName" name="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadType" id="btnSearchHBadType" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇鍚庢灉</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" lay-verify="HBadResultName" name="HBadResultName" id="HBadResultName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="hidden" name="HBadResultID" id="HBadResultID" lay-verify="HBadResultID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" 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;">涓嶈壇宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HBadProcName" name="HBadProcName" id="HBadProcName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HBadProcID" id="HBadProcID" lay-verify="HBadProcID" value="0">
- </div>
- </div>
- <div class="layui-inline" style="display:none;">
- <label class="layui-form-label" style="width: 85px;">缁翠慨鏂规硶</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRepairType" name="HRepairType" id="HRepairType">
- </div>
- </div>
- <div class="layui-inline" style="display:none;">
- <label class="layui-form-label" style="width: 85px;">鏁伴噺</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HQty" name="HQty" id="HQty" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline" style="width:300px;">
- <label class="layui-form-label" style="width: 85px;">缁翠慨缁撴灉</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
- <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
- <option style="color:blue;" selected="selected" value="OK">OK</option>
- <option style="color:blue;" value="NG">NG</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProdMac" name="HProdMac" id="HProdMac" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧SN</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator">
- <input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate">
-
- <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
- <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
- <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
- <input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
- <input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0">
- <input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0">
-
- <input type="hidden" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr">
- <input type="hidden" name="HIPAddr" id="HIPAddr" lay-verify="HIPAddr">
-
- <!--璁板綍瀛愰〉闈�(鏇存崲閰嶄欢)瀛愯〃鐨勪复鏃舵暟鎹�-->
- <input type="hidden" name="subMaterList_Temp" id="subMaterList_Temp" lay-verify="subMaterList_Temp">
-
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;"></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="NGSave" id="NGSave">NG淇濆瓨</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="OKSave" id="OKSave">OK淇濆瓨</button>
- </div>
- </div>
- </div>
+ <div class="layui-tab-content">-->
+ <!--閲囬泦淇℃伅-->
+ <!--<div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">-->
+ <div style="width: 750px;height:350px; border: 1px solid #000; display:inline-block;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏉″舰鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode">
</div>
</div>
- <!--褰撳墠宸ュ崟-->
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID" value="0">
- <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏃ヨ鍒掑伐鍗�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HSplitNO" name="HSplitNO" id="HSplitNO" 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; width:180px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁翠慨宸ヤ綅</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HWorkStationName" name="HWorkStationName" id="HWorkStationName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HWorkStationID" id="HWorkStationID" lay-verify="HWorkStationID" value="0">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁翠慨宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProcessName" name="HProcessName" id="HProcessName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess" value="0">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <select name="HProdOrgID" id="HProdOrgID" lay-verify="HProdOrgID">
- <!--鍔ㄦ�佹覆鏌撶敓浜х粍缁�-->
- </select>
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;"></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeBill" id="ChangeBill"> 鎹� 鍗� </button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeMater" id="ChangeMater"> 鎹� 閰� 浠�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="CurrentBill" id="CurrentBill">褰撳墠宸ュ崟</button>
- </div>
- </div>
- </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HEntryID" id="HEntryID" lay-verify="HEntryID" value="1">
</div>
</div>
- <!--涓嶈壇鐜囧崰姣斿垎鏋�-->
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div id="HBadReasonECharts" style="width: 600px;height:250px;"></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 type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHEmp" id="btnSearchHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇鍘熷洜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HBadReasonName" name="HBadReasonName" id="HBadReasonName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HBadReasonID" id="HBadReasonID" lay-verify="HBadReasonID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadReason" id="btnSearchHBadReason" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HBadTypeName" name="HBadTypeName" id="HBadTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HBadTypeID" id="HBadTypeID" lay-verify="HBadTypeID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadType" id="btnSearchHBadType" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓嶈壇鍚庢灉</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HBadResultName" name="HBadResultName" id="HBadResultName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HBadResultID" id="HBadResultID" lay-verify="HBadResultID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHBadResult" id="btnSearchHBadResult" 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="width:300px;">
+ <label class="layui-form-label" style="width: 85px;">缁翠慨缁撴灉</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 180px;">
+ <select name="HRepairResult" id="HRepairResult" lay-filter="HRepairResult" style="width: 180px;">
+ <option style="color:blue;" selected="selected" value="OK">OK</option>
+ <option style="color:blue;" value="NG">NG</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧MAC</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProdMac" name="HProdMac" id="HProdMac" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧SN</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;">涓嶈壇宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HBadProcName" name="HBadProcName" id="HBadProcName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HBadProcID" id="HBadProcID" lay-verify="HBadProcID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;">缁翠慨鏂规硶</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HRepairType" name="HRepairType" id="HRepairType">
+ </div>
+ </div>
+ <div class="layui-inline" style="display:none;">
+ <label class="layui-form-label" style="width: 85px;">鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HQty" name="HQty" id="HQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator">
+ <input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate">
+
+ <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
+ <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
+ <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
+ <input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
+ <input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0">
+ <input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0">
+
+ <input type="hidden" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr">
+ <input type="hidden" name="HIPAddr" id="HIPAddr" lay-verify="HIPAddr">
+
+ <!--璁板綍瀛愰〉闈�(鏇存崲閰嶄欢)瀛愯〃鐨勪复鏃舵暟鎹�-->
+ <input type="hidden" name="subMaterList_Temp" id="subMaterList_Temp" lay-verify="subMaterList_Temp">
+
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;"></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="NGSave" id="NGSave">NG淇濆瓨</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="OKSave" id="OKSave">OK淇濆瓨</button>
</div>
</div>
</div>
</div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--</div>
+ </div>-->
+ <!--褰撳墠宸ュ崟-->
+ <!--<div class="layui-tab-item">
+ <div class="layui-form-item">-->
+ <div style="width: 820px; height: 350px; border: 1px solid #000; display: inline-block; ">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID" value="0">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ヨ鍒掑伐鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HSplitNO" name="HSplitNO" id="HSplitNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
</div>
- </script>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁￠噺鍗曚綅</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁翠慨宸ヤ綅</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HWorkStationName" name="HWorkStationName" id="HWorkStationName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HWorkStationID" id="HWorkStationID" lay-verify="HWorkStationID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁翠慨宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProcessName" name="HProcessName" id="HProcessName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HProdOrgID" id="HProdOrgID" lay-verify="HProdOrgID">
+ <!--鍔ㄦ�佹覆鏌撶敓浜х粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 120px;width:501px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;"></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeBill" id="ChangeBill"> 鎹� 鍗� </button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ChangeMater" id="ChangeMater"> 鎹� 閰� 浠�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="CurrentBill" id="CurrentBill">褰撳墠宸ュ崟</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--</div>
+ </div>-->
+ <!--涓嶈壇鐜囧崰姣斿垎鏋�-->
+ <!--<div class="layui-tab-item">
+ <div class="layui-form-item">-->
+ <div style="width: 750px; height: 350px; display: inline-block; ">
+ <div class="layui-row">
+ <div id="HBadReasonECharts" style="width: 600px;height:350px;"></div>
+ </div>
+ </div>
+ <!--</div>
+ </div>-->
+ <!--瀛愯〃淇℃伅-->
+ <!--<div class="layui-tab-item">
+ <div class="layui-form-item">-->
+ <div style="width: 820px; height: 350px; border: 1px solid #000; display: inline-block; ">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="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>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </div>
+ <!--</div>
+ </div>-->
+ <!--</div>
+ </div>-->
</form>
</div>
</div>
@@ -688,7 +710,7 @@
, "HCreateDate": Format(new Date(), "yyyy-MM-dd")
, "HBadProcID": tableMain[0]["HProcID"] == null ? 0 : tableMain[0]["HProcID"]
, "HBadProcName": tableMain[0]["HProcName"]
-
+
, "HICMOInterID": tableMain[0]["HICMOInterID"] == null ? 0 : tableMain[0]["HICMOInterID"]
, "HICMOEntryID": tableMain[0]["HICMOEntryID"] == null ? 0 : tableMain[0]["HICMOEntryID"]
@@ -719,10 +741,11 @@
, "HSourceBillType": tableMain[0]["HICMOBillType"]
, "subMaterList_Temp": JSON.stringify(subMaterList_Temp)
-
+
});
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ //layer.alert(result.code + result.Message, { icon: 5 });
+ layer.msg(result.Message);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1036,7 +1059,7 @@
data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
-
+
} else {
layer.alert(result.code + result.Message, { icon: 5 });
}
@@ -1119,9 +1142,9 @@
var HSourceEntryID = $("#HSourceEntryID").val();
var HSourceBillNo = $("#HSourceBillNo").val();
var HSourceBillType = $("#HSourceBillType").val();
- var HBarCode = $("#HBarCode").val();
-
-
+ var HBarCode = $("#HBarCode").val();
+
+
//var url = "../../璁″垝绠＄悊/浜х嚎杩斾慨骞冲彴/Sc_SourceLineRepairBill_ChangeMater.html?OperationType=2&HInterID=" + HInterID + "&HSourceInterID=" + HSourceInterID + "&HSourceEntryID=" + HSourceEntryID + "&HSourceBillNo=" + HSourceBillNo + "&HSourceBillType=" + HSourceBillType + "&HBarCode=" + HBarCode + "&subMaterListLength=" + subMaterListLength + "&HBillNo=" + HBillNo + "&HEmpName=" + HEmpName + "&HProdMac=" + HProdMac;
var dataParams = {
@@ -1206,7 +1229,7 @@
//鑾峰彇瀛愯〃2鏁版嵁搴忓垪鍖�
var sSubMaterStr = $("#subMaterList_Temp").val();
-
+
//鎷兼帴搴忓垪鍖栫殑鏁版嵁
var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubMaterStr + ";" + sessionStorage["HUserName"];
--
Gitblit v1.9.1