From b7cef3f12ad94768688f31ffc1d0d02e55b63d1e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 25 八月 2021 20:38:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html | 113 ++-
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html | 585 +++++++++++++++++++----
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 6
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 666 +++++++++++---------------
WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html | 51 +-
WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html | 25
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 30
8 files changed, 880 insertions(+), 600 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index c80ab2a..947d805 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -1337,6 +1337,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
<publishTime>08/25/2021 16:22:12</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
+ <publishTime>08/16/2021 13:31:17</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
<publishTime>08/25/2021 16:22:40</publishTime>
</File>
@@ -1424,6 +1427,9 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
<publishTime>08/25/2021 15:23:16</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
+ <publishTime>08/16/2021 13:31:17</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
<publishTime>08/20/2021 19:30:05</publishTime>
</File>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index fe893d5..f2d0f60 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,10 +1,10 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
index c4b3fef..190089c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
@@ -158,21 +158,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">妯℃不鍏疯鏍�:</label>
+ <label class="layui-form-label" style="width: 75px;">褰撳墠妯℃不鍏疯鏍�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">妯℃不鍏峰瀷鍙�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -188,24 +176,37 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏈浣跨敤瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HNowUseLife" id="HNowUseLife" class="layui-input" onclick="onchange">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">閫�搴撶被鍨�:</label>
+ <label class="layui-form-label" style="width: 75px;">妯″叿鏂拌鏍�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBackFlag" id="HBackFlag" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HBarNewSpec" id="HBarNewSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鏈浣跨敤瀵垮懡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HNowUseLife" id="HNowUseLife" class="layui-input" onclick="onchange">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">鏂板鍛�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HNewLife" id="HNewLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">閫�搴撶被鍨�:</label>
+ <select name="HBackFlag" id="HBackFlag">
+ <option value="姝ｅ父浣跨敤">姝ｅ父浣跨敤</option>
+ <option value="鎶ュ簾鍏ュ簱">鎶ュ簾鍏ュ簱</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-tab-item">
@@ -367,9 +368,9 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBarName": data.HName,
- "HBarSpec": data.HModel2,
- "HBarModel": data.HModel2,
+ "HBarName": data.HMouldTypeName,
+ "HBarSpec": data.HModel,
+ "HBarNewSpec": data.HNewModel,
"HDesignLife": data.HDesignLife,
"HLastUseLife": data.HLastUseLife,
"HLeaveLife": data.HLeaveLife
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index db7bc6f..64041a7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -164,15 +164,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">妯℃不鍏峰瀷鍙�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁捐瀵垮懡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HDesignLife" id="HDesignLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">绱浣跨敤瀵垮懡:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HUseLife" id="HUseLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -345,9 +351,10 @@
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
//"HMouldID": data.HMaterIDField,
- "HBarName": data.HName,
- "HBarSpec": data.HModel2,
- "HBarModel": data.HModel2,
+ "HBarName": data.HMouldTypeName,
+ "HBarSpec": data.HModel,
+ "HDesignLife": data.HDesignLife,
+ "HUseLife": data.HUseLife,
"HLeaveLife": data.HDesignLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index 9d09280..d01b426 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -8,66 +8,63 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <style>
- .main-btn { /*澶撮儴涓绘寜閽�*/
- padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
- height: 30px;
- line-height: 30px;
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style type="text/css">
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
}
-
- .btn-title {
- font-size: 16px;
- }
+ /*end*/
</style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
- <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card" style="padding: 15px;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
- <div style="padding: 10px;">
- <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
- <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
- </button>
+ <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CopyBill" id="set_CopyBill">澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </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>
- <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 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" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" name="HDate" id="HDate" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;">鍐呴儴鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="date" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" style="padding-left: 32px;">
@@ -75,7 +72,7 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠撳簱</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -85,7 +82,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">楠屾敹</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSecManagerName" id="HSecManagerName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -95,7 +92,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">淇濈鍛�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HKeeperName" id="HKeeperName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -107,7 +104,7 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -117,13 +114,13 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="HSourceBillType" id="HSourceBillType" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閫夊崟鍙�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -135,13 +132,13 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎽樿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HExplanation" id="HExplanation" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="HRemark" id="HRemark" style="padding-left: 32px;">
@@ -153,25 +150,25 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
@@ -179,29 +176,50 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-col-xs4 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="" id="" style="background-color:#efefef4d;" readonly>
</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList">
+ </tbody>
+ </table>
</div>
</div>
</div>
@@ -216,6 +234,11 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
</div>
</script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" value="">
</form>
</div>
</div>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index ceed51e..617f250 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -1,17 +1,24 @@
锘�<!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 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>
- <style type="text/css">
- input.layui-input.layui-unselect {
- padding-right: 0;
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style >
+ .layui-form-select .layui-input {
+ padding-right: 15px;
+ cursor: pointer;
}
</style>
</head>
@@ -28,6 +35,35 @@
<span>鏇村</span>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="Status" lay-filter="Status" style="width:190px;">
+ <option value="-1" selected="selected">鍏ㄩ儴</option>
+ <option value="0">鏈鏍�</option>
+ <option value="1">宸插鏍�</option>
+ <option value="2">宸插叧闂�</option>
+ </select>
+ </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>
+ <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" 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>
@@ -39,12 +75,16 @@
<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-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>
+ <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-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-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="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell"><i class="layui-icon layui-icon-slider"></i>淇濆瓨鍒楀</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell"><i class="layui-icon layui-icon-cols"></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>
@@ -53,10 +93,6 @@
</div>
</div>
</div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -75,14 +111,85 @@
//鏌ヨ鏉′欢
var sWhere = "";
- var option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio', fixed: 'left' }
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ 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-Audit': set_CheckBill();
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit': set_AbandonCheck();
+ break;
+ //棰勮鎸夐挳
+ case 'btn-Print': get_PrintReport();
+ break;
+ //淇濆瓨鍒楀鎸夐挳
+ case 'btn-Cell': set_SaveGridColWidth();
+ break;
+ //榛樿鍒楀鎸夐挳
+ case 'btn-RefreshCell': set_DefaultGridColWidth();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+ //#endregion
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ sWhere = "";
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ function set_InitGrid() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
@@ -123,26 +230,82 @@
, { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
, { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 115 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 115, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- ]]
- };
+ ];
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ //, cellMinWidth: 120
+ , totalRow: true
+ , limit: 10
+ , height: 'full-50'
+ , cols: [columns]
+ , limits: [50, 500, 1000, 5000]
+ , done: function (res, curr, count) {
- var index = layer.load(0);
+ }
+ };
+ //璁剧疆鍒楀
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ }
+
+ //#region 鑾峰彇鍒楀
+ function getColumnsWidth() {
+ var result = [];
+ var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ //鑾峰彇鍒楀
+ $.ajax({
+ url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
+ async: false,
+ type: "Get",
+ dataType: "json",
+ data: { "colNum": colNum, "Name": Name },
+ success: function (data1) {
+ if (data1.code == 1) {
+ result = data1.data;
+ }
+ else if (data1.code == -1) {
+
+ }
+ else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
+ }
+ });
+
+ return result;
+ }
+ //#endregion
+
+ //#region 鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ //鍔犺浇缃戞牸
+ var index = layer.load(0);//閬僵
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_MouldOtherInBill/GetMouldOtherInBillList',
type: "GET",
data: { "sWhere": sWhere},
@@ -160,108 +323,322 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var Status = $("select[name='Status']").val();//鐘舵��
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ if (Status) {
+ switch (Status) {
+ case '-1': //鍏ㄩ儴
+ sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ sWhere += " and 鍏抽棴浜�<>''";
+ default:
+
+ }
+ }
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ var index = layer.load(0);
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $('#Status').find("option[value='-1']").attr("selected", true);
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");
+ }
+ //#endregion
+
+ //#region 鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ area: ['100%', '100%'],
+ title: '妯″叿鍏朵粬鍏ュ簱鍗�-鏂板',
+ shift: 0,
+ content: '../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html?OperationType=1&linterid=&HSouceBillType=',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ });
+ }
+ //#endregion
//淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
+ function set_ShowBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '妯″叿鍏朵粬鍏ュ簱鍗�'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['Sc_MouldOtherInBill.html?HInterID=' + data[0].hinterid + '&HType=Modify', 'yes']
- , resize: false
- })
- });
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '妯″叿鍏朵粬鍏ュ簱鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['Sc_MouldOtherInBill.html?HInterID=' + data[0].hinterid + '&HType=Modify', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰
+ location.reload();
+ }
+ , cancel: function () {
+
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
-
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
var ModRightNameDelete = 'Sc_MouldOtherInBill_Delete'
var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
, layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['Yes', 'No'] //鎸夐挳
- , yes: function (index, layero) {
- var checkStatus = table.checkStatus('mainTable');
- var layEvent = checkStatus.event;
- $.ajax({
- //url: GetWEBURL() + '/Gy_EquipMent/Delete_Json',
- url: "http://localhost:12761/Gy_EquipMent/Delete_Json",
- type: "GET",
- //async: true,
- data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- $("#btnSearch").click();
- layer.msg(result.Message, { icon: 1 });
-
- }
- else {
- layer.msg(result.Message, { icon: 5 });
- }
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ 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 });
+ }
+ });
+ })
+ }
+ //#endregion
- layer.close(index); //鍏抽棴寮瑰眰
+ //#region 瀹℃牳
+ function set_CheckBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 0, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+
+ }
+ //#endregion
+
+ //#region 棰勮
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
+ //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //#endregion
+
+
+ //#region 淇濆瓨鍒楀
+ function set_SaveGridColWidth() {
+ var arr = [];
+ // 鍒楁暟
+ var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ for (var i = 0; i <= colNum; i++) {
+ var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+ var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
+ if (colName != "" && colName != null) {
+ arr.push(colWidth == -1 ? 200 : colWidth);
}
- });
- });
-
-
-
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var index = layer.load(0);
+ }
+ arr.unshift(40); //棣栦綅杩藉姞
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/Sc_MouldOtherInBill/GetMouldOtherInBillList',
- type: "GET",
- data: { "sWhere": sWhere},
+ url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+ async: false,
+ type: "POST",
+ dataType: "json",
+ data: { "myMap": JSON.stringify(arr), "Name": Name },
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.alert(data1.Message, { icon: 1 });
} else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.Message, { icon: 5 });
}
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }, error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
}
});
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = "";
-
- });
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
- //鐩戝惉琛屽弻鍑讳簨浠�
- table.on('rowDouble(mainTable)', function (obj) {
- layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- });
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ location.reload();
+ }
+ //#endregion
+ //#region 榛樿鍒楀
+ function set_DefaultGridColWidth() {
+ var arr = [];
+ // 鍒楁暟
+ var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
+ for (var i = 0; i <= colNum; i++) {
+ var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
+ if (colName != "" && colName != null) {
+ arr.push(200); //榛樿瀹藉害200
+ }
+ }
+ arr.unshift(40); //棣栦綅杩藉姞
+ $.ajax({
+ url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
+ async: false,
+ type: "POST",
+ dataType: "json",
+ data: { "myMap": JSON.stringify(arr), "Name": Name },
+ success: function (data1) {
+ if (data1.count == 1) {
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(e.Message, { icon: 5 });
+ }
+ });
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
-
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ //get_FastQuery(table, option);
+ location.reload();
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
-
</script>
-
</body>
</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9ed5acf..923a13c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -217,83 +217,83 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">濮斿鍔犲伐鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">濮斿鍔犲伐鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HSupID" id="HSupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+ </button>
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀛愪欢鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀛愪欢鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀛愪欢浠ｇ爜</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀛愪欢瑙勬牸</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曚綅浠ｇ爜</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HUnitNumber" id="HUnitNumber" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓昏鏉愭枡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMainMaterID" id="HMainMaterID" value="0" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇鏁伴噺</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style=" background-color: #efefef4d; width: 90px; float: left; margin-right: 4px;" readonly>
<input type="text" class="layui-input" name="HprocExQty" id="HprocExQty" style="background-color:#efefef4d; width: 90px;" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽敭鏉愭枡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HKeyMaterID" id="HKeyMaterID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">HICMOEntryID</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">HICMOEntryID</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗＄被鍨�</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTypeName" id="HWorkTypeName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+ </button>
</div>
</div>
</div>
@@ -303,129 +303,129 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧CODE</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧CODE</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HProdMaterCode" id="HProdMaterCode">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閿�鍞鍗曞彿</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閿�鍞鍗曞彿</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HSeOrderBillNo" id="HSeOrderBillNo">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">瀹㈡埛绠�绉�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹㈡埛绠�绉�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCusShortName" id="HCusShortName">
</div>
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 115px;padding: 9px 0px;">瀹㈡埛瑕佹眰鏉愭枡鎴愬垎</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹㈡埛瑕佹眰鏉愭枡鎴愬垎</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCusNeedMaterial" id="HCusNeedMaterial">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">棰勮鍑鸿揣鏃ユ湡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">棰勮鍑鸿揣鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="date" class="layui-input" name="HPlanSendGoodsDate" id="HPlanSendGoodsDate" style="padding-left: 32px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HProdMaterName" id="HProdMaterName">
</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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCusName" id="HCusName">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇澶囨敞</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HWorkRemark" id="HWorkRemark">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">閲嶈鎻愮ず</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閲嶈鎻愮ず</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HImportNote" id="HImportNote">
</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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欑紪鍙稟</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber_A" id="HMaterNumber_A">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸潗鏂欑紪鍙稡</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欑紪鍙稡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber_B" id="HMaterNumber_B">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸潗鏂欑紪鍙稢</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欑紪鍙稢</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber_C" id="HMaterNumber_C">
</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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欑紪鍙稤</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber_D" id="HMaterNumber_D">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇绫诲瀷</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇绫诲瀷</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HProdType" id="HProdType">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸潗鏂欑畝绉�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欑畝绉�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterShortName" id="HMaterShortName">
</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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欏唴鐮丄</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterIDA" id="HMaterIDA">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸潗鏂欏唴鐮丅</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欏唴鐮丅</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterIDB" id="HMaterIDB">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍘熸潗鏂欏唴鐮丆</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欏唴鐮丆</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterIDC" id="HMaterIDC">
</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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍘熸潗鏂欏唴鐮丏</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterIDD" id="HMaterIDD">
</div>
</div>
@@ -436,69 +436,69 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaker" id="HMaker" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HChecker" id="HChecker" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼浜�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾浜�</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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;">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-inline">
<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
@@ -538,6 +538,9 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
+
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -546,12 +549,23 @@
, laydate = layui.laydate
, element = layui.element;
+ //鍒濆琛ㄦ牸鏁版嵁
+ var rowdata = [{
+ "HProcNo": "", "hprocid": "", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
+ "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
+ "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
+ "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
+ "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
+ "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
+ }];
+
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
+ get_LoginIs();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -593,33 +607,122 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
- GetICMOBillValue(linterid)
+ //杩斿洖鐢熶骇浠诲姟鍗曡〃澶翠俊鎭�
+ GetICMOBillValue(linterid);
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
- //RoadBillSub(linterid);
+ //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
}
else if (OperationType == 4) {//娴忚
$("#HItemID").val(linterid);//
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
+ //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //鍒濆琛ㄦ牸鏁版嵁
- var rowdata = [{
- "HProcNo": "", "hprocid": "", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
- "HCenterID": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HSupID": "",
- "渚涘簲鍟�": "", "渚涘簲鍟嗕唬鐮�": "", "isEntrust": "false",
- "HQty": "", "鍔犲伐鍗曚綅": "", "HRemark": "", "琛屽彿": "", "杩涚珯鏁伴噺": "", "鍑虹珯鏁伴噺": "",
- "濮斿宸ュ崟鏁伴噺": "", "涓嶅悎鏍兼暟閲�": "", "瓒呴姣斾緥": "", "鏈�楂樹笂闄�": "", "isEdit": "鍚�", "isEditValue": "false",
- "鑹巼": "", "绱鑹巼": "", "宸ヨ壓鍙傛暟": "", "鍥剧焊缂栧彿": "", "鏈伐搴忕‘璁よ褰�": ""
- }];
+ //#endregion
+
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#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 GetICMOBillValue(hmainid) {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+ type: "GET",
+ data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[result.data.length - 1];
+ $("#HICMOInterID").val(data.hmainid);
+ $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+ $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
+ $("#HICMOEntryID").val(data.HEntryID);
+ $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+ $("#HMaterID").val(data.hmaterid);
+ $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+ $("#HMaterID2").val(data.hmaterid);
+ $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
+ $("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
+ $("#HModel").val(data.瑙勬牸鍨嬪彿);
+ $("#HBatchNo").val(data.鎵瑰彿);
+ $("#HUnitID").val(data.hunitid);
+ $("#HUnitName").val(data.璁￠噺鍗曚綅鍚嶇О);
+ $("#HUnitNumber").val(data.璁￠噺鍗曚綅浠ｇ爜);
+ $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+ $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+ $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+ $("#HWorkShopID").val(data.hdeptid);
+ $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+ $("#HProdMaterCode").val(data.浜у搧CODE);
+ $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+ $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+ $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+ $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+ $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+ $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+ $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+ $("#HImportNote").val(data.閲嶈鎻愮ず);
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+ })
+ //杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
+ GetICMOBillDetail(hmainid);
+ }
+ //#endregion
+
+ //#region 杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
+ function GetICMOBillDetail(hmainid) {
+ $.ajax({
+ url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+ type: "GET",
+ data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+ })
+ }
+ //#endregion
+
+
+ //#endregion
+
+
+
+
var option = {
elem: '#mainTable'
@@ -948,16 +1051,9 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
- layer.msg("鎻愪氦鎴愬姛");
+ layer.msg("鎻愪氦鎴愬姛", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
}
else {
layer.close(index);
@@ -972,56 +1068,35 @@
});
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
- {
- $.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
- type: "GET",
- data: { "HInterID": linterid },
- success: function (d) {
- // console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
- }
- })
- }
//閫夋嫨浜у搧寮圭獥
- form.on('submit(btnSearchMater)', function () {//浜у搧
+ form.on('submit(btnSearchMater)', function () {
layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐗╂枡'
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
- , resize: false
- , cancel: function (index, layero) {
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/PartInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMaterName2").val(checkStatus.data[0].HName);
+ $("#HMaterName2").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber2").val(checkStatus.data[0].HNumber);
+ $("#HMaterHModel2").val(checkStatus.data[0].HModel);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+ , btn2: function (index, layero) { }
})
});
- //閫夋嫨涓嶈壇鍘熷洜
- form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '涓嶈壇鍘熷洜鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
//閫夋嫨鐢熶骇浠诲姟鍗�
form.on('submit(btnSearchICMOBill)', function () {
@@ -1046,76 +1121,8 @@
})
});
- //閫夋嫨璐ｄ换浜�
- form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐ｄ换浜�
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鑱屽憳鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
- //閫夋嫨鐢宠宸ュ簭
- form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '鐢宠宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //閫夋嫨璐ｄ换宸ュ簭
- form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐ｄ换宸ュ簭
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '璐ｄ换宸ュ簭鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- });
-
- //缂栬緫
- form.on('submit(cmdModify)', function () {//缂栬緫
- var sSubStr = table.cache['wl-table'];
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- // }
- });
-
+ //閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
if (OperationType == 1) {
Pub_Close(2);
@@ -1125,77 +1132,7 @@
})
- //杩斿洖鐢熶骇浠诲姟鍗�
- function GetICMOBillValue(hmainid) {
- $.ajax({
- url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
- type: "GET",
- data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) {
- var data = result.data[result.data.length - 1];
- $("#HICMOInterID").val(data.hmainid);
- $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
- $("#textBox2").val(data.鐢熶骇璁㈠崟鍙�);
- $("#HICMOEntryID").val(data.HEntryID);
- $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
- $("#HMaterID").val(data.hmaterid);
- $("#HMaterName").val(data.鐗╂枡鍚嶇О);
- $("#HMaterID2").val(data.hmaterid);
- $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
- $("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
- $("#HModel").val(data.瑙勬牸鍨嬪彿);
- $("#HBatchNo").val(data.鎵瑰彿);
- $("#HUnitID").val(data.hunitid);
- $("#HUnitName").val(data.璁￠噺鍗曚綅鍚嶇О);
- $("#HUnitNumber").val(data.璁￠噺鍗曚綅浠ｇ爜);
- $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
- $("#HQty").val(data.娴佽浆鍗℃暟閲�);
- $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
- $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
- $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
- $("#HWorkShopID").val(data.hdeptid);
- $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
- $("#HProdMaterCode").val(data.浜у搧CODE);
- $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
- $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
- $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
- $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
- $("#HProdMaterName").val(data.浜у搧鍚嶇О);
- $("#HCusName").val(data.瀹㈡埛鍚嶇О);
- $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
- $("#HImportNote").val(data.閲嶈鎻愮ず);
- }
- else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- }
- })
- //txtHBillNo.Text = sBillNo;
- GetICMOBillDetail(hmainid);
- }
- function GetICMOBillDetail(hmainid) {
- $.ajax({
- url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
- type: "GET",
- data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) {
- option.data = result.data;
- table.render(option);
- for (var i = 1; i <= option.data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
- }
- form.render('select');
- }
- else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- }
- })
- }
//琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
form.on('select(isEntrust)', function (data) {
@@ -1211,59 +1148,6 @@
//浠ヤ笂涓簂ayui妯″潡
});
-
- //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
- var subProcName, subProcNumber, subProcID,
- subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
- subSupName, subSupNumber, subSupID,
- HReasonName, ReasonID, EmpName,
- ZRProcName, QRName;
-
-
- function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
- {
- HReasonName = obj[0].HName;
- ReasonID = obj[0].HItemID;
- }
-
- //杩斿洖浜у搧
- function GetHMaterNameValue(obj) {
- $("#HMaterName2").val(obj[0].HName);
- $("#HMaterID2").val(obj[0].HItemID);
- $("#HMaterNumber2").val(obj[0].HNumber);
- $("#HMaterHModel2").val(obj[0].HModel);
- }
- function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
- EmpName = obj[0].HName;
- // $("#HEmpName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
- function GetHProcValue(obj) {
- subProcName = obj[0].宸ュ簭;
- subProcID = obj[0].HItemID;
- subProcNumber = obj[0].HProcNumber;
- }
- function GetHSupValue(obj) {
- subSupName = obj[0].HName;
- subSupID = obj[0].HItemID;
- subSupNumber = obj[0].HNumber;
- }
- function GetWorkCenterValue(obj) {
- subWorkCenterName = obj[0].宸ヤ綔涓績;
- subWorkCenterID = obj[0].HItemID;
- subWorkCenterNumber = obj[0].宸ヤ綔涓績浠ｇ爜;
- }
- function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
- ZRProcName = obj[0].宸ュ簭;
- //$("#HZRProcName").val(obj[0].宸ュ簭);
- //$("#HItemID").val(obj[0].HItemID);
- }
- //HWorker
- function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
- QRName = obj[0].HName;
- //$("#HQRName").val(obj[0].HName);
- //$("#HItemID").val(obj[0].HItemID);
- }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index bd2a121..4c283db 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -585,30 +585,12 @@
var sQty = $("#HQty").val()
var sWHID = $("#HWHID").val()
var sSPID = $("#HSupID").val()
- //var Flag = sessionStorage["SourceFlag"];
+ var sHBillType = $("#HBillType").val()
+ var sSourceBillNo = $("#HSourceBillNo").val()
+ var Flag = sessionStorage["SourceFlag"];
if (sQty == "") {
sQty = 0;
}
- //if ($("#HDeptName").val() == '') {
- // layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- //if ($("#HSecManager").val() == '') {
- // layer.msg("棰嗘枡浜烘病鏈夐�夋嫨!", { icon: 5 });
- // return false;
- //}
- //if ($("#HKeeper").val() == '') {
- // layer.msg("鍙戞枡浜烘病鏈夐�夋嫨!", { icon: 5 });
- // return false;
- //}
- //if ($("#HSupName").val() == '') {
- // layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5 });
- // return false;
- //}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
if (event.keyCode == 13) {
if (sBarCode == '') {
layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -621,9 +603,9 @@
$('#HQty').val("");
}
$.ajax({
- url: GetWEBURL() + "/EntrustOut/get_InfoByBarCode_Source_Entrust_Json",
+ url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sBarCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sQty": sQty, "sWHID": sWHID, "sSPID": sSPID },
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
success:function(result){
if (result.count == 1) {
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
@@ -686,7 +668,7 @@
// , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
, url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
, toolbar: '#toolbarDemo'
- , where: { HBillID: sNewInterID, HBillType: '1211', sWhere: '' }
+ , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
, cols: [[
{ type: 'radio' }
, { field: 'HQty', title: '鏁伴噺', width: 150 }
--
Gitblit v1.9.1