From 21d40b36d600d91e162f25cd970534e5852da75e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 05 八月 2025 09:06:42 +0800
Subject: [PATCH] 1
---
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html | 45 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx | 6
WebTM/views/基础资料/基础资料/Gy_MatePrice.html | 333 +++++++++
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html | 45 +
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html | 44 +
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html | 44 +
WebTM/views/生产管理/添康三周排产/ReportPODemandPlanBillList_S_TK.html | 6
WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html | 377 +++++++----
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html | 47 +
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 8
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 2
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html | 44 +
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html | 48 +
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html | 47 +
WebTM/views/生产管理/凯贝日计划导入/JIT_DayPlanPlatForm_KB.html | 489 +++++++++++++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html | 13
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 2
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html | 44 +
WebTM/layuiadmin/Scripts/webConfig.js | 5
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html | 44 +
WebTM/views/基础资料/基础资料/Gy_MatePriceEdit.html | 43 +
WebTM/WebTM.csproj | 1
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 116 +++
23 files changed, 1,624 insertions(+), 229 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6d67fdf..c49cf7d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -648,6 +648,7 @@
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鍑礉鏃ヨ鍒掑鍏JIT_DayPlanPlatForm_KB.html" />
<Content Include="views\鐢熶骇绠＄悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanForm.html" />
<Content Include="views\鐢熶骇绠＄悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanImport.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\Cg_PODemandPlanConfigBillReportForLack.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f79f9a1..655e741 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,11 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�*/
+ /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
index 62d5d61..ef9acef 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList_PDA.html"
@@ -14,6 +14,7 @@
<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/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,9 @@
</div>
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -287,6 +291,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
index ac17b20..7f59d43 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_PDA.html"
@@ -15,6 +15,7 @@
<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/qrcode/qrcode.min.js"></script>
<style>
.layui-col-xs8 {
width: 55.666667%;
@@ -162,8 +163,13 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1357,7 +1363,7 @@
parent.location.href = "../../WMS鎵爜妯″潡/鍏朵粬鍑哄簱/Kf_OtherOutBillList_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ /*parent.location.href = "../../../views/index_Mobile.html";*/
}
}//鍏抽棴
}
@@ -1532,7 +1538,42 @@
//#endregion
-
+ //#region 浜岀淮鐮佺敓鎴�
+ form.on('submit(generateQRCodeBtn)', function () {
+ showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+ });
+ /**
+ * 鏄剧ず浜岀淮鐮佸脊绐�
+ * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+ * @param {string} title - 寮圭獥鏍囬
+ */
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+ //#endregion
+
//#region 鎵弿婧愬崟鏉＄爜
//鎵弿婧愬崟鏉＄爜
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
index 4ea384e..8bb9d56 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBillList_PDA.html"
@@ -14,6 +14,7 @@
<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/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,9 @@
</div>
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -287,6 +291,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
index 011e097..5b0a6fc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_PDA.html"
@@ -15,6 +15,7 @@
<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/qrcode/qrcode.min.js"></script>
<style>
.layui-col-xs8 {
width: 55.666667%;
@@ -140,8 +141,13 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1132,7 +1138,7 @@
parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBillList_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ /*parent.location.href = "../../../views/index_Mobile.html";*/
}
}//鍏抽棴
}
@@ -1294,6 +1300,41 @@
//#endregion
+ //#region 浜岀淮鐮佺敓鎴�
+ form.on('submit(generateQRCodeBtn)', function () {
+ showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+ });
+ /**
+ * 鏄剧ず浜岀淮鐮佸脊绐�
+ * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+ * @param {string} title - 寮圭獥鏍囬
+ */
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+ //#endregion
//#region 鎵弿婧愬崟鏉＄爜
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
index 7195676..c39edd8 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBillList_PDA.html"
@@ -14,6 +14,7 @@
<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/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,9 @@
</div>
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -286,6 +290,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
index 0b3af9e..18912ed 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_PDA.html"
@@ -15,6 +15,7 @@
<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/qrcode/qrcode.min.js"></script>
<style>
.layui-col-xs8 {
width: 55.666667%;
@@ -152,8 +153,13 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1194,7 +1200,7 @@
parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇琛ユ枡/Kf_MateReplenishOutBillList_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ /*parent.location.href = "../../../views/index_Mobile.html";*/
}
}//鍏抽棴
}
@@ -1369,6 +1375,41 @@
//#endregion
+ //#region 浜岀淮鐮佺敓鎴�
+ form.on('submit(generateQRCodeBtn)', function () {
+ showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+ });
+ /**
+ * 鏄剧ず浜岀淮鐮佸脊绐�
+ * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+ * @param {string} title - 寮圭獥鏍囬
+ */
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+ //#endregion
//#region 鎵弿婧愬崟鏉＄爜
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
index 293d0c1..260b80d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBillList_PDA.html"
@@ -14,6 +14,7 @@
<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/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,9 @@
</div>
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -287,6 +291,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
index 321fd08..3b18a89 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
@@ -15,6 +15,7 @@
<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/qrcode/qrcode.min.js"></script>
<style>
.layui-col-xs8 {
width: 55.666667%;
@@ -199,8 +200,13 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1828,7 +1834,7 @@
parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ /* parent.location.href = "../../../views/index_Mobile.html";*/
}
}//鍏抽棴
}
@@ -2021,7 +2027,42 @@
//#endregion
-
+ //#region 浜岀淮鐮佺敓鎴�
+ form.on('submit(generateQRCodeBtn)', function () {
+ showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+ });
+ /**
+ * 鏄剧ず浜岀淮鐮佸脊绐�
+ * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+ * @param {string} title - 寮圭獥鏍囬
+ */
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+ //#endregion
+
//#region 鎵弿婧愬崟鏉＄爜
//鎵弿婧愬崟鏉＄爜
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
index 400d763..e0fd54a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBillList_PDA.html"
@@ -14,6 +14,7 @@
<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/qrcode/qrcode.min.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -80,6 +81,9 @@
</div>
<div class="layui-col-xs2" style="margin-left:5px">
<button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+ </div>
+ <div class="layui-col-xs2" style="margin-left:5px">
+ <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">浜岀淮鐮�</button>
</div>
</div>
<!--澶辫触鎻愮ず闊�-->
@@ -287,6 +291,46 @@
//#endregion
+ //#region 鏄剧ず浜岀淮鐮�
+
+ form.on('submit(cmdQRCode)', function () {
+ var checkStatus = table.checkStatus('Uploaded-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ showQRCode(data[0].鍗曟嵁鍙�, "鍗曟嵁浜岀淮鐮�");
+ }
+ else {
+ layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+ }
+ });
+
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+
+ //#endregion
//#region 鍒犻櫎鍔熻兘鎺т欢
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
index 023fde9..ccc59df 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_PDA.html"
@@ -15,6 +15,7 @@
<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/qrcode/qrcode.min.js"></script>
<style>
.layui-col-xs8 {
width: 55.666667%;
@@ -155,8 +156,13 @@
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
</div>
- <div class="layui-col-xs9">
+ <div class="layui-col-xs8">
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
</div>
</div>
<div class="layui-row">
@@ -1222,10 +1228,10 @@
parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇棰嗘枡/Kf_MateOutBillList_PDA.html";
}
else {
- parent.location.href = "../../../views/index_Mobile.html";
+ /*parent.location.href = "../../../views/index_Mobile.html";*/
}
}//鍏抽棴
- }
+ }
, function () {
location.replace('Kf_MateOutBill_PDA.html?OperationType=1&HInterID=0');
});//鏂板
@@ -1406,6 +1412,42 @@
//#endregion
+ //#region 浜岀淮鐮佺敓鎴�
+ form.on('submit(generateQRCodeBtn)', function () {
+ showQRCode($("#HBillNo").val(), "鍗曟嵁浜岀淮鐮�");
+ });
+ /**
+ * 鏄剧ず浜岀淮鐮佸脊绐�
+ * @param {string} content - 瑕佺敓鎴愪簩缁寸爜鐨勫唴瀹�
+ * @param {string} title - 寮圭獥鏍囬
+ */
+ function showQRCode(content, title) {
+ // 鏄剧ず寮圭獥
+ layer.open({
+ type: 1,
+ title: title || '浜岀淮鐮�',
+ skin: 'layui-layer-demo', // 鑷畾涔夌毊鑲�
+ area: ['300px', '360px'],
+ closeBtn: 1,
+ shadeClose: true,
+ content: '<div style="text-align:center;padding:45px;">' +
+ '<div id="qrcode" style="margin-left: auto;"></div>' +
+ '<div style="">' + content + '</div></div>',
+ success: function (layero, index) {
+ // 鍦ㄥ脊绐楁垚鍔熸墦寮�鍚庣敓鎴愪簩缁寸爜
+ new QRCode(document.getElementById("qrcode"), {
+ text: content,
+ width: 200,
+ height: 200,
+ colorDark: "#000000",
+ colorLight: "#ffffff",
+ correctLevel: QRCode.CorrectLevel.H
+ });
+ }
+ });
+ }
+ //#endregion
+
//#region 鎵弿婧愬崟鏉＄爜
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
index 1da7e06..d91c6af 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
@@ -219,7 +219,11 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
+ var sWhere_1 = "";
+ var sWhere_2 = "";
var option = [];
+ var option_BadReason = [];
+ var option_LotNoList = [];
var HModName = "Sc_BarCodeReport";
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
@@ -252,11 +256,8 @@
});
//鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
-
+ form.on('submit(btnSearch)', function (data) {
get_FastQuery();
-
-
});
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -279,8 +280,9 @@
initSelects();
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
+
get_FastQuery();
- set_Graphics();
+ // set_Graphics();
}
//鍒濆鍖栬〃鏍�
@@ -376,17 +378,11 @@
}
})
}
- //#endregion
- //鍔犺浇缃戞牸
- function get_Display(sWhere) {
- if ($("#Station").val() != null && $("#Station").val() != 0) {
- sWhere = sWhere;
- }
- else
- sWhere = "";
- var wait = layer.load();//閬僵
+ //#endregion
+ function get_BadReasonCount(sWhere) {
+
$.ajax({
- url: GetWEBURL() + '/Gy_BarCodeReportController/list',
+ url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_proc',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -394,6 +390,72 @@
var col = [];
if (data1.count == 1) {
var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.data[1].list) {
+ data.push({ "name": data1.data[1].list[key].ColmCols, "Type": data1.data[1].list[key].ColmType });
+ }
+ /* option_BadReason.cols = [col];*/
+ option_BadReason.data = data1.data[1];
+
+ /*ins = table.render(option_BadReason);*/
+
+ } else {
+
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ function get_LotNoCount(sWhere) {
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReasonTotal_proc',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ /* option_BadReason.cols = [col];*/
+ option_LotNoList.data = data1.data;
+
+ /*ins = table.render(option_BadReason);*/
+
+ } else {
+
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_proc',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ var col = [];
+ if (data1.count == 1) {
+ var data = [];
+ data_1 = data1.data[0];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -417,7 +479,7 @@
}
option.cols = [col];
- option.data = data1.data;
+ option.data = data_1;
ins = table.render(option);
layer.close(wait);
@@ -433,23 +495,12 @@
}
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#Station").val("");
- $("#MaterialNo").val("");
+ $("#Station").val("0");
+ $("#MaterialNo").val("0");
+ $("#LotNo").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- $("#ColContent1").val("");
- $("#ColName1").val("0");
- $("#Comparator1").val("0");
- $("#ColContent2").val("");
- $("#ColName2").val("0");
- $("#Comparator2").val("0");
form.render('select');
-
- sWhere = "";
get_FastQuery();
}
//#endregion
@@ -459,96 +510,29 @@
var HEndDate = $("#HEndDate").val();//鎴鏃ユ湡
var Station = $("#Station").val();//绔欏彴鍙�
var MaterialNo = $("#MaterialNo").val();//鏂欏彿
- //var LotNo = $("#LotNo").val();//鎵规鍙�
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").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;
+ var LotNo = $("#LotNo").val();//鎵规鍙�
+ sWhere_1 = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , Station: Station
+ , MaterialNo: MaterialNo
+ , LotNo: LotNo
}
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
+ sWhere_2 = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , MaterialNo: MaterialNo
+ , LotNo: LotNo
}
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
- if (Station) {
- sWhere += " and a.HCheckProc like '%" + Station + "%'";
- }
- if (MaterialNo) {
- sWhere += " and b.HLayOutName like '%" + MaterialNo + "%'";
- }
- //if (LotNo) {
- // sWhere += " and 鎵规鍙� like '%" + LotNo + "%'";
- //}
- //if (HBeginDate != "" && HEndDate != "") {
- // sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
- //}
-
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere_1));
+ get_BadReasonCount(JSON.stringify(sWhere_1));
+ get_LotNoCount(JSON.stringify(sWhere_2));
+
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
+ sWhere_1 = "";
+ sWhere_2 = "";
+ set_Graphics();
}
//闅愯棌鍒楄缃�
function get_HideColumn() {
@@ -654,24 +638,39 @@
}
//#region 銆愬浘褰€��
function set_Graphics() {
+
+
//#region 銆愰ゼ鍥俱��
var chartDom = document.getElementById('PieChart');
var myChart = echarts.init(chartDom);
var option_BT;
- var HQty2 = option.data.length > 5 ? 5 : option.data.length;//楗肩姸鍥炬牴鎹悎璁￠檷搴忔帓搴忔樉绀哄墠n鏉℃暟鎹�
- var BadReasonCount = 0;
- for (let i = 0; i < HQty2; i++) {
- if (option.data[i][3] != null)
- BadReasonCount++;
- }
+ //浠呭鏈笟鍔℃彁渚涚殑绠楁硶
+ // 浣跨敤瀵硅薄杩涜鍒嗙粍缁熻
+ var reasonMap = {};
+
+ // 閬嶅巻鏁版嵁锛屾寜涓嶈壇鍘熷洜鍒嗙粍姹傚拰
+ option_BadReason.data.forEach(item => {
+ var reason = item.涓嶈壇鍘熷洜;
+ if (!reasonMap[reason]) {
+ reasonMap[reason] = 0;
+ }
+ reasonMap[reason] += item.涓嶈壇鍘熷洜鏁伴噺;
+ });
+
+ // 杞崲涓洪ゼ鍥鹃渶瑕佺殑鏍煎紡
var option_BT_XData = [];
- for (let i = 0; i < HQty2; i++) {
- option_BT_XData.push({ value: BadReasonCount, name: option.data[i].妫�楠屽伐搴� });
- }
+ Object.keys(reasonMap).forEach(reason => {
+ option_BT_XData.push({
+ value: reasonMap[reason],
+ name: reason
+ });
+ });
+
+
//$("#MaterialNo").val()
option_BT = {
title: {
- text: '鏂欏彿'+ '涓嬬殑' + '涓嶈壇鍘熷洜鍒嗗竷鍥�',
+ text: '涓嶈壇鍘熷洜鍒嗗竷鍥�',
left: 'center'
},
tooltip: {
@@ -699,7 +698,9 @@
option_BT && myChart.setOption(option_BT);
//#endregion
+
+ //鏌辩姸鍥剧粦瀹氭暟鎹�
//#region 銆愭煴鐘跺浘銆�
var app = {};
var chartDom = document.getElementById('histogram');
@@ -790,29 +791,61 @@
//#endregion
//鏌辩姸鍥剧粦瀹氭暟鎹�
- var stations = [];//妯酱lotNO
- var qualifiedRate = [];//绾佃酱鍚堟牸鐜�
- var PNLCount = [];
- var PNLPara = [];
- var HQty1 = option.data.length > 5 ? 5 : option.data.length;//鏌辩姸鍥炬牴鎹悎璁￠檷搴忔帓搴忔樉绀哄墠n鏉℃暟鎹�
- for (let i = 0; i < HQty1; i++) {
- PNLPara[i] = option.data[i].PNL鏉＄爜缂栧彿;
- for (let j = 0; j < HQty1; j++) {
-
- if (PNLPara[i] == option.data[j].PNL鏉＄爜缂栧彿) {
- PNLCount[i]++;
- }
-
+ var HXTitle = [];//X杞存爣棰樺悕绉�
+ var HSourceIssueCount = [];
+ var HSourceIssueCount1 = [];
+ var HSourceIssueCount2 = [];
+ var ZZTColor = [];
+ //姣忎釜鎵规鐨凱CS鎬绘暟count_option_LotNoList
+ var count_option_LotNoList = 0;
+ var AllCount = 0;
+ var BadReasonCount=0 ;
+
+
+ var ZZTColor2 = ['#00FFFF', '#FC2C83', '#FCED2C', '#93FC2C', '#FC2CF0', '#FC892C', '#2C81FC', '#2CC9FC', '#2CFCA7', '#DED3F2', '#F2D8D3', '#F2D3E0', '#D8E052', '#7EE052', '#52E0D8', '#5F52E0', '#E06F52', '#52E09B', '#E052DE', '#E05F52', '#52B2E0', '#E0C452', '#52CEE0', '#648690', '#E5D1D6', '#D8E5D1', '#E5D1E5', '#D8E5D1', '#7C6262', '#76627C', '#81A583', '#81A595'];
+ //缁熻涓嶅悓鎵规鍙蜂笅鐨勬�绘暟鐩�
+ for (let i = 0; i < option_LotNoList.data.length; i++) {
+ //缁熻璇ユ壒娆′笅鐨凱NL鍙峰拰鎬绘暟
+ AllCount++;
+ count_option_LotNoList += option_LotNoList.data[i].鎬昏;
+ }
+ for (let i = 0; i < option_BadReason.data.length; i++) {
+ BadReasonCount += option_BadReason.data[i].涓嶈壇鍘熷洜鏁伴噺;
}
- }
- for (let i = 0; i < HQty1; i++) {
+ for (let i = 0; i < option_LotNoList.data.length; i++) {
+ HXTitle.push(option_LotNoList.data[i].HBatchNo);
+
+ HSourceIssueCount.push(BadReasonCount);
+ HSourceIssueCount1.push(count_option_LotNoList);
+ HSourceIssueCount2.push(((BadReasonCount) / (AllCount * count_option_LotNoList))*100+'%');
+ ZZTColor.push({
+ x: 1,
+ y: 0,
+ x2: 0,
+ y2: 0,
+ type: "linear",
+ colorStops: [
+ { offset: 0, color: "red" },
+ { offset: 1, color: "blue" },
+ { offset: 2, color: "green" }
+ ]
+ });
+
- stations.push(option.data[i].妫�楠屽伐搴�);
- //姝ゅ3鏆傛椂浠ｈ〃psc鏁伴噺锛�1鏆傛椂浠ｈ〃涓嶈壇psc鏁伴噺
- qualifiedRate.push((PNLCount[i] * 3 - 1) / (PNLCount[i] * 3));
+
}
option_ZZT = {
+ title: {
+ text: '鎵规鍙�',
+ left: 'left',
+ textStyle: {
+ color: 'black',
+ fontSize: 18,
+ fontWeight: 'normal'
+ },
+ padding: [5, 0, 0, 65]
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -820,9 +853,7 @@
}
},
legend: {
-
- data: PNLPara
-
+ data: ['涓嶈壇鏁扮洰', '鎬绘暟','涓嶈壇鐜�']
},
toolbox: {
show: true,
@@ -841,7 +872,7 @@
{
type: 'category',
axisTick: { show: true },
- data: stations
+ data: HXTitle
}
],
yAxis: [
@@ -851,6 +882,43 @@
],
series: [
{
+ name: '涓嶈壇鏁扮洰',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSourceIssueCount,
+ itemStyle: {
+ color: function (params) {
+ // 鍔ㄦ�佺敓鎴愭笎鍙樿壊鎴栬�呮牴鎹潯浠惰繑鍥為璁剧殑娓愬彉鑹�
+ const gradientColors = ZZTColor2;
+
+ return gradientColors[params.dataIndex];
+ }
+ }
+
+ },
+ {
+ name: '鎬绘暟',
+ type: 'bar',
+ barGap: 0,
+ label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: HSourceIssueCount1,
+ itemStyle: {
+ color: function (params) {
+ // 鍔ㄦ�佺敓鎴愭笎鍙樿壊鎴栬�呮牴鎹潯浠惰繑鍥為璁剧殑娓愬彉鑹�
+ const gradientColors = ZZTColor2;
+
+ return gradientColors[params.dataIndex];
+ }
+ }
+ },
+ {
name: '涓嶈壇鐜�',
type: 'bar',
barGap: 0,
@@ -858,8 +926,17 @@
emphasis: {
focus: 'series'
},
- data: qualifiedRate
- },
+ data: HSourceIssueCount2,
+ itemStyle: {
+ color: function (params) {
+ // 鍔ㄦ�佺敓鎴愭笎鍙樿壊鎴栬�呮牴鎹潯浠惰繑鍥為璁剧殑娓愬彉鑹�
+ const gradientColors = ZZTColor2;
+
+ return gradientColors[params.dataIndex];
+ }
+ }
+ }
+
]
};
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index aba8e99..db023bf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -610,9 +610,9 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
, { field: 'HCenterID', title: 'HCenterID', width: 100, hide: true }
- , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О', width: 100, edit: 'text' }
+ , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О', width: 400, edit: 'text' }
, { field: 'HSourceID', title: 'HSourceID', width: 100, hide: true }
- , { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О', event: "HSourceNameSelect", width: 100, edit: 'text' }
+ , { field: 'HSourceName', title: '鐢熶骇璧勬簮鍚嶇О', event: "HSourceNameSelect", width: 400, edit: 'text' }
, { title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
]]
}
@@ -829,8 +829,8 @@
//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.length === 1) {
- let data = checkStatus[0]
+ if (checkStatus.data.length === 1) {
+ let data = checkStatus.data[0]
obj.update({
HSourceID: data["HItemID"],
HSourceName: data["鐢熶骇璧勬簮鍚嶇О"]
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index ab3bce2..5db9888 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,11 @@
//OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
- SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.閿�鍞鍗曞彿,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰,a.杈呮暟閲�2,a.HAuxUnit2,a.杈呭姪鍗曚綅2,b.鍑虹珯鍏宠仈鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","select 1");
+
+ //20250731璋冩暣锛屾煡璇㈡墦鍗版暟鎹椂锛屾洿鏂版墦鍗版棩鏈熷埌娴佽浆鍗′富琛�
+ SqlXMLReportData.GenEntireData(this, "select cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.閿�鍞鍗曞彿,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰,a.杈呮暟閲�2,a.HAuxUnit2,a.杈呭姪鍗曚綅2,b.鍑虹珯鍏宠仈鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","update Sc_ProcessExchangeBillMain set HPrintDate = getdate() where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");
+
+
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
index e7bf0f5..b91d691 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePrice.html"
@@ -140,6 +140,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
+ </div>
</form>
</div>
</div>
@@ -170,7 +171,7 @@
var sWhere = "";
var option = [];
var Organization = sessionStorage["Organization"];
- var HModName = "Gy_MatePrice";
+ var HModName = "Gy_MaterPrice";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID", "HMaterID", "HUnitID", "HRelationID"];
@@ -238,10 +239,6 @@
case 'btn-Close':
parent.layui.admin.events.closeThisTabs();
break;
- //鍒楄缃�
- case 'set_HideColumn':
- get_HideColumn();
- break;
};
});
//#endregion
@@ -277,8 +274,8 @@
DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
//鏌ヨ
get_FastQuery();
- //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- //get_DefaultModule(get_FastQuery);
+ get_DefaultModule(get_FastQuery);
+
}
//#endregion
@@ -303,6 +300,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
form.render('select');
sWhere = "";
}
@@ -331,28 +334,58 @@
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 });
+ if (data[i].name === "鏄惁绂佺敤") {
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: 'center',
+ templet: function (d) {
+ return d.鏄惁绂佺敤 === 1 ? 'Y' : '';
+ }
+ });
+ }
+ 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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
}
}
}
-
- option.cols = [col];
- option.data = data1.data;
-
- //鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
- table.render(option)
- layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
}
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+ ins = table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ get_DefaultModule();//鍔犺浇鏂规
+ }
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -368,7 +401,7 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
+ var HName = $("#HName").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -621,9 +654,9 @@
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
+ //// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
+ ////鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
$("#btnSearch").trigger('click');
@@ -675,6 +708,250 @@
form.render('select');
}
//#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鏌ヨ
+ get_FastQuery();
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
});
//#endregion
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html"
index 8be2e0f..860c1d1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceEdit.html"
@@ -112,7 +112,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <label class="layui-form-label">浠撳簱浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block">
<input type="text" readonly name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float: left; width: 135px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -132,8 +132,8 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" disabled
- lay-skin="primary" lay-filter="HStopflag" value="0" title="鏄惁绂佺敤">
+ <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+ <input type="hidden" value="false" name="HStopflag" id="HStopflag">
<!--<input type="hidden" value="false" name="HStopflag" id="HStopflag">-->
</div>
</div>
@@ -305,11 +305,7 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //淇濆瓨鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- set_AddNew(data);
- });
-
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -434,7 +430,9 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
});
//#endregion
@@ -451,7 +449,7 @@
Organ1();
}
//鏄惁绂佺敤鎸夐挳
- form.on('checkbox(HStopflag)', function (data) {
+ form.on('checkbox(checkboxHStopflag)', function (data) {
$("#HStopflag").val(data.elem.checked);
});
//淇濆瓨HMaker
@@ -511,8 +509,11 @@
success: function (d) {
var IsHStopflag = d.data[0].鏄惁绂佺敤;
//绂佺敤鏍囪
- if (IsHStopflag=== 1) {
- $("#HStopflag").attr("checked", true);
+ //if (IsHStopflag=== 1) {
+ // $("#HStopflag").attr("checked", true);
+ //}
+ if (IsHStopflag) {
+ $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
//涓昏〃
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -655,6 +656,24 @@
return vars;
}
+
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(data) {
+ //#region 琛ㄥご鏁版嵁妫�楠�
+
+ if ($("#HWHID").val() == '0') {
+ layer.msg("浠撳簱涓嶈兘涓虹┖!");
+ return false;
+ }
+
+
+ //#endregion
+
+ return true;
+ }
+ //#endregion
+
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\207\257\350\264\235\346\227\245\350\256\241\345\210\222\345\257\274\345\205\245/JIT_DayPlanPlatForm_KB.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\207\257\350\264\235\346\227\245\350\256\241\345\210\222\345\257\274\345\205\245/JIT_DayPlanPlatForm_KB.html"
new file mode 100644
index 0000000..4938bd6
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\207\257\350\264\235\346\227\245\350\256\241\345\210\222\345\257\274\345\205\245/JIT_DayPlanPlatForm_KB.html"
@@ -0,0 +1,489 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇鏃ヨ鍒掑鍏�</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">瀵煎叆鏁版嵁</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">鏂囦欢涓婁紶</button>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <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-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" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟绫诲瀷</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
+ <option value="鐢熶骇璁㈠崟">鐢熶骇璁㈠崟</option>
+ <option value="濮斿璁㈠崟">濮斿璁㈠崟</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
+ </div>
+ </div>
+ </div>
+ </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_BatchFill"><i class="layui-icon layui-icon-file-b"></i>鎵归噺濉厖</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+
+ //#region 鍏叡鍙橀噺
+
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , excel = layui.excel
+ , upload = layui.upload
+ , element = layui.element;
+
+ var option = [];
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj);//琛屽唴蹇嵎閿瓫閫�
+ });
+
+ //鏂囦欢涓婁紶
+ upload.render({
+ elem: '#UpLoad',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_KB',
+ contentType: 'application/json',
+ exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (data) {
+ layer.load();
+ },
+ done: function (data1) {
+ layer.closeAll('loading');
+ if (data1.count == 1) {
+ var HVersion_Import_Temp = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
+ for (var i = 0; i < data1.data.length; i++) {
+ data1.data[i].HVersion_Import = HVersion_Import_Temp;
+ }
+
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ debugger
+ layer.closeAll('loading');
+ layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
+ }
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ if (OperationType == 1) {
+ Pub_Close(1);
+ }
+ else {
+ Pub_Close(2);
+ }
+ })
+
+ //瀵煎叆 淇濆瓨鏁版嵁
+ form.on('submit(btnSave)', function (data) {
+ if (table.cache["mainTable"] != null) {
+ set_AddNew(data);
+ }
+ else {
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
+ }
+ })
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨椂闂�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ }
+
+ //#endregion
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ var myDate = new Date();
+ var yyyy = myDate.getFullYear();
+ var MM = myDate.getMonth() + 1;
+ var dd = myDate.getDate();
+ var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var columns = [];
+ var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+
+ columns.push({ type: 'checkbox', fixed: 'left' });
+ columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 200 });
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�*', title: '鐢熶骇璁㈠崟鍙�', width: 150 });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿*', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 200 });
+ columns.push({ field: '缁勭粐缂栫爜*', title: '缁勭粐缂栫爜', width: 150 });
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: '鐢熶骇杞﹂棿缂栫爜*', title: '鐢熶骇杞﹂棿', width: 150 });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+ columns.push({ field: '鐢熶骇璧勬簮缂栫爜*', title: '鐢熶骇璧勬簮', edit: 'text', event: "HSourceID" });
+ columns.push({ field: '浜ц兘', title: '浜ц兘', edit: 'text' });
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�' });
+ columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
+ columns.push({ field: '鍛樺伐', title: '鍛樺伐', width: 150 });
+ columns.push({ field: '鍛樺伐缂栫爜', title: '鍛樺伐缂栫爜', width: 150 });
+ columns.push({ field: 'HMaterID', title: '鐗╂枡ID', hide: true });
+ columns.push({ field: '鐗╂枡缂栫爜*', title: '鐗╂枡缂栫爜', width: 150 });
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 });
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+ columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150 });
+ columns.push({ field: '鎵规鍙�', title: '鎵规', width: 150 });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 200 });
+ columns.push({ field: '鐢熶骇璁㈠崟鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 200 });
+ columns.push({ field: '鎬婚綈濂楁暟閲�', title: '鎬婚綈濂楁暟閲�', width: 200 });
+ columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true });
+ columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: 'HVersion_Import', title: '瀵煎叆搴忓垪鍙�' });
+
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ var Days = 7;
+ for (var j = 0; j <= (Days - k); j++) {
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
+ }
+
+ columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-190'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , loading: false
+ , cols: [columns]
+ };
+
+ //娓叉煋椤甸潰
+ table.render(option);
+ }
+
+ //瀵煎叆(淇濆瓨)
+ function set_AddNew(data) {
+ var msgError = "";
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+
+ if (table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || table.cache["mainTable"][i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ table.cache["mainTable"][i].鐗╂枡鍚嶇О = table.cache["mainTable"][i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || table.cache["mainTable"][i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ table.cache["mainTable"][i].瑙勬牸鍨嬪彿 = table.cache["mainTable"][i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+
+ num.push(table.cache["mainTable"][i])
+ }
+ }
+
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i].鐗╂枡鍚嶇О.indexOf("\"") != -1 || option.data[i].鐗╂枡鍚嶇О.indexOf(";") != -1) {
+ option.data[i].鐗╂枡鍚嶇О = option.data[i].鐗╂枡鍚嶇О.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ if (option.data[i].瑙勬牸鍨嬪彿.indexOf("\"") != -1 || option.data[i].瑙勬牸鍨嬪彿.indexOf(";") != -1) {
+ option.data[i].瑙勬牸鍨嬪彿 = option.data[i].瑙勬牸鍨嬪彿.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+ }
+ }
+
+ //鍒ゆ柇鏄惁鏈夊鍏ユ潈闄愶紝濡傛灉鏈夊垯灏嗘�昏杞﹂棿涔嬪墠鐨勬棩璁″垝宸ュ崟浣滃簾
+ if (!set_ModCheck("Sc_WorkBillSortBill_Edit")) {
+ layer.msg("瀵煎叆澶辫触锛佹棤瀵煎叆鏉冮檺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ } else {
+ if (!setWorkBillSortBillForDelete()) {
+ layer.msg("瀵煎叆澶辫触锛佸線鏈熸棩璁″垝浣滃簾澶辫触锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+
+
+ var HDataSub = [];
+
+ //JIT瀵煎叆璁″垝锛屾瘡娆″鍏�100琛屾暟鎹�,鍙慨鏀筰鐨勮嚜澧炲�煎喅瀹氭瘡娆″惊鐜鍏ョ殑琛屾暟
+ for (var i = 0; i < option.data.length; i += 100) {
+ HDataSub = option.data.slice(i, i + 100)
+
+ data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(HDataSub);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var index = layer.load();
+
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_KB",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ /* layer.msg("鎻愪氦鎴愬姛");*/
+ }
+ else {
+ layer.close(index);
+ msgError += data.Message + "锛�";
+ //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ msgError += err + "锛�";
+ //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
+ if (msgError.length == 0) {
+ layer.msg("鎻愪氦鎴愬姛");
+ } else {
+ layer.msg(msgError, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }
+
+ //琛屽唴鍒犻櫎
+ function set_GridDelete(obj) {
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ obj.del();
+ table.cache["mainTable"].splice(rowIndex, 1); //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ });
+ }
+ }
+
+ //琛屽唴鍒犻櫎蹇嵎閿�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮缂栫爜*": checkStatus.data[0].鐢熶骇璧勬簮浠ｇ爜
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ 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;
+ }
+
+ //#region 鏉冮檺鍒ゅ畾
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ //layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ //#endregion
+
+ //#region 浣滃簾瀵瑰簲鐢熶骇杞﹂棿鐨勬棩璁″垝宸ュ崟
+ function setWorkBillSortBillForDelete() {
+ //鎷兼帴鐢熶骇杞﹂棿鐨処D
+ var HWorkShopIDArrayList = [];
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["鍗曟嵁鍙�"] = "";
+ option.data[i]["hmainid"] = "";
+
+
+ if ($.inArray(option.data[i]["HWorkShopID"], HWorkShopIDArrayList) == -1) {
+ HWorkShopIDArrayList.push(option.data[i]["HWorkShopID"]);
+ }
+ }
+ var HWorkShopIDListStr = "";
+ for (var i = 0; i < HWorkShopIDArrayList.length; i++) {
+ if (i == HWorkShopIDArrayList.length - 1) {
+ HWorkShopIDListStr = HWorkShopIDArrayList[i];
+ } else {
+ HWorkShopIDListStr = HWorkShopIDArrayList[i] + ",";
+ }
+ }
+
+ //浣滃簾瀵瑰簲鐢熶骇杞﹂棿ID鐨勬棩璁″垝宸ュ崟
+ var resultBool = false;
+ var sql = "";
+ if (HWorkShopIDListStr != "") {
+ sql = "update Sc_WorkBillSortBillMain set HDeleteMan = '" + sessionStorage["HUserName"] + "',HDeleteDate = getdate(),HBillStatus = 4 where HWorkShopID in (" + HWorkShopIDListStr + ")";
+ } else {
+ return resultBool;
+ }
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/commonMethod',
+ type: "GET",
+ async: false,
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ resultBool = true;
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ return resultBool;
+ }
+ //#endregion
+
+ //#endregion
+
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 3330b36..a695379 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -251,7 +251,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
</div>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index 3bedde3..5c552e6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -28,6 +28,7 @@
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO_Batch" id="btnAddICMO_Batch">娣诲姞鎶ょ悊搴�-妞呮灦璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>
@@ -69,8 +70,17 @@
</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: 85px;">
+ <select name="HMergeDept" id="HMergeDept" lay-verify="HMergeDept">
+ <option value="鍚�" selected="selected">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鎺掍骇澶╂暟</label>
- <div class="layui-input-block">
+ <div class="layui-input-block" style="width: 120px;">
<select name="HArrangeProductDayQty" id="HArrangeProductDayQty" class="ForFilteringSchemes" lay-filter="HArrangeProductDayQty" style="width:190px;">
</select>
</div>
@@ -632,6 +642,16 @@
get_btnAddICMO();
})
+ //娣诲姞鎶ょ悊搴�-妞呮灦鐢熶骇璁㈠崟
+ form.on('submit(btnAddICMO_Batch)', function (data) {
+ if ($("#HMergeDept").val() == "鏄�") {
+ get_btnAddICMO_Batch();
+ } else {
+ layer.alert("褰撳墠涓嶄负澶氳溅闂存帓浜фā寮�");
+ }
+
+ })
+
//缁勮鎺掍骇
form.on('submit(btnProZZPC)', function (data) {
var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
@@ -793,11 +813,9 @@
columns.push({ type: 'checkbox', fixed: 'left', sort: true });
columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿', sort: true });
- columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true, filter: true });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, sort: true, filter: true });//0
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true, filter: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true, filter: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true, filter: true });
@@ -808,8 +826,11 @@
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
- columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, hide: true });
- columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '瑕佽揣鏃ユ湡', title: '瑕佽揣鏃ユ湡', width: 150, templet: "<div>{{d.瑕佽揣鏃ユ湡 ==null ?'':layui.util.toDateString(d.瑕佽揣鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '寮�宸ユ棩鏈�', title: '寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '瀹屽伐鏃ユ湡', title: '瀹屽伐鏃ユ湡', width: 150, templet: "<div>{{d.瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
+
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true, hide: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true, hide: true });
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true, hide: true });
@@ -820,6 +841,9 @@
columns.push(dateColumns[i]);//0
}
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150, sort: true });
@@ -830,7 +854,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
+
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150, sort: true });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150, sort: true });
columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150, sort: true });
@@ -859,6 +883,7 @@
columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
columns.push({ field: '鎵�闇�宸ヤ綅鏁�', title: '鎵�闇�宸ヤ綅鏁�', width: 150 });
+ columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, hide: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
@@ -933,6 +958,11 @@
if (number == 1) {
HProdORGID = sessionStorage["OrganizationID"];//鐢熶骇璁㈠崟缁勭粐
}
+
+ if (HWorkShopID == 102357 && $("#HMergeDept").val() == "鏄�" ) {
+ HWorkShopID = "102357,102359";
+ }
+
var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
@@ -1113,6 +1143,52 @@
}
//#endregion
+
+ //#region 娣诲姞鎶ょ悊搴�-妞呮灦鐢熶骇璁㈠崟
+ function get_btnAddICMO_Batch() {
+ var HDeptID = "102357,102359" //102357=鎶ょ悊搴� 102359=妞呮灦
+
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept',
+ type: "GET",
+ data: { "HDeptID": HDeptID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //var dataPush = [];
+ //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ //buttonArr = [];//娓呯┖鏁扮粍
+ //for (var i = 0; i < tableBak.length; i++) {
+ // dataPush.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ //}
+
+ //for (var i = 0; i < dataPush.length; i++) {
+ // if (dataPush[i]["鍗曟嵁鍙�"] == "") {
+ // for (var j = 0; j < data1.data.length; j++) {
+ // if (data1.data[j]["婧愬崟涓诲唴鐮�"] == dataPush[i]["婧愬崟涓诲唴鐮�"] && data1.data[j]["婧愬崟瀛愬唴鐮�"] == dataPush[i]["婧愬崟瀛愬唴鐮�"]) {
+ // return layer.alert("鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + dataPush[i]["鐢熶骇璁㈠崟鍙�"] + ",鏄庣粏琛屽彿:" + dataPush[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"], { icon: 5 });
+
+ // }
+ // }
+ // }
+ //}
+ ////瀛樺偍鏁版嵁
+ //for (var i = 0; i < data1.data.length; i++) {
+ // dataPush.push(data1.data[i]);
+ //}
+ //option.data = dataPush;
+ //table.render(option);
+
+ get_FastQuery(1);
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
function setSelect_HArrangeProductDayQty() {
@@ -1122,8 +1198,8 @@
var lastDay = new Date(year, month, 0).getDate(); //褰撴湀鏈�鍚庝竴澶�
var thisDay = new Date().getDay(); //褰撳ぉ鏄湰鏈堢鍑犲ぉ
- var valueList = [7, 21, 28 , 30, 40, 50, 60, 70, 80, 90, 100];
- var titleList = ["7澶�","21澶�","28澶�", "30澶�", "40澶�", "50澶�", "60澶�", "70澶�", "80澶�", "90澶�", "100澶�"];
+ var valueList = [7, 21, 28 , 30, 40];
+ var titleList = ["7澶�","21澶�","28澶�", "30澶�", "40澶�"];
var HArrangeProductDayQty_ArrayList = '';
for (var i = 0; i < valueList.length; i++) {
@@ -1191,8 +1267,14 @@
}
});
- //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ if ($("#HMergeDept").val() == "鏄�") {
+ //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
+ } else {
+ //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
+ var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
+ }
+
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
@@ -1357,6 +1439,7 @@
option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
type: "GET",
@@ -2146,13 +2229,20 @@
var old_date = new Date();
var data = option.data;//table.cache["mainTable"];
- //鏍规嵁閿�鍞鍗曞鏍告棩鏈熸帓搴忔暟缁�
+ //鏍规嵁閿�鍞鍗曡璐ф棩鏈燂紝閿�鍞鍗曞鏍告棩鏈熸帓搴忔暟缁�
+
data.sort(function (a, b) {
- return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
+ // 榛樿鏍规嵁鏈�鏃╁紑宸ユ棩鏈熸帓搴忥紝鏈�鏃╁紑宸ユ棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
+ if (new Date(a.瑕佽揣鏃ユ湡) == new Date(b.瑕佽揣鏃ユ湡)) {
+ return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
+ }
+ return new Date(a.瑕佽揣鏃ユ湡) - new Date(b.瑕佽揣鏃ユ湡)
});
for (var i = 0; i < data.length; i++) {
- data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+ if (data[i]["浼樺厛绾�"] == 0 || data[i]["浼樺厛绾�"] == "") {
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+ }
}
option.data = data;
table.render(option);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
index 44c6fa9..f82c4e3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
@@ -411,7 +411,7 @@
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HMATERIALNAME = $("#HMATERIALNAME").val();//鐗╂枡鍚嶇О
var HSupNumber = $("#HSupNumber").val();//渚涘簲鍟嗕唬鐮�
var HSupName = $("#HSupName").val();//渚涘簲鍟嗗悕绉�
@@ -441,8 +441,8 @@
if (HMaterNumber != "") {
sWhere += " and t1.鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%'' ";
}
- if (HMaterName != "") {
- sWhere += " and t1.鐗╂枡鍚嶇О like ''%" + HMaterName + "%'' ";
+ if (HMATERIALNAME != "") {
+ sWhere += " and t1.鐗╂枡鍚嶇О like ''%" + HMATERIALNAME + "%'' ";
}
if (HSupNumber != "") {
sWhere += " and t3.HNumber like ''%" + HSupNumber + "%'' ";
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_BatchSplit.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_BatchSplit.html"
index 67e462c..fbac142 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_BatchSplit.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_BatchSplit.html"
@@ -668,6 +668,19 @@
num++;
}
+ var sql = "update a set HPrintDate = getdate() from Sc_ProcessExchangeBillMain a with(nolock) where HInterID = " + HInterID + " and HPrintDate is null";
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sql },
+ success: function (result) {
+ if (result.data.code != 1) {
+ layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
+ }
+ }
+ })
+
} else {
layer.msg("鏌ユ棤鏁版嵁!");
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
index a8d5df9..dec321a 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillList.html"
@@ -1560,7 +1560,7 @@
if (openType == 2) {
sWhere += " and HBillStatus=2 ";
$("#HOrgID").val(HOrgID);
- form.render("select");zz
+ form.render("select");
return true;
}
return false;
--
Gitblit v1.9.1