From 715e5ed515561d5b1a2391fb4a16e59567348dde Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 17 五月 2024 17:05:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBill.html | 144
WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMain.html | 4
WebTM/views/采购管理/其他应付单/YF_PayMentOtherBillMainList.html | 2
WebTM/views/车间管理/产线/RetrospectionCustomerReport.html | 248 +
WebTM/views/车间管理/产线/MES_AssemblyTraceabilityList.html | 327 ++
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 163
WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html | 4
WebTM/views/车间管理/产线/Gy_WorkDay.html | 554 ++++
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBillList.html | 2
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 2
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 299 ++
WebTM/views/车间管理/产线/MES_AssemblyTraceability.html | 967 +++++++
WebTM/views/车间管理/产线/Sc_PackUnionBillCacheList.html | 270 +
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBillList.html | 1
WebTM/views/车间管理/产线/Sc_ProcessReportList_Last.html | 366 ++
WebTM/views/index.html | 19
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html | 2
WebTM/views/车间管理/产线/test.html | 155 +
WebTM/views/车间管理/产线/Add_Edit_Gy_WorkDay.html | 394 ++
WebTM/views/车间管理/产线/Sc_StationInBillList.html | 480 +++
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 1407 ++++++++++
WebTM/views/车间管理/产线/Sc_GroupOrderBillList.html | 339 ++
WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html | 37
WebTM/views/车间管理/产线/222.jpg | 0
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html | 140
WebTM/views/采购管理/采购申请单/Cg_PORequestBill.html | 7
WebTM/layuiadmin/Scripts/webConfig2.js | 14
WebTM/views/采购管理/报价单/Sup_QuotePriceBillEdit.html | 2
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html | 1
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html | 6
WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html | 611 ++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/车间管理/产线/ProcessWIPReport.html | 162 +
WebTM/views/车间管理/产线/Sc_GroupOrderBill.html | 578 ++++
WebTM/views/车间管理/产线/Sc_GroupOrderBillCacheList.html | 274 ++
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_PostSkillList.html | 107
WebTM/WebTM.csproj | 18
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 28
38 files changed, 8,028 insertions(+), 110 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f61cd46..b56dcb0 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -135,6 +135,7 @@
<Content Include="layuiadmin\myicon\绯荤粺璁剧疆.svg" />
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\Scripts\echarts.min.js" />
+ <Content Include="layuiadmin\Scripts\webConfig2.js" />
<Content Include="layuiadmin\serial-reader.js" />
<Content Include="layuiadmin\soulTable.slim.js" />
<Content Include="layuiadmin\treeTable.js" />
@@ -337,10 +338,27 @@
<Content Include="views\妯℃不鍏风鐞哱妯″叿璋冩嫧\Sc_MouldProdMoveBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧寮�鏈哄崟\Sb_EquipBeginBill_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\222.jpg" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Add_Edit_Gy_WorkDay.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Gy_WorkDay.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceability.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\ProcessWIPReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\RetrospectionCustomerReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBillCacheList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_GroupOrderBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_PackUnionBillCacheList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩妫�鏌ュ崟\Sc_WorkBeginDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 7078c95..78cc31c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
/* var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�*/
diff --git a/WebTM/layuiadmin/Scripts/webConfig2.js b/WebTM/layuiadmin/Scripts/webConfig2.js
new file mode 100644
index 0000000..2c22ad4
--- /dev/null
+++ b/WebTM/layuiadmin/Scripts/webConfig2.js
@@ -0,0 +1,14 @@
+锘縡unction GetWEBURL() {
+ var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
+ //var WEBURL = 'http://61.130.182.102:18181/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
+ //var WEBURL = 'http://10.11.18.195:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧�
+ //WEBURL = "http://192.168.2.168:8082/WebAPI/"; //鏈湴鐜
+ return WEBURL
+}
+function GetWEBURL1() {
+ var WEBURL = "http://localhost:8082/SMEAPI/"; //鏈湴鐜
+ //var WEBURL = 'http://61.130.182.102:18181/WebAPI/'; //鏂帿灏斿鎴风幆澧� 澶栫綉
+ //var WEBURL = 'http://10.11.18.195:8080/WebAPI/'; //鏂帿灏斿鎴风幆澧�
+ //WEBURL = "http://192.168.2.168:8082/WebAPI/"; //鏈湴鐜
+ return WEBURL
+}
\ No newline at end of file
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 984fb7a..e32c380 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -449,6 +449,7 @@
<dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
<dd><a href="IpadIndex.html" target="main_self_frame">鎶ュ伐骞冲彴</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">褰撳墠宸ュ崟(鎵爜姹囨姤)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html">鍒峰崱寮�宸�</a></dd>
<!--<dd><a lay-href="">鎶ユ鐢宠n</a></dd>-->
</dl>
</dd>
@@ -619,6 +620,24 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/BadQueryReport.html">閫嗗悜杩芥函鏌ヨ鎶ヨ〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>浜х嚎</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_AssemblyTraceability.html">浜х嚎缁勮杩芥函鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackaging.html">浜х嚎鍖呰鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackagingList.html">浜х嚎鍖呰鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_PackUnionBillCacheList.html">浜х嚎鍖呰鍗曠紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_GroupOrderBill.html">浜х嚎缁勬墭鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_GroupOrderBillList.html">浜х嚎缁勬墭鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_GroupOrderBillCacheList.html">浜х嚎缁勬墭鍗曠紦瀛樺垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/RetrospectionCustomerReport.html">瀹㈣瘔杩芥函娴佺▼鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/ProcessWIPReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Gy_WorkDay.html">宸ヤ綔鏃ヨ缃�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 璐ㄩ噺绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
index 40715c1..ea5e7a1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
@@ -51,6 +51,17 @@
<input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
</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="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" 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-form-item">
<label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
@@ -66,6 +77,16 @@
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -198,6 +219,20 @@
//}
}
});
+
+ //#region 閫夋嫨宀椾綅鎸夐挳
+ form.on('submit(btnSearchHPost)', function () {
+ get_checkSearchHPost();
+ });
+ //#endregion
+
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
@@ -232,6 +267,10 @@
$("#HItemID").val(data.HItemID);//浠ｇ爜ID
$("#HNumber").val(data.宀椾綅鎶�鑳戒唬鐮�);//浠ｇ爜
$("#HName").val(data.宀椾綅鎶�鑳藉悕绉�);//鍚嶇О
+ $("#HPostID").val(data.HPostID);//浠ｇ爜ID
+ $("#HPostName").val(data.宀椾綅鍚嶇О);//浠ｇ爜
+ $("#HProcID").val(data.HProcID);//浠ｇ爜ID
+ $("#HProcName").val(data.宸ュ簭鍚嶇О);//浠ｇ爜
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
$("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
@@ -253,6 +292,63 @@
layer.alert(sMsg, { icon: 5 });
}
+
+ //#region 宀椾綅閫夋嫨椤甸潰
+ function get_checkSearchHPost() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍛樺伐琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HPostID").val(checkStatus.data[0].HItemID);//宀椾綅id
+ $("#HPostName").val(checkStatus.data[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
function Organ() {
var Organization = '';
@@ -277,6 +373,17 @@
//#endregion
});
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+ //宀椾綅
+ function GetGyPostValue(obj) {
+ $("#HPostID").val(obj[0].HItemID);//宀椾綅id
+ $("#HPostName").val(obj[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
index 0abe1b1..700e71d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
@@ -121,7 +121,7 @@
var option = [];
var HModName = "Gy_PostSkill";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+ var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HPostID","HProcID"];
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
index d6c8c33..da82b9e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
@@ -115,10 +115,41 @@
</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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" 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="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo" >
+ <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
+ </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>
@@ -129,23 +160,6 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
- </div>
- </div>
- </div>
-
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
- <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -399,14 +413,28 @@
get_checkSearchHEmp();
});
//#endregion
+
//#region 閫夋嫨璇勫畾浜烘寜閽�
form.on('submit(btnSearchHCheckEmp)', function () {
get_checkSearchHCheckEmp();
});
//#endregion
+
//#region 閫夋嫨涓婄骇棰嗗鎸夐挳
form.on('submit(btnSearchHManagerEmp)', function () {
get_checkSearchHManagerEmp();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐗╂枡鎸夐挳
+ form.on('submit(btnSearchHMater)', function () {
+ get_checkSearchHMater();
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
});
//#endregion
@@ -458,7 +486,7 @@
"HPostSkillid": "0"
, "HPostSkillNumber": ""
, "HPostSkillName": ""
- , "HSkillLev": ""
+ , "HSkillLev": "1"
, "HTrainDate": Format(new Date(), "yyyy-MM-dd")
, "HRemark": ""
, "HSourceInterID": "0"
@@ -827,6 +855,67 @@
}
//#endregion
+ //#region 鐗╂枡閫夋嫨椤甸潰
+ function get_checkSearchHMater() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ table.render(option);
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇瀛愯〃鏁版嵁
@@ -909,6 +998,10 @@
, "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
, "HPostID": data[0]["HPostID"]
, "HPostName": data[0]["宀椾綅鍚嶇О"]
+ , "HProcID": data[0]["HProcID"]
+ , "HProcName": data[0]["宸ュ簭鍚嶇О"]
+ , "HMaterID": data[0]["HMaterID"]
+ , "HMaterName": data[0]["鐗╂枡鍚嶇О"]
, "HEmpID": data[0]["HEmpID"]
, "HEmpName": data[0]["鑱屽憳鍚嶇О"]
@@ -1271,6 +1364,19 @@
$("#HManagerEmpID").val(obj[0].HItemID);
$("#HManagerEmpName").val(obj[0].鑱屽憳鍚嶇О);
}
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(obj) {
+ $("#HMaterID").val(obj.HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ }
+
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
index d83c396..e8db1ad 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
@@ -131,7 +131,7 @@
var HModName = "HR_EmployeeSkillBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID"];
+ var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID","HProcID", "HMaterID"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2330";
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
index 9a7f8cf..bf99c8c 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
@@ -73,6 +73,8 @@
</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;">
@@ -83,6 +85,34 @@
</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="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -91,23 +121,6 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
- </div>
- </div>
- </div>
-
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
- <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -355,6 +368,19 @@
});
//#endregion
+ //#region 閫夋嫨鐗╂枡鎸夐挳
+ form.on('submit(btnSearchHMater)', function () {
+ get_checkSearchHMater();
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
@@ -403,7 +429,7 @@
"HPostSkillid": "0"
, "HPostSkillNumber": ""
, "HPostSkillName": ""
- , "HSkillLev": ""
+ , "HSkillLev": "1"
, "HRemark": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
@@ -662,6 +688,67 @@
}
//#endregion
+ //#region 鐗╂枡閫夋嫨椤甸潰
+ function get_checkSearchHMater() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ table.render(option);
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇瀛愯〃鏁版嵁
@@ -744,6 +831,10 @@
, "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
, "HPostID": data[0]["HPostID"]
, "HPostName": data[0]["宀椾綅鍚嶇О"]
+ , "HProcID": data[0]["HProcID"]
+ , "HProcName": data[0]["宸ュ簭鍚嶇О"]
+ , "HMaterID": data[0]["HMaterID"]
+ , "HMaterName": data[0]["鐗╂枡鍚嶇О"]
, "HRemark": data[0]["琛ㄥご澶囨敞"]
, "HMaker": data[0]["鍒跺崟浜�"]
@@ -1083,6 +1174,19 @@
$("#HPostID").val(obj[0].HItemID);//宀椾綅id
$("#HPostName").val(obj[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
}
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(obj) {
+ $("#HMaterID").val(obj.HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ }
+
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
index 3a5e63e..d1fe79f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
@@ -131,7 +131,7 @@
var HModName = "HR_PostSkillBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID"];
+ var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HProcID","HMaterID"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2331";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
new file mode 100644
index 0000000..7ba9ffd
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -0,0 +1,299 @@
+锘�<!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">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../../layuiadmin/PageTitle.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <input type="text" class="layui-input" placeholder="璇峰埛IC鍗�" id="HBardCode" autocomplete="off" name="HBardCode" lay-verify="HBardCode" style="height: 25px; border-radius: 15px; ">
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 150px;">鎻愮ず:鏄惁鍖归厤</label>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鎮ㄧ殑淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鎮ㄧ殑淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢ㄦ埛IC鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="IcCard" lay-verify="IcCard" id="IcCard" 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="HEmpName" lay-verify="HEmpName" id="HEmpName" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" lay-verify="HICMOInterID">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
+ </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="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID">
+ <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID">
+ </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="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID">
+ </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" lay-verify="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" name="HMaterModel" lay-verify="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" name="HSourceName" lay-verify="HSourceName" id="HSourceName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID">
+ </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="HProcName" lay-verify="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID">
+ </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="HProcNumber" lay-verify="HProcNumber" id="HProcNumber" 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;">
+ <textarea class="layui-input" id="HPostSkillName" rows="4" cols="50" style="background-color: #efefef4d; height: 100px; width: 510px;" readonly></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ var HSourceInterID = 0;
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) != "undefined") {
+ var HSourceInterID = params[params[0]];//鎿嶄綔绫诲瀷
+ }
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //鏉＄爜鍥炶溅
+ $('#HBardCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HBardCode = $('#HBardCode').val();
+ if (!HBardCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ txtHBarCode_KeyDown(HBardCode);
+ }
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鏉＄爜鍥炶溅
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode, "HSourceInterID": HSourceInterID },
+ success: function (result) {
+ if (result.count == 1) {
+
+ if (result.code == "2") {
+ layer.close(index);
+ layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ parent.GetSwipeCardStart({ "data": 0 });
+ setTimeout(function () {
+ var index2 = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index2);
+ }, 30000);
+ })
+ return false;
+ }
+
+ var data = result.data.h_p_Sc_MESBeginWorkBill_AllowLoadData1;
+ var HPostSkillName = [];
+ for (var i = 0; i < data.length; i++) {
+ HPostSkillName.push(data[i]["HPostSkillName"]);
+ }
+ var data2 = result.data.h_p_Sc_MESBeginWorkBill_AllowLoadData2[0];
+
+ $("#IcCard").val(HBarCode); //IC鍗�
+ $("#HEmpName").val(data2.HEmpName); //鑱屽憳
+ $("#HICMOBillNo").val(data2.HICMOBillNo); //鐢熶骇璁㈠崟
+ $("#HICMOInterID").val(data2.HICMOInterID);
+ $("#HICMOEntryID").val(data2.HICMOEntryID);
+ $("#HProcExchBillNo").val(data2.HProcExchBillNo); //宸ュ簭娴佽浆鍗�
+ $("#HProcExchInterID").val(data2.HProcExchInterID);
+ $("#HProcExchEntryID").val(data2.HProcExchEntryID);
+ $("#HMaterNumber").val(data2.HMaterNumber); //浜у搧浠ｇ爜
+ $("#HMaterID").val(data2.HMaterID);
+ $("#HMaterName").val(data2.HMaterName); //浜у搧鍚嶇О
+ $("#HMaterModel").val(data2.HMaterModel);//瑙勬牸鍨嬪彿
+ $("#HSourceName").val(data2.HSourceName); //鐢熶骇璧勬簮
+ $("#HSourceID").val(data2.HSourceID); //婧愬崟绫诲瀷
+ $("#HProcName").val(data2.HProcName); //褰撳墠宸ュ簭
+ $("#HProcID").val(data2.HProcID);
+ $("#HProcNumber").val(data2.HProcNumber); //宸ュ簭娆″簭鍙�
+ $("#HPostSkillName").val(HPostSkillName); //鍖归厤宀椾綅鎶�鑳�
+
+ layer.close(index);
+
+ if (result.code == "1") {
+ layer.msg("鍖归厤!", { time: 1 * 1000, icon: 1 }, function (index) {
+ parent.GetSwipeCardStart({ "data": 1 });
+ setTimeout(function () {
+ var index2 = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index2);
+ }, 30000);
+ })
+ } else {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ parent.GetSwipeCardStart({ "data": 0 });
+ setTimeout(function () {
+ var index2 = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index2);
+ }, 30000);
+ })
+ }
+ }
+ else {
+ layer.close(index);
+
+ layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ parent.GetSwipeCardStart({ "data": 0 });
+ setTimeout(function () {
+ var index2 = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index2);
+ }, 30000);
+ })
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ function get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index c45b3a6..588776d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -319,6 +319,7 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var OptionData = [];
var HBillType = ""; //鍗曟嵁绫诲瀷
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
@@ -626,56 +627,11 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
-
- var sMainStr = JSON.stringify(data.field);
- var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
- if (!AllowLoadData())//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "POST",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: false,
- data: { "msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- //layer.close(layer.index);
- //window.parent.location.reload();
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
- });
-
- //layer.confirm(data.Message, {
- // btn: ['纭']
- //}, function (index) {
- // if (data.Verify == "Y") //鑷姩瀹℃牳
- // {
- // layer.close(index);
- // SaveVerify(); //瀹℃牳
- // }
- // else {
- // layer.close(index);
- // }
- //});
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
+ //绂佺敤淇濆瓨鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁鍕鹃��
+ Xt_AllowLoadData(data);
+
});
//瀹℃牳鎸夐挳鎻愪氦
@@ -963,6 +919,109 @@
return Result;
}
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁閫変腑
+ function Xt_AllowLoadData(data2) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.Verify == "Y") //鍒峰崱楠岃瘉
+ {
+ layer.msg("闇�瑕佽繘琛屽埛鍗￠獙璇�!", { time: 1 * 1000, icon: 1 }, function (index) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['50%', '80%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+ end: function () {
+ if (OptionData.length > 0) {
+ if (OptionData[0]["data"] == "1") {
+ save(data2);
+ } else if (OptionData[0]["data"] == "0") {
+ layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
+ }
+ OptionData = [];
+ } else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+ });
+ });
+ }
+ else {
+ save(data2);
+ }
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ function save(data) {
+
+ var sMainStr = JSON.stringify(data.field);
+ var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
+ });
+
+ //layer.confirm(data.Message, {
+ // btn: ['纭']
+ //}, function (index) {
+ // if (data.Verify == "Y") //鑷姩瀹℃牳
+ // {
+ // layer.close(index);
+ // SaveVerify(); //瀹℃牳
+ // }
+ // else {
+ // layer.close(index);
+ // }
+ //});
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
function formatDate(date) {
var d = new Date(date),
month = '' + (d.getMonth() + 1),
@@ -985,6 +1044,10 @@
$("#HGroupName").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
}
+
+ function GetSwipeCardStart(obj) {
+ OptionData[0] = obj;
+ }
</script>
</body>
</html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 1b0a674..c484ac9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -135,8 +135,9 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀵瑰簲ERP鐗╂枡
- <!--<label style="color:red"> * </label>-->
+ <label class="layui-form-label">
+ 瀵瑰簲ERP鐗╂枡
+ <!--<label style="color:red"> * </label>-->
</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
@@ -275,6 +276,23 @@
<option value="鍔犲伐">鍔犲伐</option>
<option value="鍏虫満">鍏虫満</option>
<option value="寮傚父鍋滄満">寮傚父鍋滄満</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁伴噰鐗╃悊鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMacAddress" id="HMacAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁涓荤敓浜ц澶�</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
+ <option value="鍚�" selected="selected">鍚�</option>
+ <option value="鏄�">鏄�</option>
</select>
</div>
</div>
@@ -929,6 +947,8 @@
$("#HLogo").val(d.data[0].鍝佺墝);
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
+ $("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
form.render("select");
}
});
@@ -973,7 +993,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
@@ -1005,7 +1025,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/222.jpg" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/222.jpg"
new file mode 100644
index 0000000..67c3474
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/222.jpg"
Binary files differ
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Add_Edit_Gy_WorkDay.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Add_Edit_Gy_WorkDay.html"
new file mode 100644
index 0000000..8690ede
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Add_Edit_Gy_WorkDay.html"
@@ -0,0 +1,394 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍖呰鏂瑰紡缂栬緫</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ width: 25%;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓婄彮鏃堕棿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkBegin" id="HWorkBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓嬬彮鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkEnd" id="HWorkEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakBegin" id="HNoonbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakEnd" id="HNoonbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤寮�濮�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakBegin" id="HNightbreakBegin" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤缁撴潫锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakEnd" id="HNightbreakEnd" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤寮�濮嬶紙澶滐級锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakBegin2" id="HNoonbreakBegin2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗堜紤缁撴潫锛堝锛夛細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNoonbreakEnd2" id="HNoonbreakEnd2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤寮�濮嬶紙澶滐級锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakBegin2" id="HNightbreakBegin2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏅氫紤缁撴潫锛堝锛夛細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HNightbreakEnd2" id="HNightbreakEnd2" autocomplete="off" model="datetime">
+ </div>
+ </div>
+ </div>
+ </div>
+ <input id="HItemID" name="HItemID" type="hidden" value="0" />
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ //#region 鎶樺彔娉ㄩ噴
+ //#endregion
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laydate = layui.laydate;
+ var sWhere = "";
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+ //#endregion
+
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
+ laydate.render({
+ elem: '#HWorkBegin'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HWorkEnd'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakBegin'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakEnd'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakBegin'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakEnd'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakBegin2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNoonbreakEnd2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakBegin2'
+ , type: 'time'
+ , trigger: 'click'
+ });
+ laydate.render({
+ elem: '#HNightbreakEnd2'
+ , type: 'time'
+ , trigger: 'click'
+
+ });
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ $('#HDate').val(Format(new Date(), "yyyy-MM-dd"))
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ get_LoginIs();
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+ $("#HItemID").val(0);
+ }
+ else if (OperationType == 3) {//缂栬緫
+ $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ }
+ else if (OperationType == 4) {//娴忚
+ $("#HItemID").val(linterid);//
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(linterid);
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+
+ //鏄惁绂佺敤鎸夐挳
+ form.on('checkbox(checkboxHStopflag)', function (data) {
+ $("#HStopflag").val(data.elem.checked);
+ });
+
+ form.on('submit(HEmp-BT)', function () {
+ get_checkEmp();
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(set_SaveBill)', function (data) {
+ set_SaveBill(data);
+ });
+
+ //#endregion
+
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ function get_LoginIs() {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄥご
+ function RoadBillMain(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "Gy_WorkDay/cx",
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+ var IsHStopflag = data.绂佺敤鏍囪;
+ var IsHTypeFlow = data.鏄庣粏鏍囪;
+ //绂佺敤鏍囪
+ if (IsHStopflag) {
+ $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+ }
+ //鏄庣粏鏍囪
+ if (IsHTypeFlow) {
+ $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
+ }
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HItemID": data.HItemID
+ , "HDate": data.HDate
+ , "HWorkBegin": data.HWorkBegin
+ , "HWorkEnd": data.HWorkEnd
+ , "HNoonbreakBegin": data.HNoonbreakBegin
+ , "HNoonbreakEnd": data.HNoonbreakEnd
+ , "HNightbreakBegin": data.HNightbreakBegin
+ , "HNightbreakEnd": data.HNightbreakEnd
+ , "HNoonbreakBegin2": data.HNoonbreakBegin2
+ , "HNoonbreakEnd2": data.HNoonbreakEnd2
+ , "HNightbreakBegin2": data.HNightbreakBegin2
+ , "HNightbreakEnd2": data.HNightbreakEnd2
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 淇濆瓨鏂规硶
+ function set_SaveBill(data) {
+ var sMainStr = JSON.stringify(data.field);
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Gy_WorkDay/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ //淇濆瓨鍚庢祻瑙�
+ //ReRoadBillMain();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ //#endregion
+ //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+ function ReRoadBillMain() {
+ location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ function get_UrlVars() {
+ 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;
+ }
+ function Pub_Close(closeType) {
+ if (closeType == 1) {
+ //鍏抽棴寮圭獥
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (closeType == 2) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
new file mode 100644
index 0000000..8f2cd14
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Gy_WorkDay.html"
@@ -0,0 +1,554 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍖呰鏂瑰紡</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDate" id="HDate">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var sWhere = "";
+ var option = [];
+ var Organization = sessionStorage["Organization"]
+ var HModName = "Gy_WorkDay";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID","HParentID",];
+ //#endregion
+ laydate.render({
+ elem: '#HDate'
+ //, type:'year'
+ });
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ sWhere = "";
+ //$("#btnSearch").click();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ //, cols: [[
+ // { type: 'checkbox', fixed: 'left' }
+ // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ // , { field: '鍖呰鏂瑰紡浠ｇ爜', title: '鍖呰鏂瑰紡浠ｇ爜' }
+ // , { field: '鍖呰鏂瑰紡鍚嶇О', title: '鍖呰鏂瑰紡鍚嶇О' }
+ // , { field: '绛夌骇', title: '绛夌骇' }
+ // //, { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+ // //, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+ // , { field: '璐熻矗浜�', title: '璐熻矗浜�' }
+ // , { field: '澶囨敞', title: '澶囨敞' }
+ // , { field: '鍖呰鏉愯川', title: '鍖呰鏉愯川' }
+ // , { field: '闀�', title: '闀�' }
+ // , { field: '瀹�', title: '瀹�' }
+ // , { field: '楂�', title: '楂�' }
+ //]]
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Gy_WorkDay/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HDate").val();
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (HDate) {
+ sWhere += " and DATEDIFF(D,鏃ユ湡,'" + HDate +"')=0";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+
+ //#region 鍒锋柊閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔鏃�-鏂板'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../杞﹂棿绠＄悊/Add_Edit_Gy_WorkDay.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ })
+ }
+ //#endregion
+
+ //#region 缂栬緫
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔鏃�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../杞﹂棿绠＄悊/Add_Edit_Gy_WorkDay.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var ItemID = data[0].HItemID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetGy_WorkDay',
+ type: "GET",
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
+ }
+ });
+ })
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceability.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceability.html"
new file mode 100644
index 0000000..bdca076
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceability.html"
@@ -0,0 +1,967 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="background-color:white;">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎缁勮杩芥函鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline">
+ <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
+ <legend>浜х嚎缁勮杩芥函鍗�</legend>
+ </fieldset>
+ </div>
+ <div class="layui-col-xs1 layui-inline">
+ <img src="222.jpg" style="width:70%;height:50%;" />
+ </div>
+ <div class="layui-inline">
+ <div class="">
+ <label class="layui-inline" style="width:60px;">娴佽浆鍗″彿</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width:254%" name="娴佽浆鍗″彿" id="HFbarcode" placeholder="璇疯緭鍏ユ祦杞崱鍙�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瀛愪欢鏉＄爜鏁伴噺</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width:254%" name="瀛愪欢鏉＄爜鏁伴噺" id="SubBarcodeQty" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮佹暟閲�" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瀛愪欢鏉＄爜</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width:254%" name="瀛愪欢鏉＄爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">SN鍙�</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width:254%" name="snNB" id="snNB" autocomplete="off" placeholder="璇疯緭鍏N鍙�" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!--寰呯粍瑁呭伐鍗�&鎵爜璁板綍-->
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="">寰呯粍瑁呭伐鍗�</li>
+ <li data-status="2" class="layui-this">鎵爜璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="dzzgd-table"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
+ <script type="text/html" id="smjl-toolbar">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>鍒犺</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <!--褰撳墠宸ュ崟&鍏朵粬淇℃伅-->
+ <div class="layui-form-item">
+ <div class="layui-col-md8 layui-card-body layui-inline">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="" class="layui-this">缁勮淇℃伅</li>
+ <li data-status="2">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--缁勮淇℃伅椤电-->
+ <div class="layui-tab-item layui-show" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
+ <td>
+ <input type="text" name="娴佽浆鍗″彿" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">缁勮鏃堕棿</th>
+ <td>
+ <input type="text" name="缁勮鏃堕棿" class="layui-input" id="HDateNow" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鍙�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
+ <td>
+ <input type="text" name="浜у搧浠ｇ爜" class="layui-input" id="HNumber" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+ <td>
+ <input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+ <td>
+ <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
+ <td>
+ <input type="text" name="璁￠噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+ <td>
+ <input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
+ <td>
+ <input type="text" name="鍗曟嵁鍙�" class="layui-input" id="HBillNo2" placeholder="鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="鍗曟嵁鍙稩D" id="HInterID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+ <td>
+ <input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">椤圭洰鍙�</th>
+ <td>
+ <input type="text" name="椤圭洰鍙�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <!--鍏朵粬淇℃伅椤电-->
+ <div class="layui-tab-item" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">鍒跺崟浜�</th>
+ <td>
+ <input type="text" name="鍒跺崟浜�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
+ <td>
+ <input type="text" name="鍒跺崟鏃ユ湡" class="layui-input" id="" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">淇敼浜�</th>
+ <td>
+ <input type="text" name="淇敼浜�" id="" lay-verify="" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
+ <td>
+ <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">瀹℃牳浜�</th>
+ <td>
+ <input type="text" name="瀹℃牳浜�" id="" lay-verify="" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
+ <td>
+ <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鏈珯淇℃伅-->
+ <div class="layui-inline" style="padding-left:5px;border:1px solid #e6e6e6;width:28%">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label">鏈珯淇℃伅</label>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">宸ヤ綔涓績</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="宸ヤ綔涓績" id="HProcName" lay-verify="HProcName" autocomplete="off" placeholder="閫夋嫨宸ヤ綔涓績" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="宸ヤ綔涓績浠ｇ爜" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkingProcedure-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">褰撳墠宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="褰撳墠宸ュ簭" id="HWorkShopName" lay-verify="HWorkShopName" autocomplete="off" placeholder="閫夋嫨褰撳墠宸ュ簭" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="褰撳墠宸ュ簭浠ｇ爜" id="HWorkShopID" lay-verify="HWorkShopID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkShop-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇杞﹂棿</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇杞﹂棿" id="HScOrgName" lay-verify="HScOrgName" autocomplete="off" placeholder="閫夋嫨鐢熶骇杞﹂棿" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇杞﹂棿浠ｇ爜" id="HScOrgID" lay-verify="HScOrgID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇缁勭粐</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇缁勭粐" id="HOrganization" lay-verify="HOrganization" autocomplete="off" placeholder="閫夋嫨鐢熶骇缁勭粐" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇缁勭粐浠ｇ爜" id="HOrganizationID" lay-verify="HOrganizationID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOrganization-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎿嶄綔鍛�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鎿嶄綔鍛�" id="Operator" lay-verify="Operator" autocomplete="off" placeholder="閫夋嫨鎿嶄綔鍛�" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鎿嶄綔鍛樹唬鐮�" id="OperatorID" lay-verify="OperatorID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="Operator-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇鐝粍</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇鐝粍" id="ProductionTeam" lay-verify="ProductionTeam" autocomplete="off" placeholder="閫夋嫨鐢熶骇鐝粍" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇鐝粍浠ｇ爜" id="ProductionTeamID" lay-verify="ProductionTeamID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="ProductionTeam-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璧勬簮</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇璧勬簮" id="ProductionResources" lay-verify="ProductionResources" autocomplete="off" placeholder="閫夋嫨鐢熶骇璧勬簮" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇璧勬簮浠ｇ爜" id="ProductionResourcesID" lay-verify="ProductionResourcesID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="ProductionResources-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.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();
+ var BillStatusjson = params[params[0]];
+ var InterID = params[params[1]];
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , element = layui.element
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , util = layui.util;
+
+ //鑾峰彇褰撳墠鏃堕棿澶勭悊
+ var data = new Date();
+ var year = data.getFullYear(); //鑾峰彇骞�
+ var month = data.getMonth() + 1; //鑾峰彇鏈�
+ var day = data.getDate(); //鑾峰彇鏃�
+ var time = year + "-" + month + "-" + day;
+
+ var sMaker = sessionStorage["HMaker"];
+
+ //鍏ㄥ眬鍙橀噺
+ var LZKHFlag = false;//娴佽浆鍗″彿杈撳叆鏍囪
+ var ZJTMFlag = false;//瀛愪欢鏉＄爜杈撳叆鏍囪
+ var SNFlag = false;//SN鍙疯緭鍏ユ爣璁�
+ var ZJTMQty;//杈撳叆鐨勫瓙浠舵潯鐮佹暟閲�
+ var ZJTMQtyFlag = 0;
+
+ //椤甸潰鍒濆鍖栬祴鍊�
+ //鑾峰彇鍗曟嵁鍙�
+ layer.load(3);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3727' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo2").val(d.data[0].HBillNo);
+ layer.closeAll("loading");
+ }, error: function () {
+ layer.closeAll("loading");
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
+
+ $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
+
+ $("#HFbarcode").focus();
+ $("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#SubBarcode").attr("readonly", "readonly");//瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").css("background-color", "#efefef4d");
+ $("#snNB").attr("readonly", "readonly");//sn鍙峰彧璇�
+ $("#snNB").css("background-color", "#efefef4d");
+
+ //鎵祦杞崱鍙锋柟娉�
+ $('#HFbarcode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HFbarcode = $('#HFbarcode').val();
+ var HInterID = $("#HInterID").val();
+ var HBillNo2 = $("#HBillNo2").val();
+ if (event.keyCode == 13) {
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HFbarcode == "") {
+ layer.alert("娴佷紶鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ $.ajax({//鍔犺浇琛ㄥ崟鏁版嵁
+ url: GetWEBURL() + "/LEMS/TxtHBarCode_KeyDown",
+ type: "GET",
+ async: false,
+ data: {
+ "sBillBarCode": HFbarcode
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
+ , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
+ , "浜у搧鍚嶇О": data[0].浜у搧
+ , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
+ , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
+ , "鍒跺崟浜�": data[0].鍒跺崟浜�
+ , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
+ , "淇敼浜�": data[0].淇敼浜�
+ , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
+ , "瀹℃牳浜�": data[0].瀹℃牳浜�
+ , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
+ , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
+ , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
+ , "娴佽浆鍗″彿": $("#HFbarcode").val()
+ , "椤圭洰鍙�": data[0].椤圭洰鍙�
+ });
+ $.ajax({//鏍规嵁娴佽浆鍗″彿淇濆瓨鍒皌emp琛�
+ url: GetWEBURL() + "/LEMS/SaveCirculationCard_Json",
+ type: "GET",
+ data: {
+ "HBillNo": HFbarcode
+ , "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBarCode": ""
+ , "HNumber": $("#HNumber").val()
+ , "HName": $("#HMaterName").val()
+ , "HModel": $("#HModel").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ LZKHFlag = true;
+ $("#HFbarcode").attr("readonly", "readonly");//娴佽浆鍗″彿鍙
+ $("#HFbarcode").css("background-color", "#efefef4d");
+ $("#HFbarcode").css("box-shadow", "none");
+ $("#SubBarcodeQty").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#SubBarcodeQty").css("background-color", "white");
+ $("#SubBarcodeQty").focus();
+ $("#SubBarcodeQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#snNB").removeAttr("readonly");//绉婚櫎sn鍙峰彧璇�
+ $("#snNB").css("background-color", "white");
+ table.render({
+ elem: '#smjl-table'
+ //, toolbar: '#smjl-toolbar'
+ , url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+ , where: {
+ HBillNo: HBillNo2
+ }
+ , cellMinWidth: 100
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿' }
+ , {
+ field: time, title: '姹囨姤鏃ユ湡', width: 110, templet: function (d) {
+ return util.toDateString(time, "yyyy-MM-dd");
+ }
+ }
+ , { field: 'HSourceBillNo', title: '鏉＄爜鍙�', width: 135 }
+ , { field: 'HBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 145 }
+ , { field: 'HNumber', title: '鐗╂枡缂栫爜' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О' }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: '', title: '璁″垝鏁伴噺' }
+ , { field: '', title: '姹囨姤鏁伴噺' }
+ , { field: 'HMaker', title: '鍒跺崟浜�' }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+ ]]
+ //, height: 300
+ });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鏃犳娴佽浆鍗″彿锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎵祦杞崱鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ // layer.msg($('#HFbarcode').val(), { icon: 1 });
+ }
+ });
+
+ //鎵规鏉＄爜(瀛愪欢鏉＄爜)鍥炶溅鏂规硶
+ $('#SubBarcode').on('keydown', function (event) { //鎵潯褰㈢爜
+ var HInterID = $("#HInterID").val();
+ var HBillNo2 = $("#HBillNo2").val();//鍗曟嵁鍙�
+ var HBarCode = $("#SubBarcode").val();//鎵规鏉＄爜
+ var HBillNo = $('#HFbarcode').val();
+ if (event.keyCode == 13) {
+ if (HBillNo2 == "" || HBarCode == "") {
+ layer.alert("鍗曟嵁鍙锋垨鎵规鏉＄爜涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ if (ZJTMQtyFlag >= ZJTMQty) {
+ layer.msg("瀛愪欢鏉＄爜鏁伴噺涓嶅厑璁稿ぇ浜庤緭鍏ョ殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ var TDatas = table.cache["smjl-table"];
+ for (var i = 0; i < TDatas.length; i++) {
+ var HSourceBillNo = TDatas[i].HSourceBillNo;
+ if (HSourceBillNo == HBarCode) {
+ layer.alert("鎵规鏉＄爜涓嶈兘閲嶅锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/Save_Gy_BarCodeBillToTmp_Json",
+ type: "GET",
+ data: {
+ "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBarCode": HBarCode
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.Message == "鏃犳鎵规鏉＄爜") {
+ layer.alert("鏃犳鎵规鏉＄爜", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ } else {
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ ZJTMQtyFlag++;
+ $("#SubBarcodeQty").val("" + ZJTMQtyFlag + "/" + ZJTMQty + "");
+ ZJTMFlag = true;
+ $('#SubBarcode').val("");
+ $("#SubBarcode").focus();
+ table.reload('smjl-table', {
+ url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+ , where: {
+ HBillNo: HBillNo2
+ }
+ });
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }
+ }, error: function () {
+ layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+ //SN鍙峰洖杞︽柟娉�
+ $('#snNB').on('keydown', function (event) { //鎵潯褰㈢爜
+ var snNB = $('#snNB').val();
+ var HBillNo = $('#HFbarcode').val();
+ var HInterID = $("#HInterID").val();
+ var HBillNo2 = $("#HBillNo2").val();
+ var HBillType = "3727";
+ if (event.keyCode == 13) {
+ if (snNB == "" || HBillNo == "") {
+ layer.alert("SN鍙锋垨娴佽浆鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
+ type: "GET",
+ data: {
+ "HBillNo": HBillNo
+ , "SubBarcode": snNB
+ , "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBillType": HBillType
+ , "sMaker": sMaker
+ , "HBarCode": ""
+ , "HNumber": $("#HNumber").val()
+ , "HName": $("#HMaterName").val()
+ , "HModel": $("#HModel").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.Message == "璇ュ瓙浠舵潯鐮佸凡瀛樺湪") {
+ layer.alert("璇ラ暛闆曟潯鐮佸凡瀛樺湪", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ } else {
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ SNFlag = true;
+ $('#snNB').val("");
+ $("#snNB").focus();
+ table.reload('smjl-table', {
+ url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+ , where: {
+ HBillNo: HBillNo2
+ }
+ });
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }
+ }, error: function () {
+ layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+
+ //閫夋嫨鎿嶄綔鍛樺脊绐�
+ form.on('submit(Operator-BT)', function () {//閫夋嫨浠撲綅
+ layer.open({
+ type: 2
+ , area: ['60%', '60%']
+ , title: '鏈珯宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇鐝粍寮圭獥
+ form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+ layer.open({
+ type: 2
+ , area: ['60%', '60%']
+ , title: '鏈珯宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ });
+
+ //閫夋嫨鐢熶骇璧勬簮寮圭獥
+ form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['60%', '60%']
+ , 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(HOrganization-BT)', function () {//閫夋嫨鐢熶骇缁勭粐
+ layer.open({
+ type: 2
+ , area: ['60%', '60%']
+ , title: '鐢熶骇缁勭粐'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_OrgList.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //debugger;
+ if (!LZKHFlag) {
+ layer.msg("娴佽浆鍗″彿蹇呴』杈撳叆涓�娆★紒");
+ return;
+ }
+ if (!ZJTMFlag) {
+ layer.msg("瀛愪欢鏉＄爜蹇呴』杈撳叆涓�娆★紒");
+ return;
+ }
+ if (!SNFlag) {
+ layer.msg("SN鍙峰繀椤昏緭鍏ヤ竴娆★紒");
+ return;
+ }
+ if (ZJTMQtyFlag != ZJTMQty) {
+ layer.msg("瀛愪欢鏉＄爜鏁伴噺鏈畬鎴愶紒");
+ return;
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var datas = table.cache["smjl-table"];
+ var HBillNo = $('#HBillNo2').val();
+ var lenth = datas.length;
+ $.ajax({//鎻掑叆涓昏〃
+ url: GetWEBURL() + "/LEMS/SaveToSc_AssemblyBillMain",
+ type: "GET",
+ async: false,
+ data: {
+ "HBillNo": HBillNo
+ },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ for (var i = 0; i < datas.length; i++) {
+ var HitemID = datas[i].HitemID;
+ var HBillType = datas[i].HBillType;
+ if (HBillType != 3772) {
+ $.ajax({//鎻掑叆瀛愯〃
+ url: GetWEBURL() + "/LEMS/SaveToSc_AssemblyBillSub",
+ type: "GET",
+ async: false,
+ data: {
+ "HitemID": HitemID
+ },
+ success: function (result) {
+ var data = result.data;
+ if (data[0].Column1 == 1) {
+ //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鏃犳暟鎹�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎻掑叆瀛愯〃鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
+ for (var i = 0; i < datas.length; i++) {
+ var HitemID = datas[i].HitemID
+ $.ajax({//鏇存柊temp琛ㄦ爣璁板瓧娈�
+ url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",
+ type: "GET",
+ async: false,
+ data: {
+ "HitemID": HitemID
+ },
+ success: function (result) {
+ var data = result.data;
+ if (data[0].Column1 == 1) {
+ //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鏃犳暟鎹�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鏇存柊鏍囪鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ layer.confirm(
+ '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
+ {
+ skin: 'layui-layer-lan',
+ closeBtn: 0,
+ btn: ['鏂板', '鍏抽棴'],
+ btn2: function () {//鏂板
+ parent.layui.admin.events.closeThisTabs();
+ }
+ }, function () {//鍏抽棴
+ window.location.reload();
+ }
+ );
+ });
+
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Close)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs();
+ });
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
+
+ ////寰呯粍瑁呭伐鍗曢〉绛�
+ //table.render({
+ // elem: '#dzzgd-table'
+ // , url: GetWEBURL1() + '/Web/DisBillEntryList_Mate_Webs_Json'
+ // , cols: [[
+ // { field: 'HInterID', title: '搴忓彿' }
+ // , { field: 'HBillNo', title: '鐘舵��', sort: true }
+ // , { field: 'HMaker', title: '鐢熶骇璁㈠崟' }
+ // , { field: 'HMakeDate', title: '璁″垝鏃ユ湡' }
+ // , { field: 'HQty', title: '鐗╂枡缂栫爜' }
+ // , { field: 'HSourceBillNo', title: '鐗╂枡鍚嶇О' }
+ // , { field: 'HRedBlueFlag', title: '瑙勬牸鍨嬪彿' }
+ // , { field: 'HSourceBillType', title: '璁″垝鏁伴噺' }
+ // , { field: 'HSourceBillType', title: '宸叉眹鎶ユ暟閲�' }
+ // , { field: 'HSourceBillType', title: '宸插叆搴撴暟閲�' }
+ // ]]
+ // , height: 300
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ if (data.HBillType == "3772") {
+ layer.msg("娴佽浆鍗″彿涓嶅厑璁稿垹闄わ紒");
+ return;
+ }
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DelProductionLinePackagingTable',
+ type: "GET",
+ data: { "sHInterID": data.HInterID, "HSourceBillNo": data.HSourceBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ if (data.HBillType == "100001") {
+ ZJTMQtyFlag--;
+ $("#SubBarcodeQty").val("" + ZJTMQtyFlag + "/" + ZJTMQty + "");
+ }
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ } else {
+ layer.alert(result.code + result.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
+
+ //濉啓瀛愪欢鏉＄爜鏁伴噺鍚庡厜鏍囪烦璧�
+ $('#SubBarcodeQty').on('keydown', function (event) {
+ ZJTMQty = $("#SubBarcodeQty").val();
+ if (event.keyCode == 13) {
+ if (ZJTMQty == "" || ZJTMQty <= 0) {
+ layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ else
+ {
+ $("#SubBarcodeQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#SubBarcodeQty").css("background-color", "#efefef4d");
+ $("#SubBarcodeQty").css("box-shadow", "none");
+ $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").css("background-color", "white");
+ $("#SubBarcode").focus();
+ $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ }
+ }
+ });
+
+
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+
+ function GetHWorkerValue(obj) { //杩斿洖鎺ユ敹浜�
+ $("#Operator").val(obj[0].HName);
+ $("#OperatorID").val(obj[0].HNumber);
+ $("#Operator").css("box-shadow", "none");
+ if ($("#ProductionTeam").val()) {
+ $("#ProductionTeam").css("box-shadow", "none");
+ } else {
+ $("#ProductionTeam").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ }
+
+ function GetProductionTeamValue(obj) { //杩斿洖鐢熶骇鐝粍
+ $("#ProductionTeam").val(obj[0].鐝粍);
+ $("#ProductionTeamID").val(obj[0].鐝粍浠ｇ爜);
+ $("#ProductionTeam").css("box-shadow", "none");
+ if ($("#ProductionResources").val()) {
+ $("#ProductionResources").css("box-shadow", "none");
+ } else {
+ $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ }
+
+ function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
+ if ($("#ProductionResources").val()) {
+ $("#ProductionResources").css("box-shadow", "none");
+ }
+ $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
+ $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠ｇ爜);
+ $("#ProductionResources").css("box-shadow", "none");
+ }
+
+
+ function GetOrgValue(obj) //杩斿洖鐢熶骇缁勭粐
+ {
+ $("#HOrganization").val(obj[0].HName);
+ $("#HOrganizationID").val(obj[0].HNumber);
+ }
+
+ //function GetHEmpValue(obj) //杩斿洖鑱屽憳
+ //{
+ // $("#HEmpName").val(obj[0].HName);
+ // $("#HEmpID").val(obj[0].HItemID);
+ //}
+ //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ //{
+ // $("#HDeptName").val(obj[0].HName);
+ // $("#HDeptID").val(obj[0].HItemID);
+ //}
+
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceabilityList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceabilityList.html"
new file mode 100644
index 0000000..0219fc5
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_AssemblyTraceabilityList.html"
@@ -0,0 +1,327 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>浜х嚎缁勮杩芥函鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇浠诲姟鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">闀洉鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HICMOBillNo_E" id="HICMOBillNo_E">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="tmlx" id="tmlx">
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hname" id="hname">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ </div>
+ </div>
+ </div>-->
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--<script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ </div>
+ </script>-->
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <style>
+ .layui-table-cell{
+ height:auto;
+ white-space:normal;
+ }
+ </style>
+ <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/webConfig2.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option1 = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ , cols: [[
+ //{ field: '鍞竴鏉＄爜', title: '鍞竴鏉＄爜', sort: true, width: 170 }
+ {
+ field: '鎵爜鏃ユ湡', title: '鎵爜鏃ユ湡', sort: true, width: 110, templet: function (d) {
+ if (d.鎵爜鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鎵爜鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ , { field: '鏉＄爜', title: '鏉＄爜', sort: true, width: 170 }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', sort: true, width: 110 }
+ , { field: '鐢熶骇浠诲姟鍗曞崟鍙�', title: '鐢熶骇浠诲姟鍗曞崟鍙�', width: 140 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150 }
+ //, { field: '鎵撳寘鏁伴噺', title: '鎵撳寘鏁伴噺', width: 90 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 110 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '鏁伴噺鍒跺崟浜�', title: '鏁伴噺鍒跺崟浜�', width: 110 }
+ , {
+ field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 110, templet: function (d) {
+ if (d.鍒跺崟鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ ]]
+ };
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cellMinWidth: 115
+ , cols: [[
+ { field: '椤圭洰鍙�', title: '椤圭洰鍙�' }
+ ,{
+ field: '鎵爜鏃ユ湡', title: '鎵爜鏃ユ湡', sort: true, templet: function (d) {
+ if (d.鎵爜鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鎵爜鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ , { field: '鏉＄爜', title: '鏉＄爜', sort: true }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', sort: true }
+ , { field: '鐢熶骇浠诲姟鍗曞崟鍙�', title: '鐢熶骇浠诲姟鍗曞崟鍙�',width:130 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
+ //, { field: '鎵撳寘鏁伴噺', title: '鎵撳寘鏁伴噺', width: 90 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '鏁伴噺鍒跺崟浜�', title: '鏁伴噺鍒跺崟浜�' }
+ , {
+ field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: function (d) {
+ if (d.鍒跺崟鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ ]]
+ };
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_AssemblyTraceabilityList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HBarCode_Pack").val("");//鍞竴鏉＄爜
+ $("#HICMOBillNo").val("");//鏉＄爜
+ $("#tmlx").val("");//鏉＄爜绫诲瀷
+ $("#HBillNo").val("");//鐢熶骇浠诲姟鍗曞崟鍙�
+ $("#HMaker").val("");//鏁伴噺鍒跺崟浜�
+ $("#HICMOBillNo_E").val("");//闀洉鏉＄爜
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var HICMOBillNo = $("#HICMOBillNo").val();//鏉＄爜
+ var tmlx = $("#tmlx").val();//鏉＄爜绫诲瀷
+ var HBillNo = $("#HBillNo").val();//鐢熶骇浠诲姟鍗曞崟鍙�
+ var HMaker = $("#HMaker").val();//鏁伴噺鍒跺崟浜�
+ var HICMOBillNo_E = $("#HICMOBillNo_E").val();//鏁伴噺鍒跺崟浜�
+ if (HICMOBillNo_E) {
+ HICMOBillNo_E = HICMOBillNo_E;
+ $.ajax({
+ url: GetWEBURL1() + '/LEMS/MES_AssemblyTraceabilityList_E_Json',
+ type: "GET",
+ data: { "HICMOBillNo": HICMOBillNo_E },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ $("#HBarCode_Pack").val("");//鍞竴鏉＄爜
+ $("#HICMOBillNo").val("");//鏉＄爜
+ $("#tmlx").val("");//鏉＄爜绫诲瀷
+ $("#HBillNo").val("");//鐢熶骇浠诲姟鍗曞崟鍙�
+ $("#HMaker").val("");//鏁伴噺鍒跺崟浜�
+ } else {
+ if (HICMOBillNo) {
+ sWhere += " and 鏉＄爜 like '%" + HICMOBillNo + "%'";
+ }
+ if (tmlx) {
+ sWhere += " and 鏉＄爜绫诲瀷 like '%" + tmlx + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鐢熶骇浠诲姟鍗曞崟鍙� like '%" + HBillNo + "%'";
+ }
+ if (HMaker) {
+ sWhere += " and 鏁伴噺鍒跺崟浜� like '%" + HMaker + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_AssemblyTraceabilityList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
new file mode 100644
index 0000000..9112a7d
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -0,0 +1,1407 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="background-color:white;">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎鍖呰鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <!--<div class="layui-card-header"></div>-->
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
+ <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <select name="city" lay-verify="required" id="dymb">
+ <!--<option value="鏈�夋嫨">璇烽�夋嫨鎵撳嵃妯℃澘</option>-->
+ <option value="HBarCodePrint">鐗╂枡鏉＄爜妯℃澘</option>
+ <!--<option value="HPOInStockBill">閫佽揣鍗�</option>-->
+ <!--<option value="HPOInStockBill">閫佽揣鍗�(鏍囩绾�)</option>-->
+ </select>
+ </div>
+ </div>
+ <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+ <div class="layui-inline" style="width: 200px;">
+ <div class="layui-input-block">
+ <select name="PrintName" lay-verify="required" id="PrintName">
+ <option value="鏂帿灏�" selected>鏂帿灏�</option>
+ <option value="鏅彶鐗�">鏅彶鐗�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <select name="LDM" lay-verify="required" id="LDM">
+ <option value="DU3" selected>DU3</option>
+ <option value="QDR">QDR</option>
+ <option value="鍏朵粬">鍏朵粬</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <select name="BBM" lay-verify="required" id="BBM">
+ <option value="1099081-00-E">1099081-00-E</option>
+ <option value="1786947-00-B">1786947-00-B</option>
+ <option value="1607222-00-B">1607222-00-B</option>
+ <option value="1943600-00-B">1943600-00-B</option>
+ <option value="1941600-00-B">1941600-00-B</option>
+ <option value="鍏朵粬" selected>鍏朵粬</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline">
+ <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
+ <legend>浜х嚎鍖呰鍗�</legend>
+ </fieldset>
+ </div>
+ <div class="layui-col-xs1 layui-inline">
+ <img src="222.jpg" style="width:70%;height:50%;" />
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <div class="">
+ <label class="layui-inline" style="width:60px;">娴佽浆鍗″彿</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width: 140%;" name="娴佽浆鍗″彿" id="HFbarcode" placeholder="璇疯緭鍏ユ祦杞崱鍙�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瀛愪欢鏉＄爜鏁伴噺</label>
+ <div class="layui-inline">
+ <input type="text" lay-verify="verifyPcmQty" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉＄爜鏁伴噺" id="pcmQty" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮佹暟閲�" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瀛愪欢鏉＄爜</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉＄爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瑁呯鏁伴噺</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="璇疯緭鍏ヨ绠辨暟閲�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">涓嶆弧绠辨爣璇�</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;" name="" id="HRemark" autocomplete="off" placeholder="璇疯緭鍏ヤ笉婊＄鏍囪瘑" class="layui-input">
+ </div>
+ </div>
+ <div class="">
+ <label class="layui-inline" style="width:60px;">鐧芥爣鍙�</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;" name="" id="HBarCode_White" autocomplete="off" placeholder="鐧芥爣鍙�" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--寰呮帴鏀跺伐鍗�&浠婃棩杩涚珯-->
+ <div class="layui-card layui-form-item">
+ <div class="layui-card-body">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="" class="layui-this">鎵爜璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
+ <script type="text/html" id="smjl-toolbar">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>鍒犺</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--褰撳墠宸ュ崟&鍏朵粬淇℃伅-->
+ <div class="layui-form-item">
+ <div class="layui-col-md8 layui-card-body layui-inline">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="" class="layui-this">鍖呰淇℃伅</li>
+ <li data-status="2">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
+ <td>
+ <input type="text" name="娴佽浆鍗″彿" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="娴佽浆鍗″彿" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="娴佽浆鍗D" id="HFbarcodeID">
+ </td>
+ <th style="width:80px;padding:10px">缁勮鏃堕棿</th>
+ <td>
+ <input type="text" name="缁勮鏃堕棿" class="layui-input" id="HDateNow" placeholder="缁勮鏃堕棿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鍙�" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
+ <td>
+ <input type="text" name="浜у搧浠ｇ爜" class="layui-input" id="HNumber" placeholder="浜у搧浠ｇ爜" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="鐗╂枡鍐呯爜" id="HMaterID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+ <td>
+ <input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+ <td>
+ <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="瑙勬牸鍨嬪彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
+ <td>
+ <input type="text" name="璁￠噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="璁￠噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+ <td>
+ <input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="娴佽浆鍗℃暟閲�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
+ <td>
+ <input type="text" name="鍗曟嵁鍙�" class="layui-input" id="HBillNo2" placeholder="鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="鍗曟嵁鍙稩D" id="HInterID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+ <td>
+ <input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鎵樻潯鐮�</th>
+ <td>
+ <input type="text" name="鎵樻潯鐮�" class="layui-input" id="HBarCode_wym" placeholder="鎵樻潯鐮�" style="background-color:#efefef4d;" readonly>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HUnitID" id="HUnitID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">椤圭洰鍙�</th>
+ <td>
+ <input type="text" name="椤圭洰鍙�" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="椤圭洰鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">鍒跺崟浜�</th>
+ <td>
+ <input type="text" name="鍒跺崟浜�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
+ <td>
+ <input type="text" name="鍒跺崟鏃ユ湡" class="layui-input" id="" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">淇敼浜�</th>
+ <td>
+ <input type="text" name="淇敼浜�" id="" lay-verify="" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
+ <td>
+ <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">瀹℃牳浜�</th>
+ <td>
+ <input type="text" name="瀹℃牳浜�" id="" lay-verify="" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
+ <td>
+ <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鏈珯淇℃伅-->
+ <!--<div class="layui-inline" style="padding-left:5px;border:1px solid #e6e6e6;width:28%">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label">鏈珯淇℃伅</label>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">宸ヤ綔涓績</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="宸ヤ綔涓績" id="HProcName" lay-verify="HProcName" autocomplete="off" placeholder="閫夋嫨宸ヤ綔涓績" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="宸ヤ綔涓績浠ｇ爜" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkingProcedure-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">褰撳墠宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="褰撳墠宸ュ簭" id="HWorkShopName" lay-verify="HWorkShopName" autocomplete="off" placeholder="閫夋嫨褰撳墠宸ュ簭" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="褰撳墠宸ュ簭浠ｇ爜" id="HWorkShopID" lay-verify="HWorkShopID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HWorkShop-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇杞﹂棿</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇杞﹂棿" id="HScOrgName" lay-verify="HScOrgName" autocomplete="off" placeholder="閫夋嫨鐢熶骇杞﹂棿" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇杞﹂棿浠ｇ爜" id="HScOrgID" lay-verify="HScOrgID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇缁勭粐</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇缁勭粐" id="HOrganization" autocomplete="off" placeholder="閫夋嫨鐢熶骇缁勭粐" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇缁勭粐浠ｇ爜" id="HOrganizationID" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="HOrganization-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎿嶄綔鍛�</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鎿嶄綔鍛�" id="Operator" lay-verify="Operator" autocomplete="off" placeholder="閫夋嫨鎿嶄綔鍛�" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鎿嶄綔鍛樹唬鐮�" id="OperatorID" lay-verify="OperatorID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="Operator-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇鐝粍</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇鐝粍" id="ProductionTeam" lay-verify="ProductionTeam" autocomplete="off" placeholder="閫夋嫨鐢熶骇鐝粍" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇鐝粍浠ｇ爜" id="ProductionTeamID" lay-verify="ProductionTeamID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="ProductionTeam-BT">...</button>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璧勬簮</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="鐢熶骇璧勬簮" id="ProductionResources" lay-verify="ProductionResources" autocomplete="off" placeholder="閫夋嫨鐢熶骇璧勬簮" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="鐢熶骇璧勬簮浠ｇ爜" id="ProductionResourcesID" lay-verify="ProductionResourcesID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2" lay-filter="ProductionResources-BT">...</button>
+ </div>
+ </div>
+ </div>-->
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../CreateControl.js"></script>
+ <script>
+ //CreateReport("Report");
+ 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();
+ var BillStatusjson = params[params[0]];
+ var InterID = params[params[1]];
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , element = layui.element
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , util = layui.util;
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { parent.location.href = "../user/login.html"; });
+ return;
+ }
+ var option = [];
+ set_InitGrid();
+ //鍒濆鍖栨槑缁嗚〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'numbers', title: '搴忓彿' }
+ , {
+ field: time, title: '鎵爜鏃ユ湡', width: 110, templet: function (d) {
+ return util.toDateString(time, "yyyy-MM-dd");
+ }
+ }
+ , { field: 'HSourceBillNo', title: '鏉″舰鐮�', width: 145 }
+ , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 125 }
+ , { field: 'HBarCode', title: '鍞竴鐮�', width: 125 }
+ , { field: 'HNumber', title: '鐗╂枡缂栫爜', width: 105 }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 105 }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 105 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ //, { field: 'HWhID', title: '浠撳簱', width: 80 }
+ , { field: 'HMaker', title: '鍒跺崟浜�', width: 80 }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 195 }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+ ];
+ option = {
+ id: 'smjl-table'
+ , elem: '#smjl-table'
+ //, toolbar: '#toolbarDemo'
+ , page: false
+ //, cellMinWidth: 120
+ //, height: 500
+ , cols: [columns]
+ //, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //鍏ㄥ眬鍙橀噺
+ var ZJTMFlag = false;//瀛愪欢鏉＄爜杈撳叆鏍囪
+ //鑾峰彇褰撳墠鏃堕棿澶勭悊
+ var data = new Date();
+ var year = data.getFullYear(); //鑾峰彇骞�
+ var month = data.getMonth() + 1; //鑾峰彇鏈�
+ var day = data.getDate(); //鑾峰彇鏃�
+ var time = year + "-" + month + "-" + day;
+
+ var sMaker = sessionStorage["HMaker"];
+ var zxQty;//杈撳叆鐨勮绠辨暟閲�
+ var zxQtyFlag = 0;
+ var pcmQty;//杈撳叆鐨勬壒娆＄爜鏁伴噺
+ var pcmQtyFlag = 0;
+ var icmoQty = 0;//娴佽浆鍗℃暟閲�
+ var icmoQtyNow = 0;//娴佽浆鍗″墿浣欐暟閲�
+ //console.log(sessionStorage);
+
+ //椤甸潰鍒濆鍖栬祴鍊�
+ layer.load(3);
+ //鑾峰彇鍗曟嵁鍙�
+ getBillno();
+ $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
+ $("#HFbarcode").focus();
+ $("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#SubBarcode").attr("readonly", "readonly");//瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").css("background-color", "#efefef4d");
+ $("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#zxQty").css("background-color", "#efefef4d");
+ $("#pcmQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#pcmQty").css("background-color", "#efefef4d");
+
+ //鎵潯褰㈢爜鏂规硶
+ $('#HFbarcode').on('keydown', function (event) { //鎵潯褰㈢爜
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { parent.location.href = "../user/login.html"; });
+ }
+ if (event.keyCode == 13) {
+ HFbarcodeKeydown();
+ }
+ });
+
+ //濉啓瑁呯鏁伴噺鍚庡厜鏍囪烦璧�
+ $('#zxQty').on('keydown', function (event) {
+ zxQty = $("#zxQty").val();
+ if (event.keyCode == 13) {
+ if (!(/(^[1-9]\d*$)/.test(zxQty))) {
+ playSound();
+ layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
+ return;
+ }
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (zxQty > icmoQty) {
+ playSound();
+ layer.msg("瑁呯鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ //鍒ゆ柇瑁呯鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺
+ if (zxQty > icmoQtyNow) {
+ playSound();
+ layer.msg("瑁呯鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鍓╀綑鏁伴噺锛佸墿浣欐暟閲忎负" + icmoQtyNow, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ if (zxQty == "" || zxQty <= 0) {
+ playSound();
+ layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ } else {
+ $("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#zxQty").css("background-color", "#efefef4d");
+ $("#zxQty").css("box-shadow", "none");
+ //瀛愪欢鏉＄爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺 鐒跺悗鍏夋爣绉诲姩鍒� "瀛愪欢鏉＄爜" 鍗曞厓鏍�
+ pcmQty = zxQty;
+ $("#pcmQty").val(zxQty);//瀛愪欢鏉＄爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺
+ $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").css("background-color", "white");
+ $("#SubBarcode").focus();
+ $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ //$("#pcmQty").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ //$("#pcmQty").css("background-color", "white");
+ //$("#pcmQty").focus();
+ //$("#pcmQty").css("box-shadow", "0 0 0 1px #00ff00");
+ }
+ }
+ });
+
+ //濉啓瀛愪欢鏉＄爜鏁伴噺鍚庡厜鏍囪烦璧�
+ $('#pcmQty').on('keydown', function (event) {
+ pcmQty = $("#pcmQty").val();
+ if (event.keyCode == 13) {
+ if (!(/(^[1-9]\d*$)/.test(pcmQty))) {
+ playSound();
+ layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
+ return;
+ }
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (pcmQty > icmoQty) {
+ playSound();
+ layer.msg("瀛愪欢鏉＄爜鏁伴噺涓嶅厑璁稿ぇ浜庢祦杞崱鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ if (pcmQty == "" || pcmQty <= 0) {
+ playSound();
+ layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ } else {
+ $("#pcmQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#pcmQty").css("background-color", "#efefef4d");
+ $("#pcmQty").css("box-shadow", "none");
+ $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").css("background-color", "white");
+ $("#SubBarcode").focus();
+ $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ }
+ }
+ });
+
+ //瀛愪欢鏉＄爜鍥炶溅鏂规硶
+ $('#SubBarcode').on('keydown', function (event) { //鎵潯褰㈢爜
+
+ var SubBarcode = $('#SubBarcode').val();
+ var HBillNo = $('#HFbarcode').val();
+ var HInterID = $("#HInterID").val();
+ var HBillNo2 = $("#HBillNo2").val();
+ var HBillType = "3783";
+ var LDM = $("#LDM").val();//鏉＄爜杞﹂棿绫诲瀷 DU3/QDR/鍏跺畠
+ var BBM = $("#BBM").val();//
+ var reg = /[a-z]/;
+
+
+
+ if (event.keyCode == 13) {
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.length != 29) {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
+ playSound();
+ layer.alert("蹇呴』鏄崐瑙掑瓧绗�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && reg.test(SubBarcode)) {
+ playSound();
+ layer.alert("璇锋煡鐪嬪瓙浠舵潯鐮佸ぇ鍐欐槸鍚︽纭�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && SubBarcode.indexOf(BBM) == -1) {
+ playSound();
+ layer.alert("璇锋壂鎻忔纭殑瀛愪欢鏉＄爜!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ if (LDM != "鍏朵粬") {
+ if (SubBarcode.indexOf(LDM) == -1) {
+ playSound();
+ layer.alert("褰撳墠鏉＄爜涓嶅睘浜�" + LDM + "杞﹂棿", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }
+ if (SubBarcode == "" || HBillNo == "") {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜鎴栨祦杞崱鍙蜂负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ if (zxQty == zxQtyFlag) {
+ playSound();
+ layer.alert("瑁呯鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ $("#HRemark").attr("readonly", "readonly");//涓嶆弧绠辨爣璇嗗彧璇�
+ $("#HRemark").css("background-color", "#efefef4d");
+ return;
+ }
+ if (pcmQty == pcmQtyFlag) {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ var a = 0;
+
+ $.ajax({//鍒ゆ柇鏉＄爜鐨勭姸鎬�
+ url: GetWEBURL() + "/LEMS/HbadStaus",
+ type: "GET",
+ async: false,
+ data: { "SubBarcode": SubBarcode },
+ success: function (result) {
+ if (result.count == 0) {
+ a = 1;
+ playSound();
+ layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return false;
+ }
+ }
+ })
+ if (a == 1) {
+ a = 0;
+ return false;
+ }
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ //鍒ゆ柇鏉＄爜涔嬪墠鐨勫伐搴忔槸鍚﹀嚭绔�
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/SNBarcodeProcCtrl",
+ type: "GET",
+ async: false,
+ data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo },
+ success: function (result) {
+ if (result.count == 0) {
+ a = 1;
+ playSound();
+ layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return false;
+ }
+ }
+ })
+
+ if (a == 1) {
+ a = 0;
+ return false;
+ }
+
+ $.ajax({//鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
+ type: "GET",
+ async: false,
+ data: { "HInterID": $("#HFbarcodeID").val() },
+ success: function (result) {
+ if (result.count == 0) {
+ playSound();
+ layer.alert(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return;
+ }
+ else {
+ $.ajax({//鏌ヨ瀛愪欢鏉＄爜鐨勫悎璁℃暟閲�
+ url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val()
+ },
+ success: function (result) {
+ var AllHqty = result.data[0].HQty;
+ if (AllHqty >= icmoQty) {
+ playSound();
+ layer.alert("鍖呰鏁伴噺宸茬瓑浜庢祦杞崱鏁伴噺锛佷笉鍏佽鎵爜锛�", { icon: 1 });
+ return;
+ } else {
+ $.ajax({//琛ㄤ綋瀛榯emp琛�
+ url: GetWEBURL() + "/LEMS/SaveSubBarcode_Json",
+ type: "GET",
+ async: false,
+ data: {
+ "HBillNo": HBillNo
+ , "SubBarcode": SubBarcode
+ , "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBillType": HBillType
+ , "sMaker": sMaker
+ , "HBarCode": $("#HBarCode_wym").val()
+ , "HNumber": $("#HNumber").val()
+ , "HName": $("#HMaterName").val()
+ , "HModel": $("#HModel").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.Message == "璇ュ瓙浠舵潯鐮佸凡瀛樺湪") {
+ playSound();
+ layer.alert("璇ュ瓙浠舵潯鐮佸凡瀛樺湪", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ } else {
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $('#SubBarcode').val("");
+ $("#SubBarcode").focus();
+ table.reload('smjl-table', {
+ url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+ , where: {
+ HBillNo: HBillNo2
+ , HBarCode: HBillNo
+ }
+ });
+ zxQtyFlag++;
+ pcmQtyFlag++
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ $.ajax({//鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val()
+ },
+ success: function (result) {
+ var HQty = result.data[0].HQty;
+ HQty++;
+ $.ajax({//鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val(),
+ "HQty": HQty
+ },
+ success: function (result) {
+ var HQty = result.data;
+ ZJTMFlag = true;
+ }, error: function () {
+ playSound();
+ layer.alert("鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }, error: function () {
+ playSound();
+ layer.alert("鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆缂撳瓨琛ㄥけ璐�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ //淇濆瓨鎸夐挳
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //debugger;
+ if (parseInt(zxQty) > zxQtyFlag) {
+ var HRemark = $('#HRemark').val();
+ if (!HRemark) {
+ playSound();
+ layer.alert("瑁呯鏁伴噺鏈壂瀹岋紝璇锋壂瀹岃绠辨暟閲忔垨濉啓涓嶆弧绠辨爣璇嗭紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }
+ if (!ZJTMFlag) {
+ playSound();
+ layer.alert("瀛愪欢鏉＄爜鏈壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+ return;
+ }
+ //澧炲姞鏍￠獙鐧芥爣鍙�
+ var LDM = $("#LDM").val();//
+ var BBM = $("#BBM").val();//
+ var HBarCode_White = $("#HBarCode_White").val();//鐧芥爣鍙�
+
+ //if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && HBarCode_White == "") {
+ // playSound();
+ // layer.alert("鐧芥爣鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ // return;
+ //}
+
+ //var BBMs = BBM.replace(/-/g, "");
+ //if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && HBarCode_White.indexOf(BBMs) == -1) {
+ // playSound();
+ // layer.alert("璇锋壂鎻忔纭櫧鏍囧彿", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ // return;
+ //}
+ if ($('#dymb').val() == "鏈�夋嫨") {
+ playSound();
+ layer.alert("璇烽�夋嫨鎵撳嵃妯℃澘", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ var sMainStr = JSON.stringify(data.field);
+ var datas = table.cache["smjl-table"];
+ var HBillNo = $('#HBillNo2').val();
+ var lenth = datas.length;
+ var HRemark = $("#HRemark").val();
+ if (!HRemark) {
+ HRemark = "鏃�";
+ }
+ //var HProjectNum = $("#HProjectNum").val();
+ var HProjectNum = "娴嬭瘯";
+ if (!HProjectNum) {
+ playSound();
+ layer.alert("椤圭洰鍙蜂负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ $.ajax({//鎻掑叆涓昏〃
+ url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillMain",
+ type: "GET",
+ async: false,
+ data: {
+ "HBillNo": HBillNo
+ , "HRemark": HRemark
+ , "HProjectNum": HProjectNum
+ //, "HBarCode_White": HBarCode_White
+ , "zxQty": zxQty
+ , "BBM": BBM
+ , "LDM": LDM
+ , "HMaterNumber": $("#HNumber").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) {
+ playSound();
+ layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("娴佹按鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ return;
+ }
+ });
+ for (var i = 0; i < datas.length; i++) {
+ var HitemID = datas[i].HitemID;
+ var HBillType = datas[i].HBillType;
+ if (HBillType != 3772) {
+ var HRemark = $("#HRemark").val();
+ if (!HRemark) {
+ HRemark = "鏃�";
+ }
+ $.ajax({//鎻掑叆瀛愯〃
+ url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
+ type: "GET",
+ async: false,
+ data: {
+ "HitemID": HitemID
+ , "HRemark": HRemark
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) {
+ //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆瀛愯〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鎻掑叆瀛愯〃鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ }
+ for (var i = 0; i < datas.length; i++) {
+ var HitemID = datas[i].HitemID
+ $.ajax({//鏇存柊temp琛ㄦ爣璁板瓧娈�
+ url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",
+ type: "GET",
+ async: false,
+ data: {
+ "HitemID": HitemID
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) {
+ //layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鏇存柊鏍囪鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ $("#Print").click();
+ $("#HBarCode_White").val("");
+ //瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹� 鏉＄爜鎵畬鍚�
+ if (pcmQty == pcmQtyFlag) {
+ $.ajax({//鏌ヨ瀛愪欢鏉＄爜鐨勫悎璁℃暟閲�
+ url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val()
+ },
+ success: function (result) {
+ var AllHqty = result.data[0].HQty;
+ if (AllHqty == icmoQty) {
+ location.reload();
+ return;
+ }
+ }
+ })
+ //娓呯┖鎵弿璁板綍鐨勮绠辨暟閲�
+ zxQtyFlag = 0;
+ pcmQtyFlag = 0;
+ //鑾峰彇鍗曟嵁鍙�
+ getBillno();
+ //鎵弿鏉＄爜
+ HFbarcodeKeydown();
+ //鍙栨秷娴佽浆鍗″彿鍙(鍙栨秷鍚庝細鏁版嵁閲嶅)
+ //$("#HFbarcode").removeAttr("readonly", "readonly");//娴佽浆鍗″彿鍙
+ //$("#HFbarcode").css("background-color", "white");
+ //$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ //瑁呯鏁伴噺 鍗曞厓鏍� 鍦ㄦ祦杞崱鍙峰洖杞︽椂鍊� 宸茶鍙栨秷鍙浠ュ強娣诲姞鏍峰紡
+ //閲嶆柊璧嬪�艰绠辨暟閲忓拰瀛愪欢鏉＄爜鏁伴噺 鍊间负鍘熸潵鐨勫��
+ $("#zxQty").val(pcmQty);
+ //瀛愪欢鏉＄爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺 鐒跺悗鍏夋爣绉诲姩鍒� "瀛愪欢鏉＄爜" 鍗曞厓鏍�
+ $("#pcmQty").val(pcmQty);//瀛愪欢鏉＄爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺
+ //绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#SubBarcode").removeAttr("readonly");
+ $("#SubBarcode").css("background-color", "white");
+ $("#SubBarcode").focus();
+ $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
+ }
+ //layer.confirm(
+ // '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
+ // {
+ // skin: 'layui-layer-lan',
+ // closeBtn: 0,
+ // btn: ['鏂板', '鍏抽棴'],
+ // btn2: function () {//鏂板
+ // parent.layui.admin.events.closeThisTabs();
+ // }
+ // }, function () {//鍏抽棴
+ // window.location.reload();
+ // }
+ //);
+ });
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ }
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Close)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs();
+ });
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
+
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print)', function (data) {//閫�鍑�
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HInterID").val();
+ //var linterid = "28973";
+ //var Type = "HBarCodePrint";
+ //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
+ //var ReportViewer = document.getElementById("ReportViewer");
+ //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
+ var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠ｇ爜";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+ );
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var report1 = "";
+ var parintName = $("#PrintName").val();
+ if (parintName == "鏂帿灏�") {
+ report1 = urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+ } else {
+ report1 = urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
+ }
+
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: report1,
+ data: Customer
+ };
+ //var args = {
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ });
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(smjl-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ if (data.HBillType == "3772") {
+ layer.msg("娴佽浆鍗″彿涓嶅厑璁稿垹闄わ紒");
+ return;
+ }
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/DelProductionLinePackagingTable',
+ type: "GET",
+ data: { "sHInterID": data.HInterID, "HSourceBillNo": data.HSourceBillNo },
+ success: function (data) {
+ if (data.count == 1) {
+ zxQtyFlag--;
+ pcmQtyFlag--
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ $("#pcmQty").val("" + pcmQtyFlag + "/" + pcmQty + "");
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ $.ajax({//鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Select_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val()
+ },
+ success: function (result) {
+ var HQty = result.data[0].HQty;
+ HQty--;
+ $.ajax({//鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶
+ url: GetWEBURL() + "/LEMS/Update_Gy_BarCodeBill_HQty",
+ type: "GET",
+ async: false,
+ data: {
+ "HBarCode": $("#HBarCode_wym").val(),
+ "HQty": HQty
+ },
+ success: function (result) {
+ var HQty = result.data;
+ }, error: function () {
+ playSound();
+ layer.alert("鏇存柊鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }, error: function () {
+ playSound();
+ layer.alert("鏌ヨ鏉＄爜妗ｆ琛ㄩ噷鐨勯暛闆曟潯鐮佺殑鍚堣鏁伴噺鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ } else {
+ playSound();
+ layer.alert(data.code + data.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
+ //娴佽浆鍗″彿 鍥炶溅浜嬩欢
+ function HFbarcodeKeydown() {
+ var HFbarcode = $('#HFbarcode').val();
+ var HInterID = $("#HInterID").val();
+ var HBillNo2 = $("#HBillNo2").val();//鍗曟嵁鍙�
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ if (HFbarcode == "") {
+ playSound();
+ layer.alert("娴佷紶鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ //鍒ゆ柇鏂囨湰妗嗗彧璇绘椂涓嶅彲鎵爜
+ //if (document.getElementById("HFbarcode").readOnly) {
+ // return;
+ //}
+ $.ajax({//鏍规嵁娴佽浆鍗″彿鑾峰彇淇℃伅
+ url: GetWEBURL() + "/LEMS/TxtHBarCode_KeyDown_Last",
+ type: "GET",
+ async: false,
+ data: {
+ "sBillBarCode": HFbarcode
+ },
+ success: function (result) {
+ var data = result.data;
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "璁㈠崟璺熻釜鍙�": data[0].璁㈠崟璺熻釜鍙�
+ , "浜у搧浠ｇ爜": data[0].浜у搧浠ｇ爜
+ , "浜у搧鍚嶇О": data[0].浜у搧
+ , "瑙勬牸鍨嬪彿": data[0].瑙勬牸鍨嬪彿
+ , "娴佽浆鍗℃暟閲�": data[0].娴佽浆鍗℃暟閲�
+ , "鍒跺崟浜�": data[0].鍒跺崟浜�
+ , "鍒跺崟鏃ユ湡": data[0].鍒跺崟鏃ユ湡
+ , "淇敼浜�": data[0].淇敼浜�
+ , "淇敼鏃ユ湡": data[0].淇敼鏃ユ湡
+ , "瀹℃牳浜�": data[0].瀹℃牳浜�
+ , "瀹℃牳鏃ユ湡": data[0].瀹℃牳鏃ユ湡
+ , "鐢熶骇璁㈠崟鍙�": data[0].婧愬崟鍗曞彿
+ , "鐢熶骇璁㈠崟鏁伴噺": data[0].鐢熶骇鏁伴噺
+ , "鐗╂枡鍐呯爜": data[0].HMaterID
+ , "HUnitID": data[0].HUnitID
+ , "娴佽浆鍗″彿": $("#HFbarcode").val()
+ , "椤圭洰鍙�": data[0].椤圭洰鍙�
+ , "娴佽浆鍗D": data[0].hmainid
+ });
+ icmoQty = data[0].娴佽浆鍗℃暟閲�;
+ //
+ $.ajax({//鐢熸垚鍞竴鐮�
+ url: GetWEBURL() + "/LEMS/SaveBarCode_json",
+ type: "GET",
+ async: false,
+ data: {
+ "sHBarcodeNo": $("#HSourceBillNo").val(),
+ "sHMaterID": $("#HMaterID").val(),
+ "sHUnitID": $("#HUnitID").val(),
+ "sHMaterName": $("#HMaterName").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (data[0].HBarCode) {
+ $("#HBarCode_wym").val(data[0].HBarCode);
+
+ $.ajax({//鍒ゆ柇鎬荤殑鍖呰鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
+ type: "GET",
+ async: false,
+ data: { "HInterID": $("#HFbarcodeID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ icmoQtyNow = result.data;
+ } else {
+ playSound();
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鏇存柊鏍囪鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ //
+ $.ajax({//琛ㄥご瀛榯emp琛�
+ url: GetWEBURL() + "/LEMS/SaveCirculationCard_Json",
+ type: "GET",
+ async: false,
+ data: {
+ "HBillNo": HFbarcode
+ , "HInterID": HInterID
+ , "HBillNo2": HBillNo2
+ , "HBarCode": $("#HBarCode_wym").val()
+ , "HNumber": $("#HNumber").val()
+ , "HName": $("#HMaterName").val()
+ , "HModel": $("#HModel").val()
+ },
+ success: function (result) {
+ var data = result.data;
+ if (data[0].Column1 == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HFbarcode").attr("readonly", "readonly");//娴佽浆鍗″彿鍙
+ $("#HFbarcode").css("background-color", "#efefef4d");
+ $("#HFbarcode").css("box-shadow", "none");
+ $("#zxQty").removeAttr("readonly");
+ $("#zxQty").css("background-color", "white");
+ $("#zxQty").focus();
+ $("#zxQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/Update_HBillNo_SubBarcodeList_Json',
+ type: "GET",
+ data: { "HBillNo": HBillNo2 },
+ async: false,
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ }
+ else {
+ playSound();
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }
+ , error: function () {
+ playSound();
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert("鏃犳娴佽浆鍗″彿锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鎵祦杞崱鍙锋柟娉曞彂鐢熼敊璇�!", { icon: 5 });
+ }
+ });
+ } else {
+ playSound();
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ playSound();
+ layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ // layer.msg($('#HFbarcode').val(), { icon: 1 });
+ }
+
+ //鑾峰彇鍗曟嵁鍙�
+ function getBillno() {
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3783' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo2").val(d.data[0].HBillNo);
+ layer.closeAll("loading");
+ }, error: function () {
+ playSound();
+ layer.closeAll("loading");
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
+ }
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //function window_onload() {
+ // Report.LoadFromURL("../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+
+ //}
+ //function btnPrint_onclick() {
+ // var linterid = "28973";
+ // //Report.LoadDataFromURL("../../views/Baseset/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + linterid, true, "");
+
+ // Report.Print(true);
+ //}
+
+ function GetHWorkerValue(obj) { //杩斿洖鎺ユ敹浜�
+ $("#Operator").val(obj[0].HName);
+ $("#OperatorID").val(obj[0].HNumber);
+ $("#Operator").css("box-shadow", "none");
+ if ($("#ProductionTeam").val()) {
+ $("#ProductionTeam").css("box-shadow", "none");
+ } else {
+ $("#ProductionTeam").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ }
+
+ function GetProductionTeamValue(obj) { //杩斿洖鐢熶骇鐝粍
+ $("#ProductionTeam").val(obj[0].鐝粍);
+ $("#ProductionTeamID").val(obj[0].鐝粍浠ｇ爜);
+ $("#ProductionTeam").css("box-shadow", "none");
+ if ($("#ProductionResources").val()) {
+ $("#ProductionResources").css("box-shadow", "none");
+ } else {
+ $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
+ }
+ }
+
+ function GetProductionResourcesValue(obj) { //杩斿洖鐢熶骇璧勬簮
+ if ($("#ProductionResources").val()) {
+ $("#ProductionResources").css("box-shadow", "none");
+ }
+ $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
+ $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠ｇ爜);
+ $("#ProductionResources").css("box-shadow", "none");
+ }
+
+
+ function GetOrgValue(obj) //杩斿洖鐢熶骇缁勭粐
+ {
+ $("#HOrganization").val(obj[0].HName);
+ $("#HOrganizationID").val(obj[0].HNumber);
+ }
+
+ //function GetHEmpValue(obj) //杩斿洖鑱屽憳
+ //{
+ // $("#HEmpName").val(obj[0].HName);
+ // $("#HEmpID").val(obj[0].HItemID);
+ //}
+ //function GetHDeptNameValue(obj) //杩斿洖閮ㄩ棬
+ //{
+ // $("#HDeptName").val(obj[0].HName);
+ // $("#HDeptID").val(obj[0].HItemID);
+ //}
+
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
new file mode 100644
index 0000000..414313c
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -0,0 +1,611 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎鍖呰鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <style>
+ .layui-form-select .layui-input {
+ padding-right: 0px;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍞竴鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode_Pack" id="HBarCode_Pack">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍗曟嵁鍙�" id="鍗曟嵁鍙�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜绫诲瀷</label>
+ <div class="layui-input-block">
+ <!--<input type="text" class="layui-input" name="tmlx" id="tmlx">-->
+ <select name=" tmlx" id="tmlx">
+ <option value="">鍏ㄩ儴</option>
+ <option value="娴佽浆鍗″彿">娴佽浆鍗″彿</option>
+ <option value="闀洉鏉＄爜">闀洉鏉＄爜</option>
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇浠诲姟鍗�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-row" style="padding: 10px 0; margin-left: 4%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-left: 4%;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <!--<div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hname" id="hname">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hnumber" id="hnumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ </div>
+ </div>
+ </div>-->
+ </div>
+ </div>
+ <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container layui-form-item">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
+ <i class="layui-icon layui-icon-file"></i>鏂帿灏旀墦鍗�
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
+ <i class="layui-icon layui-icon-file"></i>鏅彶鐗规墦鍗�
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
+ <i class="layui-icon layui-icon-file"></i>鍒犻櫎
+ </button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ ,height: 'full-50'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ {type:'radio'}
+ , { field: 'HInterID', title: 'ID', sort: true, width: 100 }
+ , { field: '椤圭洰鍙�', title: '椤圭洰鍙�', sort: true, width: 100 }
+ ,{ field: '鍞竴鏉＄爜', title: '鍞竴鏉＄爜', sort: true, width: 170 }
+ //, { field: '鎵爜鏃ユ湡', title: '鎵爜鏃ユ湡', sort: true, width: 200, templet: "<div>{{layui.util.toDateString(this.鎵爜鏃ユ湡, 'yyyy-MM-dd')}}</div> " }
+ , {
+ field: '鎵爜鏃ユ湡', title: '鍖呰鏃ユ湡', sort: true, width: 110, templet: function (d) {
+ if (d.鎵爜鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鎵爜鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ , { field: '鏉＄爜', title: '鏉＄爜', sort: true, width: 170 }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', sort: true, width: 110 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 140 }
+ , { field: '鐢熶骇浠诲姟鍗曞崟鍙�', title: '鐢熶骇浠诲姟鍗曞崟鍙�', width: 170 }
+ , { field: '鐧芥爣鍙�', title: '鐧芥爣鍙�', width: 90 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 150 }
+ , { field: '鎵撳寘鏁伴噺', title: '鎵撳寘鏁伴噺', width: 90 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 110 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '涓嶆弧绠辨爣璇�', title: '涓嶆弧绠辨爣璇�', width: 101 }
+ , { field: '鏁伴噺鍒跺崟浜�', title: '鍒跺崟浜�', width: 110 }
+ , {
+ field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 110, templet: function (d) {
+ if (d.鍒跺崟鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃ユ湡, "yyyy-MM-dd HH:mm:ss");
+ }
+ }
+ ]], parseData: function (res) {
+ debugger;
+ var data = res.data;
+ for (index in data) {
+ var 鎵爜鏃ユ湡 = data[index].鎵爜鏃ユ湡;
+ var time = new Date(鎵爜鏃ユ湡);
+ data[index].鎵爜鏃ユ湡 = time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
+ }
+ }
+ };
+
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_ProductionLinePackagingList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ $("#HBarCode_Pack").val("");//鍞竴鏉＄爜
+ $("#HICMOBillNo").val("");//鏉＄爜
+ $("#tmlx").val("");//鏉＄爜绫诲瀷
+ $("#HBillNo").val("");//鐢熶骇浠诲姟鍗曞崟鍙�
+ $("#HMaker").val("");//鏁伴噺鍒跺崟浜�
+ $("#鍗曟嵁鍙�").val("");//鍗曟嵁鍙�
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ form.render('select');
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var HBarCode_Pack = $("#HBarCode_Pack").val();//鍞竴鏉＄爜
+ var HICMOBillNo = $("#HICMOBillNo").val();//鏉＄爜
+ var tmlx = $("#tmlx").val();//鏉＄爜绫诲瀷
+ var HBillNo = $("#HBillNo").val();//鐢熶骇浠诲姟鍗曞崟鍙�
+ var HMaker = $("#HMaker").val();//鏁伴噺鍒跺崟浜�
+ var 鍗曟嵁鍙� = $("#鍗曟嵁鍙�").val();//鏁伴噺鍒跺崟浜�
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (HBarCode_Pack) {
+ sWhere += " and 鍞竴鏉＄爜 like '%" + HBarCode_Pack + "%'";
+ }
+ if (HICMOBillNo) {
+ sWhere += " and 鏉＄爜 like '%" + HICMOBillNo + "%'";
+ }
+ if (tmlx) {
+ sWhere += " and 鏉＄爜绫诲瀷 like '%" + tmlx + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鐢熶骇浠诲姟鍗曞崟鍙� like '%" + HBillNo + "%'";
+ }
+ if (HMaker) {
+ sWhere += " and 鏁伴噺鍒跺崟浜� like '%" + HMaker + "%'";
+ }
+ if (鍗曟嵁鍙�) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + 鍗曟嵁鍙� + "%'";
+ }
+ if (HBeginDate != "") {
+ sWhere += " and 鍒跺崟鏃ユ湡 >= '" + HBeginDate + "'";
+ }
+ if (HEndDate != "") {
+ sWhere += " and 鍒跺崟鏃ユ湡 <= '" + HEndDate + "'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_ProductionLinePackagingList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ option.data = [];
+ table.render(option);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+ //鑾峰彇閫変腑琛屾暟鎹�
+ table.on('row(mainTable)', function (obj) {
+ //鏍囨敞閫変腑鏍峰紡
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
+ });
+ //鎵撳嵃鎸夐挳
+ //form.on('submit(Print)', function (obj) {//閫�鍑�
+ // var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ // var linterid = checkStatus.data[0].HInterID;
+ // ////鎵撳紑鎵撳嵃妯℃澘
+ // ////var linterid = $("#HInterID").val();
+ // ////var linterid = "28973";
+ // //var Type = "HBarCodePrint";
+ // //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
+ // ////var ReportViewer = document.getElementById("ReportViewer");
+ // //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
+
+ // var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠ｇ爜";
+
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // async: true,
+ // data: { "sWhere": sWhere },
+ // success: function (data) {
+ // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ // if (data.data.length != 0) {
+ // var dataPrint = [];
+ // dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+ // );
+
+ // var Customer = {
+ // "Table": dataPrint
+ // }
+
+ // var args = {
+ // type: "print",
+ // showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ // };
+ // //var args = {
+ // // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // // data: Customer
+ // //};
+ // webapp_ws_ajax_run(args);
+ // } else {
+ // layer.msg("鏌ユ棤鏁版嵁!");
+ // }
+
+ // }
+ // else {
+ // layer.msg(data.Message, { icon: 5 });
+ // }
+ // layer.closeAll("loading");
+ // },
+ // error: function (err) {
+ // layer.msg("閿欒:" + err, { icon: 5 });
+ // }
+ // })
+
+ //});
+
+ form.on('submit(Print)', function (obj) {//閫�鍑�
+ var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ var linterid = checkStatus.data[0].HInterID;
+ ////鎵撳紑鎵撳嵃妯℃澘
+ ////var linterid = $("#HInterID").val();
+ ////var linterid = "28973";
+ //var Type = "HBarCodePrint";
+ //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
+ ////var ReportViewer = document.getElementById("ReportViewer");
+ //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+
+
+ var sWhere = "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ dataPrint.push(data.data[0]
+ //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+ );
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../views/grf/鐧芥爣鎵撳嵃.grf"),
+ data: Customer
+ };
+ //var args = {
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ });
+
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print1)', function (obj) {//閫�鍑�
+ var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ var linterid = checkStatus.data[0].HInterID;
+
+
+ var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠ｇ爜";
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ dataPrint.push({ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉＄爜缂栧彿": data.data[0]["鏉＄爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗＄紪鍙�": data.data[0]["娴佽浆鍗＄紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
+ );
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf"),
+ data: Customer
+ };
+ //var args = {
+ // report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ });
+
+ //鍒犻櫎
+ form.on('submit(BtnDel)', function (data) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HInterID = data[0].HInterID.toString();
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/DelMES_ProductionLinePackagingList',
+ type: "GET",
+ data: { "HInterID": HInterID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ });
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ function Print(data) {
+ console.log("data=", data);
+ }
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/ProcessWIPReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/ProcessWIPReport.html"
new file mode 100644
index 0000000..9ce2bf9
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/ProcessWIPReport.html"
@@ -0,0 +1,162 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ュ簭鍦ㄥ埗鍝佹姤琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;">鎴鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="EdDate" id="EdDate">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="浜у搧鍚嶇О" id="浜у搧鍚嶇О">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+ $("#EdDate").val(Format(new Date(new Date().getTime() + 24 * 60 * 60 * 1000), 'yyyy-MM-dd'));
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ //, height: 'full-10'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+
+ { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+ , { field: '娴佽浆鍗�', title: '娴佽浆鍗�' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸' }
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '鍦ㄥ埗鍝�', title: '鍦ㄥ埗鍝�' }
+ , { field: '寰呮帴鏀�', title: '寰呮帴鏀�' }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛�'
+ }
+ };
+
+ option.data = [];
+ table.render(option);
+
+
+ //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
+ layer.load(3);
+ $.ajax({
+ url: GetWEBURL() + '/Report/ProcessWIPReport',
+ type: "GET",
+ data: { "EdDate": Format(new Date(), 'yyyy-MM-dd hh:mm:ss'), "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ layer.load();
+ sWhere = " where 1 = 1 ";
+ var EdDate = $("#EdDate").val();
+ var 浜у搧鍚嶇О = $("#浜у搧鍚嶇О").val();
+ if (浜у搧鍚嶇О) {
+ sWhere += " and HMaterName like''%" + 浜у搧鍚嶇О + "%''";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/Report/ProcessWIPReport',
+ type: "GET",
+ data: { "EdDate": EdDate, "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.closeAll("loading");
+ }
+ }, error: function () {
+ layer.closeAll("loading");
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ });
+
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html"
new file mode 100644
index 0000000..9744013
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html"
@@ -0,0 +1,248 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>瀹㈣瘔杩芥函娴佺▼鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="寮�濮嬫椂闂�" id="寮�濮嬫椂闂�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="缁撴潫鏃堕棿" id="缁撴潫鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛戞爣鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="榛戞爣鍙�" id="榛戞爣鍙�">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵樼洏鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鎵樼洏鍙�" id="鎵樼洏鍙�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞彿" id="鍖呰鍗曞彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐧芥爣鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鐧芥爣鍙�" id="鐧芥爣鍙�">
+ </div>
+ </div>
+ </div>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">闀洉鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="闀洉鐮�" id="闀洉鐮�">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ //, height: 'full-10'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ {
+ field: '缁勬墭鍗曟棩鏈�', title: '缁勬墭鍗曟棩鏈�', sort: true,width:115, templet: function (d) {
+ if (d.缁勬墭鍗曟棩鏈� == null) {
+ return "";
+ }
+ return util.toDateString(d.缁勬墭鍗曟棩鏈�, "yyyy-MM-dd");
+ }
+ }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 140 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 140 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+ , { field: '鐢熶骇娴佽浆鍗″彿', title: '鐢熶骇娴佽浆鍗″彿', width: 130 }
+ , { field: '鎵樼洏鍙�', title: '鎵樼洏鍙�', width: 160 }
+ , { field: '榛戞爣鍙�', title: '榛戞爣鍙�', width: 80 }
+ , { field: '鐧芥爣鍙�', title: '鐧芥爣鍙�', width: 100 }
+ , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', width: 130 }
+ , { field: '鍖呰鍗曟潯鐮�', title: '鍖呰鍗曟潯鐮�', width: 170 }
+ , { field: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', title: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', width: 160 }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛�'
+ }
+ };
+
+ option.data = [];
+ table.render(option);
+
+
+ //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Report/RetrospectionCustomerReport',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#寮�濮嬫椂闂�").val("");
+ $("#缁撴潫鏃堕棿").val("");
+ $("#榛戞爣鍙�").val("");
+ $("#鎵樼洏鍙�").val("");
+ $("#鍖呰鍗曞彿").val("");
+ $("#鐧芥爣鍙�").val("");
+ $("#闀洉鐮�").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var 寮�濮嬫椂闂� = $("#寮�濮嬫椂闂�").val();
+ var 缁撴潫鏃堕棿 = $("#缁撴潫鏃堕棿").val();
+ var 榛戞爣鍙� = $("#榛戞爣鍙�").val();
+ var 鎵樼洏鍙� = $("#鎵樼洏鍙�").val();
+ var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
+ var 鐧芥爣鍙� = $("#鐧芥爣鍙�").val();
+ var 闀洉鐮� = $("#闀洉鐮�").val();
+ if (寮�濮嬫椂闂�) {
+ sWhere += " and 缁勬墭鍗曟棩鏈� > '" + 寮�濮嬫椂闂� + "'";
+ }
+ if (缁撴潫鏃堕棿) {
+ sWhere += " and 缁勬墭鍗曟棩鏈� < '" + 缁撴潫鏃堕棿 + "'";
+ }
+ if (榛戞爣鍙�) {
+ sWhere += " and 榛戞爣鍙� like '%" + 榛戞爣鍙� + "%'";
+ }
+ if (鎵樼洏鍙�) {
+ sWhere += " and 鎵樼洏鍙� like '%" + 鎵樼洏鍙� + "%'";
+ }
+ if (鍖呰鍗曞彿) {
+ sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
+ }
+ if (鐧芥爣鍙�) {
+ sWhere += " and 鐧芥爣鍙� like '%" + 鐧芥爣鍙� + "%'";
+ }
+ if (闀洉鐮�) {
+ sWhere += " and 闀洉鐮佸寘瑁呭瓙浠舵潯鐮� like '%" + 闀洉鐮� + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Report/RetrospectionCustomerReport',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html"
new file mode 100644
index 0000000..64e0f0a
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBill.html"
@@ -0,0 +1,578 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" style="background-color:white;">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎缁勬墭鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../CreateControl.js"></script>-->
+ <style>
+ .layui-form-label {
+ font-size: 14px;
+ width: 85px;
+ text-align: inherit;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item" style="margin-bottom: 20px;">
+ <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
+ <button type="button" id="Saver-btn" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <select name="dymb" id="dymb">
+ <option value="ZTDPrint">缁勬墭鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)</option>
+ </select>
+ </div>
+ </div>
+ <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline">
+ <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
+ <legend>浜х嚎缁勬墭鍗�</legend>
+ </fieldset>
+ </div>
+ <div class="layui-col-xs1 layui-inline">
+ <img src="222.jpg" style="width:70%;height:50%;" />
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <div>
+ <label class="layui-inline" style="width:70px;">瑁呯鏉＄爜</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width: 140%;" name="HBarCode_Pack" id="HBarCode_Pack" placeholder="璇疯緭鍏ヨ绠辨潯鐮�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div>
+ <label class="layui-inline" style="width:70px;"><span style="color:red">*</span>鍏ュ簱鎵规</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width: 140%;" name="HBatchNo" id="HBatchNo" placeholder="璇疯緭鍏ュ叆搴撴壒娆�" autocomplete="off" class="layui-input" lay-verify="required">
+ </div>
+ </div>
+ <div>
+ <label class="layui-inline" style="width:70px;">榛戞爣鍙�</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;width: 140%;" name="HBarCode_Cus" id="HBarCode_Cus" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="">
+ <label class="layui-inline" style="width:60px;">瑁呯鏁伴噺</label>
+ <div class="layui-inline">
+ <input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="璇疯緭鍏ヨ绠辨暟閲�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--寰呮帴鏀跺伐鍗�&浠婃棩杩涚珯-->
+ <div class="layui-card layui-form-item">
+ <div class="layui-card-body">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="" class="layui-this">鎵爜璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <table class="layui-hide" id="ztd-table" lay-filter="ztd-table"></table>
+ <script type="text/html" id="smjl-toolbar">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>鍒犺</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--褰撳墠宸ュ崟&鍏朵粬淇℃伅-->
+ <div class="layui-form-item">
+ <div class="layui-col-md8 layui-card-body layui-inline">
+ <div class="layui-tab">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li data-status="" class="layui-this">鍖呰淇℃伅</li>
+ <li data-status="2">鍏朵粬淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
+ <td>
+ <input type="text" name="娴佽浆鍗″彿" id="" lay-verify="" autocomplete="off" placeholder="娴佽浆鍗″彿" class="layui-input" style="background-color:#efefef4d" readonly>
+ <input type="hidden" name="娴佽浆鍗D" id="HFbarcodeID">
+ </td>
+ <th style="width:80px;padding:10px">缁勮鏃堕棿</th>
+ <td>
+ <input type="text" name="缁勮鏃堕棿" class="layui-input" id="HDateNow" placeholder="缁勮鏃堕棿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鍙�" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
+ <td>
+ <input type="text" name="浜у搧浠ｇ爜" class="layui-input" id="HNumber" placeholder="浜у搧浠ｇ爜" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="鐗╂枡鍐呯爜" id="HMaterID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+ <td>
+ <input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+ <td>
+ <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="瑙勬牸鍨嬪彿" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
+ <td>
+ <input type="text" name="璁￠噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="璁￠噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+ <td>
+ <input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="娴佽浆鍗℃暟閲�" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+ <td>
+ <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
+ <td>
+ <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+ <td>
+ <input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鎵樻潯鐮�</th>
+ <td>
+ <input type="text" name="鎵樻潯鐮�" class="layui-input" id="HBarCode_wym" placeholder="鎵樻潯鐮�" style="background-color:#efefef4d;" readonly>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HUnitID" id="HUnitID">
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">椤圭洰鍙�</th>
+ <td>
+ <input type="text" name="椤圭洰鍙�" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="椤圭洰鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="layui-tab-item" style="height:250px;">
+ <table>
+ <tbody>
+ <tr>
+ <th style="width:80px;padding:10px">鍒跺崟浜�</th>
+ <td>
+ <input type="text" name="HMaker" id="HMaker" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
+ <td>
+ <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">淇敼浜�</th>
+ <td>
+ <input type="text" name="淇敼浜�" id="" lay-verify="" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
+ <td>
+ <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ <tr>
+ <th style="width:80px;padding:10px">瀹℃牳浜�</th>
+ <td>
+ <input type="text" name="瀹℃牳浜�" id="" lay-verify="" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
+ </td>
+ <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
+ <td>
+ <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
+
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , element = layui.element
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , util = layui.util;
+
+ var zxQty;//杈撳叆鐨勮绠辨暟閲�
+ var zxQtyFlag = 0;
+
+
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { parent.location.href = "../user/login.html"; });
+ return;
+ }
+ //鍗曟嵁绫诲瀷
+ var HBillTyp = '2601';
+ $('#HMaker').val(sessionStorage["HMaker"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //杩涘叆椤甸潰榛樿瑁呯鐮佷笉鑳藉～
+ $("#HBarCode_Pack").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#HBarCode_Pack").css("background-color", "#efefef4d");
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄨ绠辨暟閲忎笂
+ $("#zxQty").focus();
+ $("#zxQty").css("box-shadow", "0 0 0 1px #00ff00");
+
+ //椤甸潰鍒濆鍖栬祴鍊�
+ //鑾峰彇鍗曟嵁鍙�
+ layer.load(3);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3783' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ layer.closeAll("loading");
+ }, error: function () {
+ layer.closeAll("loading");
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
+
+ //涓昏〃鍒楄〃
+ var option = {
+ elem: '#ztd-table'
+ //, toolbar: '#toolbarDemo'
+ //, page: true
+ //, height: 256
+ , cellMinWidth: 90
+ , limit: 500
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', hide: true }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , {
+ field: 'HDate', title: '鍒跺崟鏃ユ湡', width: 110, templet: function (d) {
+ if (d.HDate == null) {
+ return "";
+ }
+ return util.toDateString(d.HDate, "yyyy-MM-dd");
+ }
+ }
+ , { field: 'HBillNo', title: '鍖呰鍗曞彿' }
+ , { field: 'HRemark', title: '涓嶆弧绠辨爣璇�' }
+ , { field: 'HMaker', title: '鍒跺崟浜�' }
+ , { field: 'HICMOBillNo', title: '娴佽浆鍗″彿' }
+ , { field: 'HBarCode_Pack', title: '瑁呯鐮�' }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+ //, { field: 'HBillType', title: 'HBillType', hide: true }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忚绠辨潯鐮侊紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
+ }
+ };
+
+ //鍒濆鍔犺浇琛ㄦ牸
+ option.data = [];
+ table.render(option);
+
+
+ //濉啓瑁呯鏁伴噺鍚庡厜鏍囪烦璧�
+ $('#zxQty').on('keydown', function (event) {
+ zxQty = $("#zxQty").val();
+ if (event.keyCode == 13) {
+ if (!(/(^[1-9]\d*$)/.test(zxQty))) {
+ layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
+ return;
+ }
+
+ if (zxQty == "" || zxQty <= 0) {
+ layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ } else {
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ $("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
+ $("#zxQty").css("background-color", "#efefef4d");
+ $("#zxQty").css("box-shadow", "none");
+ //鍏夋爣璺宠浆鍒拌绠辩爜涓�
+ $("#HBarCode_Pack").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#HBarCode_Pack").css("background-color", "white");
+ $("#HBarCode_Pack").focus();
+ $("#HBarCode_Pack").css("box-shadow", "0 0 0 1px #00ff00");
+ }
+ }
+ });
+
+
+ //鎵绠辩爜
+ $('#HBarCode_Pack').on('keydown', function (event) {
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { parent.location.href = "../user/login.html"; });
+ }
+
+ if (event.keyCode == 13) {
+ if (zxQty == zxQtyFlag) {
+ layer.alert("瑁呯鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+ }
+
+ var HInterID = $('#HInterID').val();
+ var HBillNo = $('#HBillNo').val();
+ var HMaker = $('#HMaker').val();
+ var HBarCode_Pack = $('#HBarCode_Pack').val();
+ if (event.keyCode == 13) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/GroupOrderBill/GetPackBarCode",
+ type: "GET",
+ data: {
+ "HInterID": HInterID
+ , "HBillNo": HBillNo
+ , "HBillTyp": HBillTyp
+ , "HMaker": HMaker
+ , "HBarCode_Pack": HBarCode_Pack
+ },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var sSubStr = result.data;
+ //var tableStr = table.cache['ztd-table'];
+ //for (var i = 0; i < tableStr.length; i++) {
+ // if (tableStr[i].HBarCode_Pack == sSubStr[0].HBarCode_Pack) {
+ // layer.close(index);
+ // $('#HBarCode_Pack').val("");
+ // layer.msg("璇ヨ绠辩爜宸叉壂鎻忥紝璇峰嬁閲嶅鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ // }
+ //}
+ zxQtyFlag++;
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ var datas = table.cache["ztd-table"];
+ option.data = datas;
+ option.data.push(sSubStr[0]);
+ table.render(option);
+ layer.close(index);
+ $('#HBarCode_Pack').val("");
+ layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //淇濆瓨鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+
+ if (parseInt(zxQty) > zxQtyFlag) {
+ layer.alert("瑁呯鏁伴噺鏈壂瀹岋紝璇锋壂瀹岃绠辨暟閲忥紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ return;
+ }
+
+ //var tableData = data.field;
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/GroupOrderBill/AddBill",
+ //url:"http://localhost:12761/GroupOrderBill/AddBill",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ $('#Saver-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#Print").click();
+ layer.confirm(
+ '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
+ {
+ skin: 'layui-layer-lan',
+ closeBtn: 0,
+ btn: ['鏂板', '鍏抽棴'],
+ btn2: function () {//鏂板
+ parent.layui.admin.events.closeThisTabs();
+ }
+ }, function () {//鍏抽棴
+ window.location.reload();
+ }
+ );
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+
+ });
+
+ //閫�鍑烘寜閽�
+ form.on('submit(Close)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs();
+ });
+ });
+
+ //鏂板鎸夐挳
+ form.on('submit(HAddBT)', function (data) {//閫�鍑�
+ layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+ window.location.reload();
+ });
+ });
+
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print)', function (data) {//閫�鍑�
+ //鎵撳紑鎵撳嵃妯℃澘
+ var linterid = $("#HInterID").val();
+ //var linterid = "28973";dymb
+ var Type = $("#dymb").val();
+ var OpenTmp = $("#dymb").text().trim();
+ //var ReportViewer = document.getElementById("ReportViewer");
+ window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ });
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(ztd-table)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/DelCacheListByBarCode',
+ type: "GET",
+ data: { "BarCode": obj.data.HBarCode_Pack },
+ success: function (data) {
+ if (data.count == 1) {
+ zxQtyFlag--;
+ if (zxQtyFlag == 0) {
+ $("#zxQty").val(zxQty);
+ //绉婚櫎鍙灞炴��
+ $("#zxQty").removeAttr("readonly");//绉婚櫎瀛愪欢鏉＄爜鍙
+ $("#zxQty").css("background-color", "white");
+ $("#zxQty").css("box-shadow", "0 0 0 1px #00ff00");
+ $("#HBarCode_Pack").css("box-shadow", "none");
+ $("#zxQty").focus();
+ } else {
+ $("#zxQty").val("" + zxQtyFlag + "/" + zxQty + "");
+ }
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.msg('鍒犻櫎鎴愬姛');
+ } else {
+ layer.alert(data.code + data.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
+ //setInterval(function () {
+ // if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { parent.location.href = "../user/login.html"; });
+ // }
+ //}, 3600000);
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //function window_onload() {
+ // Report.LoadFromURL("../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+
+ //}
+ //function btnPrint_onclick() {
+ // var linterid = "28973";
+ // //Report.LoadDataFromURL("../../views/Baseset/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + linterid, true, "");
+
+ // Report.Print(true);
+ //}
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillCacheList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillCacheList.html"
new file mode 100644
index 0000000..e30f571
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillCacheList.html"
@@ -0,0 +1,274 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎缁勬墭鍗曠紦瀛樺垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勬墭鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="缁勬墭鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勬墭鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="缁勬墭鍗曞彿" id="缁勬墭鍗曞彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞敮涓�鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞敮涓�鏉＄爜" id="鍖呰鍗曞敮涓�鏉＄爜" style="margin-top: 10px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞彿" id="鍖呰鍗曞彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵爜浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鎵爜浜�" id="鎵爜浜�">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo', sort: true, hide: true
+ //, height: 'full-50'
+ , cellMinWidth: 90
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { field: '缂撳瓨琛↖D', title: '缂撳瓨琛↖D', sort: true }
+ , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', width: 140, sort: true }
+ , { field: '鍖呰鍗曞敮涓�鏉＄爜', title: '鍖呰鍗曞敮涓�鏉＄爜', width: 170, sort: true }
+ , { field: '鍖呰鍗曠被鍨�', title: '鍖呰鍗曠被鍨�', width: 105, sort: true, hide: true }
+ , { field: '鎵爜浜�', title: '鎵爜浜�', sort: true }
+ , {
+ field: '鎵爜鏃堕棿', title: '缁勬墭鏃堕棿', width: 105, sort: true, templet: function (d) {
+ if (d.鎵爜鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鎵爜鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '缁勬墭鍗旾D', title: '缁勬墭鍗旾D', sort: true }
+ , { field: '缁勬墭鍗曞彿', title: '缁勬墭鍗曞彿', width: 155, sort: true }
+ , { field: '缁勬墭鍗曠被鍨�', title: '缁勬墭鍗曠被鍨�', width: 105, sort: true }
+ , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+ ]]
+ };
+
+ option.data = [];
+ table.render(option);
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/DelCacheList',
+ type: "GET",
+ data: { "sHitemID": obj.data.缂撳瓨琛↖D },
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.msg('鍒犻櫎鎴愬姛');
+ } else {
+ layer.alert(data.code + data.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/GroupOrderBill/CacheList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.code == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(result.code + result.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#缁勬墭鏃堕棿").val("");//杩涚珯鏃堕棿
+ $("#鍖呰鍗曞敮涓�鏉＄爜").val("");//鍖呰鍗曞敮涓�鏉＄爜
+ $("#鍖呰鍗曞彿").val("");//鍖呰鍗曞彿
+ $("#缁勬墭鍗曞彿").val("");//缁勬墭鍗曞彿
+ $("#鎵爜浜�").val("");//鎵爜浜�
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var 缁勬墭鏃堕棿 = $("#缁勬墭鏃堕棿").val();//杩涚珯鏃堕棿
+ var 鍖呰鍗曞敮涓�鏉＄爜 = $("#鍖呰鍗曞敮涓�鏉＄爜").val();//鍖呰鍗曞敮涓�鏉＄爜
+ var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();//鍖呰鍗曞彿
+ var 缁勬墭鍗曞彿 = $("#缁勬墭鍗曞彿").val();//缁勬墭鍗曞彿
+ var 鎵爜浜� = $("#鎵爜浜�").val();//鎵爜浜�
+ if (缁勬墭鏃堕棿) {
+ sWhere += " and CONVERT(varchar(100),鎵爜鏃堕棿, 23) = '" + 缁勬墭鏃堕棿 + "'";
+ }
+ if (鍖呰鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 鍖呰鍗曞敮涓�鏉＄爜 like '%" + 鍖呰鍗曞敮涓�鏉＄爜 + "%'";
+ }
+ if (鍖呰鍗曞彿) {
+ sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
+ }
+ if (缁勬墭鍗曞彿) {
+ sWhere += " and 缁勬墭鍗曞彿 like '%" + 缁勬墭鍗曞彿 + "%'";
+ }
+ if (鎵爜浜�) {
+ sWhere += " and 鎵爜浜� like '%" + 鎵爜浜� + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/GroupOrderBill/CacheList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.code == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html"
new file mode 100644
index 0000000..adf87b4
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html"
@@ -0,0 +1,339 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>浜х嚎缁勬墭鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="寮�濮嬫椂闂�" id="寮�濮嬫椂闂�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" name="缁撴潫鏃堕棿" id="缁撴潫鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勬墭鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="缁勬墭鍗曞彿" id="缁勬墭鍗曞彿">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍒跺崟浜�" id="鍒跺崟浜�">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勬墭鍗曞敮涓�鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="缁勬墭鍗曞敮涓�鏉＄爜" id="缁勬墭鍗曞敮涓�鏉＄爜">
+ </div>
+ </div>
+ </div>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞彿" id="鍖呰鍗曞彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞敮涓�鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞敮涓�鏉＄爜" id="鍖呰鍗曞敮涓�鏉＄爜">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="hmodel" id="hmodel">
+ </div>
+ </div>-->
+ </div>
+ </div>
+ </div>
+ <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container layui-form-item">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
+ <i class="layui-icon layui-icon-file"></i>鎵撳嵃
+ </button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-xs" lay-event="edit" style="background-color: black;">榛戞爣</a>
+ </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/webConfig2.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'radio' }
+ , { field: '缁勬墭鍗曠被鍨�', title: '缁勬墭鍗曠被鍨�', sort: true, hide: true }
+ , { field: '缁勬墭鍗曚富ID', title: '缁勬墭鍗曚富ID', sort: true, hide: true }
+ , { field: '缁勬墭鍗曞彿', title: '缁勬墭鍗曞彿', sort: true, width:155 }
+ , { field: '榛戞爣鍙�', title: '榛戞爣鍙�', sort: true }
+ , { field: '鍏ュ簱鎵规', title: '鍏ュ簱鎵规', sort: true }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , {
+ field: '鍒跺崟鏃堕棿', title: '缁勬墭鏃堕棿', sort: true, templet: function (d) {
+ if (d.鍒跺崟鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '缁勬墭鍗曞敮涓�鏉＄爜', title: '缁勬墭鐮�', sort: true }
+ , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', sort: true }
+ , { field: '鍖呰鍗曠被鍨�', title: '鍖呰鍗曠被鍨�', hide: true }
+ , { field: '鍖呰鍗曞敮涓�鏉＄爜', title: '鍖呰鐮�', width: 165 }
+ , { toolbar: '#toolBar', width: 115, fixed: 'right' }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛�'
+ }
+ };
+
+ option.data = [];
+ table.render(option);
+
+
+ //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/GroupOrderBill/List',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#寮�濮嬫椂闂�").val("");
+ $("#缁撴潫鏃堕棿").val("");
+ $("#缁勬墭鍗曞彿").val("");
+ $("#鍒跺崟浜�").val("");
+ $("#缁勬墭鍗曞敮涓�鏉＄爜").val("");
+ $("#鍖呰鍗曞彿").val("");
+ $("#鍖呰鍗曞敮涓�鏉＄爜").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var 寮�濮嬫椂闂� = $("#寮�濮嬫椂闂�").val();
+ var 缁撴潫鏃堕棿 = $("#缁撴潫鏃堕棿").val();
+ var 缁勬墭鍗曞彿 = $("#缁勬墭鍗曞彿").val();
+ var 鍒跺崟浜� = $("#鍒跺崟浜�").val();
+ var 缁勬墭鍗曞敮涓�鏉＄爜 = $("#缁勬墭鍗曞敮涓�鏉＄爜").val();
+ var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
+ var 鍖呰鍗曞敮涓�鏉＄爜 = $("#鍖呰鍗曞敮涓�鏉＄爜").val();
+ if (寮�濮嬫椂闂�) {
+ sWhere += " and 鍒跺崟鏃堕棿 > '" + 寮�濮嬫椂闂� + "'";
+ }
+ if (缁撴潫鏃堕棿) {
+ sWhere += " and 鍒跺崟鏃堕棿 < '" + 缁撴潫鏃堕棿 + "'";
+ }
+ if (缁勬墭鍗曞彿) {
+ sWhere += " and 缁勬墭鍗曞彿 like '%" + 缁勬墭鍗曞彿 + "%'";
+ }
+ if (鍒跺崟浜�) {
+ sWhere += " and 鍒跺崟浜� like '%" + 鍒跺崟浜� + "%'";
+ }
+ if (缁勬墭鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 缁勬墭鍗曞敮涓�鏉＄爜 like '%" + 缁勬墭鍗曞敮涓�鏉＄爜 + "%'";
+ }
+ if (鍖呰鍗曞彿) {
+ sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
+ }
+ if (鍖呰鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 鍖呰鍗曞敮涓�鏉＄爜 like '%" + 鍖呰鍗曞敮涓�鏉＄爜 + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/GroupOrderBill/List',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+ //鑾峰彇閫変腑琛屾暟鎹�
+ table.on('row(mainTable)', function (obj) {
+ //鏍囨敞閫変腑鏍峰紡
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
+ });
+ //鎵撳嵃鎸夐挳
+ form.on('submit(Print)', function (obj) {//閫�鍑�
+ var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
+ var linterid = checkStatus.data[0].缁勬墭鍗曚富ID;
+ //鎵撳紑鎵撳嵃妯℃澘
+ //var linterid = $("#HInterID").val();
+ //var linterid = "28973";
+ var Type = "ZTDPrint";
+ var OpenTmp = "缁勬墭鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
+ //var ReportViewer = document.getElementById("ReportViewer");
+ window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+ });
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/DelListRow',
+ type: "GET",
+ data: { "HInterID": data.缁勬墭鍗曚富ID, "HEntryID": data.缁勬墭鍗曞瓙ID },
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.msg('鍒犻櫎鎴愬姛');
+ } else {
+ layer.alert(data.code + data.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ //prompt灞�
+ layer.prompt({ title: '璇疯緭鍏ラ粦鏍囧彿锛屽苟纭', formType: 0 }, function (text, index) {
+ layer.close(index);
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/editListRowHBarCode_Cus',
+ type: "GET",
+ data: { "HInterID": data.缁勬墭鍗曚富ID, "HBarCode_Cus": text },
+ success: function (data) {
+ if (data.count == 1) {
+ $("#btnSearch").click();
+ layer.msg('淇敼鎴愬姛锛�');
+ } else {
+ layer.alert(data.code + data.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ }
+ });
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ function Print(data) {
+ console.log("data=", data);
+ }
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html"
new file mode 100644
index 0000000..f58d9f1
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_PackUnionBillCacheList.html"
@@ -0,0 +1,270 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>浜х嚎鍖呰鍗曠紦瀛樺垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="鍖呰鏃堕棿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛愪欢鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="瀛愪欢鏉＄爜" id="瀛愪欢鏉＄爜">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞敮涓�鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞敮涓�鏉＄爜" id="鍖呰鍗曞敮涓�鏉＄爜" style="margin-top: 10px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鍖呰鍗曞彿" id="鍖呰鍗曞彿">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵爜浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="鎵爜浜�" id="鎵爜浜�">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">鍒犻櫎</a>
+ </script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','util'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo', sort: true, hide: true
+ //, height: 'full-50'
+ , cellMinWidth: 90
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { field: '缂撳瓨琛↖D', title: '缂撳瓨琛↖D', sort: true }
+ , { field: '鍗曟嵁ID', title: '鍗曟嵁ID', sort: true }
+ , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', sort: true }
+ , { field: '鎵爜浜�', title: '鎵爜浜�', sort: true }
+ , {
+ field: '鎵爜鏃堕棿', title: '鎵爜鏃堕棿', width: 105, sort: true, templet: function (d) {
+ if (d.鎵爜鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鎵爜鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '瀛愪欢鏉＄爜', title: '瀛愪欢鏉＄爜', sort: true }
+ , { field: '鍖呰鍗曞敮涓�鏉＄爜', title: '鍖呰鍗曞敮涓�鏉＄爜', sort: true }
+ , { toolbar: '#toolBar', title: '鎿嶄綔', width: 100, fixed: 'right' }
+ ]]
+ };
+
+ option.data = [];
+ table.render(option);
+
+ //鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
+ table.on('tool(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+ , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+ if (layEvent === 'detail') {
+ layer.msg('鏌ョ湅鎿嶄綔');
+ } else if (layEvent === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/DelCacheList',
+ type: "GET",
+ data: { "sHitemID": obj.data.缂撳瓨琛↖D },
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ obj.del(); //鍒犻櫎瀵瑰簲琛岋紙tr锛夌殑DOM缁撴瀯
+ layer.msg('鍒犻櫎鎴愬姛');
+ } else {
+ layer.alert(data.code + data.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+ });
+ } else if (layEvent === 'edit') {
+ layer.msg('缂栬緫鎿嶄綔');
+ }
+ });
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ layer.load(3);
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/PackUnionCacheList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.code == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(result.code + result.msg, { icon: 5 });
+ }
+ }, error: function () {
+ layer.msg("鎺ュ彛璇锋眰澶辫触!", {
+ icon: 5, btn: ['纭'], time: 100000, offset: 't',
+ skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#鍖呰鏃堕棿").val("");//鍖呰鏃堕棿
+ $("#鍖呰鍗曞敮涓�鏉＄爜").val("");//鍖呰鍗曞敮涓�鏉＄爜
+ $("#鍖呰鍗曞彿").val("");//鍖呰鍗曞彿
+ $("#瀛愪欢鏉＄爜").val("");//瀛愪欢鏉＄爜
+ $("#鎵爜浜�").val("");//鎵爜浜�
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var 鍖呰鏃堕棿 = $("#鍖呰鏃堕棿").val();//杩涚珯鏃堕棿
+ var 鍖呰鍗曞敮涓�鏉＄爜 = $("#鍖呰鍗曞敮涓�鏉＄爜").val();//鍖呰鍗曞敮涓�鏉＄爜
+ var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();//鍖呰鍗曞彿
+ var 瀛愪欢鏉＄爜 = $("#瀛愪欢鏉＄爜").val();//瀛愪欢鏉＄爜
+ var 鎵爜浜� = $("#鎵爜浜�").val();//鎵爜浜�
+ if (鍖呰鏃堕棿) {
+ sWhere += " and CONVERT(varchar(100),鎵爜鏃堕棿, 23) = '" + 鍖呰鏃堕棿 + "'";
+ }
+ if (鍖呰鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 鍖呰鍗曞敮涓�鏉＄爜 like '%" + 鍖呰鍗曞敮涓�鏉＄爜 + "%'";
+ }
+ if (鍖呰鍗曞彿) {
+ sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
+ }
+ if (瀛愪欢鏉＄爜) {
+ sWhere += " and 瀛愪欢鏉＄爜 like '%" + 瀛愪欢鏉＄爜 + "%'";
+ }
+ if (鎵爜浜�) {
+ sWhere += " and 鎵爜浜� like '%" + 鎵爜浜� + "%'";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/PackUnionCacheList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.code == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_ProcessReportList_Last.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_ProcessReportList_Last.html"
new file mode 100644
index 0000000..859dcfb
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_ProcessReportList_Last.html"
@@ -0,0 +1,366 @@
+锘�<!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, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚屾鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HRelationQty" lay-filter="aihao" id="HRelationQty">
+ <option value="1" selected="selected">鍏ㄩ儴</option>
+ <option value="2">宸插悓姝�</option>
+ <option value="3">鏈悓姝�</option>
+ </select>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </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" id="HBillNo">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RK" id="btn-RK"><i class="layui-icon layui-icon-ok-circle"></i>鍏ュ簱</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-InStorage" id="btn-InStorage"><i class="layui-icon layui-icon-ok-circle"></i>姹囨姤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit" id="btn-Exit">閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
+ , { field: '鍚屾鐘舵��', title: '鍚屾鐘舵��'}
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 125 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , {
+ field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160, templet: function (d) {
+ if (d.鍑虹珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd HH:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�', width: 190 }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 125 }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜', width: 125 }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鍑虹珯鏁伴噺' }
+ ]]
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ set_ClearQuery();
+ get_FastQuery();
+ }
+
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍏ュ簱
+ case 'btn-RK': BtnRK();
+ break;
+ //姹囨姤
+ case 'btn-InStorage': GetInStorage();
+ break;
+ //閫�鍑�
+ case 'btn-Exit': get_Exit();
+ break;
+ };
+ });
+
+ //#endregion
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HWorkBillNo").val("");
+ $("#HBillNo").val("");
+ $("#HProcExchBillNo").val("");
+ $("#HRelationQty").val("1")
+ form.render("select");
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HRelationQty = $("#HRelationQty").val();
+ switch (HRelationQty) {
+ case "1":
+ sWhere += "";
+ break;
+ case "2":
+ sWhere += " and 鍚屾鐘舵�� = '宸插悓姝�'";
+ break;
+ case "3":
+ sWhere += " and 鍚屾鐘舵�� = ''";
+ break;
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessMangement/Sc_ProcessReportList_Last',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 0) {
+ option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
+ } else {
+ option.data = data1.data;
+ }
+ table.render(option);
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鍏ュ簱
+ function BtnRK() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "BillNo": BillNo },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹叆搴擄紒');
+ }
+ }
+
+ //姹囨姤
+ function GetInStorage() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ var BillNo = data[0].鍗曟嵁鍙�.toString();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SRM_SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": 100038 },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message);
+ get_FastQuery();
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹眹鎶ワ紒');
+ }
+ }
+
+ //閫�鍑�
+ function get_Exit() {
+ Pub_Close(2);
+ }
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_StationInBillList.html"
new file mode 100644
index 0000000..e660d9d
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_StationInBillList.html"
@@ -0,0 +1,480 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鏍囧噯宸ユ椂鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="HProcExchBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩涚珯鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑虹珯鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><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-delete"></i>鍒犻櫎</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="SetExcel"><i class="layui-icon layui-icon-return"></i>Excel琛ㄦ牸瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = " where 1 = 1 ";
+ var option = [];
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery("","");
+ //#endregion
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板鎸夐挳
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫鎸夐挳
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎鎸夐挳
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //娴忚
+ case 'btn-view': get_ViewReport();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
+
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //鍒嗛厤
+ case 'btn-fp': set_Distribut();
+ break;
+ //鍙戝竷
+ case 'btn-fb': set_Release();
+ break;
+ //浼樺厛绾�
+ case 'btn-yxj': set_Yxj();
+ break;
+ //Excel琛ㄦ牸瀵煎嚭
+ case 'SetExcel': SetExcel();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ var columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '杩涚珯鐢熶骇璁㈠崟鍙�', title: '杩涚珯鐢熶骇璁㈠崟鍙�', width: 160 }
+ , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿', width: 160 }
+ , { field: '杩涘嚭绔欐墍鐢ㄦ椂闂�', title: '杩涘嚭绔欐墍鐢ㄦ椂闂�', width: 160 }
+ , { field: '杩涘嚭绔欐墍鐢ㄦ椂闂�(灏忔椂)', title: '绯荤粺宸ユ椂', width: 100 }
+ , { field: '宸ユ椂', title: '宸ユ椂', width: 160 }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺', width: 160 }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', width: 160 }
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', width: 160 }
+ , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 160 }
+ , { field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 160 }
+ , { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+ ];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , cellMinWidth: 120
+ , totalRow: true
+ , height: 'full-50'
+ , cols: [columns]
+ , limit: 50
+ , limits: [50, 500, 1000, 5000]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Sc_PackUnionBill/GetSc_StationInBillList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ DataList = data1.data;
+ option.data = data1.data;
+ table.render(option);
+ layer.close(wait);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鐢熶骇棰嗘枡鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鐢熶骇鍖呰鍗�/Sc_PackUnionBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ }
+ //缂栬緫鍗曟嵁
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐢熶骇棰嗘枡鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍖呰鍗�/Sc_PackUnionBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ get_FastQuery(table, option);
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_PackUnionBill/set_DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //Excel琛ㄦ牸瀵煎嚭
+ function SetExcel() {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HICMOBillNo = $("#HICMOBillNo").val(); //鍗曟嵁鍙�
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HICMOBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ layer.confirm("纭畾瀵煎嚭鎵�鏈夋暟鎹悧", { title: "瀵煎嚭纭" }, function (index) {
+ window.location.href = GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel?sWhere=" + sWhere;
+ })
+ }
+
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery(table, option);
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_FastQuery(table, option);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+
+ }
+ //蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HICMOBillNo = $("#HICMOBillNo").val(); //鍗曟嵁鍙�
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HICMOBillNo) {
+ sWhere += " and 杩涚珯鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = " where 1 = 1 ";
+ }
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HICMOBillNo").val("");
+ $("#HProcExchBillNo").val("");
+ sWhere = " where 1 = 1 ";
+ get_Display(sWhere);
+ }
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/test.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/test.html"
new file mode 100644
index 0000000..7e32406
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/test.html"
@@ -0,0 +1,155 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鎵撳嵃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script type="text/javascript" language="javascript" src="../LodopFuncs.js"></script>
+ <object id="LODOP_OB"
+ classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0"
+ height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0"
+ height="0"></embed>
+ </object>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <button type="button" lay-submit="" lay-filter="designTemplate" class="layui-btn layui-btn-radius">妯℃澘璁捐<</button>
+ <button type="button" lay-submit="" lay-filter="handlePrint" class="layui-btn layui-btn-radius">妯℃澘鎵撳嵃</button>
+ <button type="button" lay-submit="" onclick="prn_preview()" class="layui-btn layui-btn-radius">鎵撳嵃棰勮<</button>
+ <button type="button" lay-submit="" onclick="prn_print()" class="layui-btn layui-btn-radius">鐩存帴鎵撳嵃</button>
+ <button type="button" lay-submit="" onclick="prn_printA()" class="layui-btn layui-btn-radius">閫夋嫨鎵撳嵃</button>
+ 杩涘叆<a href="javascript:;" onclick="javascript:CreatePrintPage();LODOP.PRINT_DESIGN();">妯℃澘璁捐</a><br><br>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../layuiadmin/Scripts/webConfig2.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cols: [[
+ { field: '鍞竴鏉＄爜', title: '鍞竴鏉＄爜', sort: true, width: 170 }
+ , { field: '鎵爜鏃ユ湡', title: '鎵爜鏃ユ湡', sort: true, width: 200 }
+ , { field: '鏉＄爜', title: '鏉＄爜', sort: true, width: 170 }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 90 }
+ , { field: '鐢熶骇浠诲姟鍗曞崟鍙�', title: '鐢熶骇浠诲姟鍗曞崟鍙�', width: 140 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 100 }
+ , { field: '鎵撳寘鏁伴噺', title: '鎵撳寘鏁伴噺', width: 90 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: '鏁伴噺鍒跺崟浜�', title: '鏁伴噺鍒跺崟浜�', width: 110 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ ]]
+ };
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ layer.load(3);
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL1() + '/LEMS/MES_ProductionLinePackagingList_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+
+ form.on('submit(designTemplate)', function (data) {
+ var head =
+ document.head ||
+ document.getElementsByTagName("head")[0] ||
+ document.documentElement;
+ var oscript = document.createElement("script");
+ oscript.src = "http://localhost:8000/CLodopfuncs.js?priority=1";
+ head.insertBefore(oscript, head.firstChild);
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(handlePrint)', function (data) {//閫夋嫨浠撲綅
+ let LODOP = getCLodop();
+ let _self = this;
+ const tid = LODOP.PRINT_DESIGN();
+ LODOP.On_Return = function (taskID, value) {
+ _self.templateCode = value;
+ };
+ });
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ var LODOP;
+ function prn_preview() {
+ alert("prn_preview");
+ var data = "2020-12-3";
+ CreatOneFormPage(data);
+ LODOP.PREVIEW();
+ }
+
+ function prn_print() {
+ alert("prn_print");
+ CreatOneFormPage();
+ LODOP.PRINT();
+ }
+
+ function prn_printA() {
+ alert("prn_printA");
+ CreatOneFormPage();
+ LODOP.PRINTA();
+ }
+
+ function CreatOneFormPage(data) {
+ alert("CreatOneFormPage");
+ LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
+ LODOP.PRINT_INIT("濂楁墦EMS鐨勬ā鏉�");
+ LODOP.ADD_PRINT_RECT(20, 25, 401, 377, 0, 1);
+ LODOP.ADD_PRINT_LINE(54, 302, 228, 302, 0, 1);
+ LODOP.ADD_PRINT_LINE(21, 115, 396, 116, 0, 1);
+ LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
+ LODOP.ADD_PRINT_TEXT(27, 29, 75, 30, "鐢熶骇鏃ユ湡");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
+ LODOP.ADD_PRINT_TEXT(27, 125, 100, 30, data);
+ }
+
+ function CreatePrintPage() {
+ LODOP.PRINT_INIT("濂楁墦EMS鐨勬ā鏉�");
+ };
+
+ </script>
+
+</body>
+</html>
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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
index 90fffad..fb7f25d 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/Cj_ProcessItemStationPlatform.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/Cj_ProcessItemStationPlatform.html"
@@ -827,8 +827,8 @@
$("#HBardCodeProcExchBillNo").attr("readonly", "readonly");//娴佽浆鍗″彧璇�
$("#HBardCodeProcExchBillNo").css("background-color", "#efefef4d");//娴佽浆鍗＄伆鑹�
- //鍏夋爣璺宠浆鍒伴厤浠舵枃鏈涓�
- $("#HBardCodeMater").focus();
+ //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
+ $("#HBarCodeSN").focus();
$("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
$("#HMaterID").val(data1.data[0]["HMainMaterID"]);
@@ -857,6 +857,8 @@
clearTimerQ();
setIntervalIndex = 0;
}
+ //鍏夋爣璺宠浆鍒伴厤浠舵枃鏈涓�
+ $("#HBardCodeMater").focus();
return layer.msg("閰嶄欢鏁伴噺涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
index 212d4ef..7dcfd91 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMain.html"
@@ -1268,8 +1268,8 @@
, "HBillNo": data[0]["鍗曟嵁鍙�"]
, "HDate": formatDate(data[0]["鏃ユ湡"])
, "HAccDate": formatDate(data[0]["鏀舵鏃ユ湡"])
- , "HCusID": data[0]["HCusID"]
- , "HCusName": data[0]["渚涘簲鍟�"]
+ , "HSupID": data[0]["HSupID"]
+ , "HSupName": data[0]["渚涘簲鍟�"]
, "HCurID": data[0]["HCurID"]
, "HCurName": data[0]["甯佸埆"]
, "HExRate": data[0]["姹囩巼"]
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
index 9caccf5..9113cdf 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\344\273\230\345\215\225/YF_PayMentOtherBillMainList.html"
@@ -131,7 +131,7 @@
var HModName = "YF_PayMentOtherBillMainList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HCusID", "HProjectMoneyID","瀛愯垂鐢ㄩ」鐩甀D"];
+ var titleData = ["hmainid", "HDeptID", "HEmpID", "HCurID", "HSupID", "HProjectMoneyID","瀛愯垂鐢ㄩ」鐩甀D"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2102";
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
index fa5dafe..1cba5bc 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\212\245\344\273\267\345\215\225/Sup_QuotePriceBillEdit.html"
@@ -282,7 +282,7 @@
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
- var OperationType = -1;//鎿嶄綔绫诲瀷
+ var OperationType = 1;//鎿嶄綔绫诲瀷
} else {
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
index 5c98bba..6cc02bd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\347\224\263\350\257\267\345\215\225/Cg_PORequestBill.html"
@@ -64,8 +64,7 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0">
- <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -707,8 +706,8 @@
//return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
+ obj.update({
+ "HMaterID": OptionData.HItemID
,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 21f01d1..3e8fc9a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -430,6 +430,7 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanPayDate").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) { //缂栬緫
//鍔犺浇缂栬緫椤甸潰
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
index b87ae20..ec05869 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
@@ -113,6 +113,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" ><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index a286279..cebcc1e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -1501,7 +1501,7 @@
})
switch (type) {
case '1105':
- return { url: "../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBackBillList.html", name: data[0]["HName"] };
+ return { url: "../../閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html", name: data[0]["HName"] };
break;
}
@@ -1512,7 +1512,7 @@
var HOrgID = $("#HOrgID").val();
var url = "";
if ($("#HSourceBillType").val() == "1105") {
- url = "../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBackBillList.html?openType=2&HOrgID=" + HOrgID;
+ url = "../../閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html?openType=2&HOrgID=" + HOrgID;
} else {
return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index 900931f..e9fd583 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -111,7 +111,7 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -180,7 +180,40 @@
case 'set_ShowBill': set_ShowBill();
break;
//鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
+ case 'set_DeleteBill':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Kf_EntrustInBill/DeleteKf_EntrustInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
--
Gitblit v1.9.1