From 789552d278259a28fb7a4933ad976476e124f11d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 13 一月 2022 10:43:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/报表分析/Sc_StationInBillList.html | 38 +++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html | 1
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 406 ++++++++--------------------------------
WebTM/views/index.html | 6
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 115 +++++++++-
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 19 +
6 files changed, 236 insertions(+), 349 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 388576f..af0a276 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -348,6 +348,12 @@
<dd><a lay-href="鐢熶骇绠＄悊/缁勮鍗�/Sc_GroupOrderBillList.html">缁勮杩芥函鍗曠淮鎶�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>缁勬墭鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 杞﹂棿绠＄悊 -->
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/InventoryAnalysis.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/InventoryAnalysis.html"
index 129db4c..eb6b357 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/InventoryAnalysis.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/InventoryAnalysis.html"
@@ -591,7 +591,7 @@
option1.data = data1.list[0];
table1.render(option1);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -612,7 +612,7 @@
option2.data = data1.list[0];
table2.render(option2);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -633,7 +633,7 @@
option3.data = data1.list[0];
table3.render(option3);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -654,7 +654,7 @@
option4.data = data1.list[0];
table4.render(option4);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -675,7 +675,7 @@
option5.data = data1.list[0];
table5.render(option5);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -696,7 +696,7 @@
option6.data = data1.list[0];
table6.render(option6);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -717,7 +717,7 @@
option7.data = data1.list[0];
table7.render(option7);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -768,6 +768,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].鏉＄爜.toString();
+ var HItemID = data[0].HItemID.toString();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -801,6 +802,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].鏉＄爜.toString();
+ var HItemID = data[0].HItemID.toString();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -834,6 +836,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].鏉＄爜.toString();
+ var HItemID = data[0].HItemID.toString();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -867,6 +870,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].鏉＄爜.toString();
+ var HItemID = data[0].HItemID.toString();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -900,6 +904,7 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var HInterID = data[0].鏉＄爜.toString();
+ var HItemID = data[0].HItemID.toString();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
index e1e10af..3df78a0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairOutBillEdit.html"
@@ -354,6 +354,7 @@
});
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
+ alert(1);
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index 85547e6..430b58f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -175,12 +175,6 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璁″垝鏁伴噺:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
@@ -202,8 +196,6 @@
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎿嶄綔鍛�:</label>
<div class="layui-input-inline">
@@ -215,6 +207,29 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璁″垝鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="GatherQty" lay-verify="GatherQty" id="GatherQty" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚堟牸鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">涓嶈壇鏁伴噺:</label>
<div class="layui-input-inline">
@@ -231,14 +246,6 @@
<label class="layui-form-label">鍥犳枡鎶ュ簾鏁�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鎶ュ伐鏁伴噺:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
</div>
</div>
</div>
@@ -996,6 +1003,78 @@
}
});
}
+
+ //#region 鐩戝惉杈撳叆妗嗘敼鍙樺��
+ //杈撳叆妗嗙殑鍊兼敼鍙樻椂瑙﹀彂
+ $("#HBadCount").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HBadCount = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //鍥犲伐鎶ュ簾鏁�
+ var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
+ //鍥犳枡鎶ュ簾鏁�
+ var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ if (Hqy < 0)
+ {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HBadCount = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ $("#HBadCount").val(HBadCount);
+ $("#HBadCount").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ $("#HWasterQty").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HWasterQty = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //涓嶈壇鏁伴噺
+ var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
+ //鍥犳枡鎶ュ簾鏁�
+ var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ if (Hqy < 0) {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HWasterQty = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ $("#HWasterQty").val(HWasterQty);
+ $("#HWasterQty").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ $("#HWasterQty2").on("input", function (e) {
+ //鑾峰彇input杈撳叆鐨勫��
+ var HWasterQty2 = e.delegateTarget.value == '' ? '0' : e.delegateTarget.value;
+ //鑾峰彇閲囬泦鏁伴噺
+ var GatherQty = $("#GatherQty").val() == '' ? '0' : $("#GatherQty").val();
+ //鑾峰彇鍚堟牸鏁伴噺
+ var Hqy = $("#HQty").val() == '' ? '0' : $("#HQty").val();//parseFloat($("#HQty").val())
+ //涓嶈壇鏁伴噺
+ var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
+ //鍥犲伐鎶ュ簾鏁�
+ var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
+ //鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ if (Hqy < 0) {
+ layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
+ HWasterQty2 = 0;
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ $("#HWasterQty2").val(HWasterQty2);
+ $("#HWasterQty2").focus();
+ }
+ $("#HQty").val(Hqy);
+ });
+ //#endregion
+
//浠ヤ笂涓簂ayui妯″潡
});
@@ -1030,6 +1109,10 @@
layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#GatherQty").val() == '' || $("#GatherQty").val() == null) {
+ layer.msg("閲囬泦鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HQty").val() == '' || $("#HQty").val() == null) {
layer.msg("鎶ュ伐鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 6e81920..6fa8b02 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -9,11 +9,6 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -40,15 +35,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ <input type="date" class="layui-input" id="HDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
</div>
</div>
@@ -57,12 +52,6 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
@@ -73,12 +62,6 @@
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="HMaterName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HMaterModel" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -109,7 +92,13 @@
</div>
</div>
</div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
+ var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var table = null;
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -125,17 +114,19 @@
, laydate = layui.laydate
, util = layui.util
//鏌ヨ鏉′欢
- var sWhere = " where 1 = 1 ";
+ var sWhere = "";
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
var option = [];
var Name = "Sc_PackUnionBillMain";
+ var pageCount = 50;//姣忛〉澶氬皯琛�
+ var pageIndex = 1;//褰撳墠椤电爜鍊�
//#region 杩涘叆椤甸潰鏃㈠姞杞�
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
- //鍔犺浇鏁版嵁鍒扮綉鏍�
- get_Display(sWhere);
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
//#endregion
- //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -180,314 +171,92 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option);
+ get_FastQuery();
});
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- var columns = [
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '绠卞彿鏉″舰鐮�', title: '绠卞彿鏉″舰鐮�', width: 160 }
- , { field: '鍑�閲�', title: '鍑�閲�', width: 160 }
- , { field: '姣涢噸', title: '姣涢噸', width: 160 }
- , { field: '鐨噸', title: '鐨噸', width: 160 }
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(sWhere);
- , { field: 'HProdOrgID', title: 'HProdOrgID', width: 200, hide: true }
- , { field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 160 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
- , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
- , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 160 }
- , { field: '瀹㈡埛鏍囩鍙�', title: '瀹㈡埛鏍囩鍙�', width: 160 }
-
- , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- , { field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅鍚嶇О', width: 200 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 115 }
-
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 100 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-
- ];
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , page: true
- , cellMinWidth: 120
- , totalRow: true
- , limit: 10
- , height: 'full-50'
- , cols: [columns]
- , limits: [50, 500, 1000, 5000]
- , done: function (res, curr, count) {
-
- }
- };
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
- }
$.ajax({
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "page": 1, "limit": 10 },
+ datatype: "json",
success: function (data1) {
- if (data1.count == 1) {
- DataList = data1.data;
- option.data = data1.data;
- table.render(option);
- layer.close(wait);
- } else {
- layer.close(wait);
- layer.alert(data1.Message, { icon: 5 });
+ console.log(data1);
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ set_InitGrid(sWhere);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
}
});
}
- //鏂板
- function set_AddNew() {
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板鐢熶骇棰嗘枡鍗�',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../鐢熶骇鍖呰鍗�/Sc_PackUnionBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
- end: function () {
- //鍒锋柊椤甸潰,
- get_FastQuery(table, option);
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'hmainid') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'Int32':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ case 'Decimal':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ default:
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#mainTable',
+ url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
+ title: '缁勬墭鍗曞垪琛�',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'mainTable', //琛ㄦ牸id
+ where: { sWhere: sWhere }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ totalRow: true, //寮�鍚悎璁�
+ limit: 10, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [10, 20, 40, 60, 80, 100], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
},
- success: function (layero, index) {
-
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
}
});
- }
- //缂栬緫鍗曟嵁
- function set_ShowBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var linterid = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫鐢熶骇棰嗘枡鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍖呰鍗�/Sc_PackUnionBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
- , resize: false,
- end: function () {
- get_FastQuery(table, option);
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- //鍒犻櫎
- function set_DeleteBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_PackUnionBill/set_DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- }
- //棰勮
- function get_ViewReport() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
- }
- }
- //鎵撳嵃
- function get_PrintReport() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
- }
- }
- //瀹℃牳
- function set_CheckBill() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MouldProdInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_FastQuery(table, option);
- });
- } else {
- layer.alert(result.Message, { icon: 5 });
- }
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
- }
- }
- //鍙嶅鏍�
- function set_AbandonCheck() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫瀹℃牳鏂规硶
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MouldProdInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_FastQuery(table, option);
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
- }
-
}
//蹇�熻繃婊�
- function get_FastQuery(table, option) {
- var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ function get_FastQuery() {
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDepartName = $("#HDepartName").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
- var HMaterModel = $("#HMaterModel").val();
var HMakerMan = $("#HMakerMan").val();
-
- if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
- }
- if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -501,29 +270,22 @@
if (HMaterName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
- if (HMaterModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
- }
if (HMakerMan) {
sWhere += " and 鍒跺崟浜� like '%" + HMakerMan + "%'";
}
- var index = layer.load(0);
- get_Display(sWhere);
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = " where 1 = 1 ";
+ set_ClearBill(sWhere);
+ sWhere = "";
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HBillNo").val("");
$("#HDepartName").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
- $("#HMaterModel").val("");
$("#HMakerMan").val("");
- sWhere = " where 1 = 1 ";
- get_Display(sWhere);
+ sWhere = " ";
+ get_FastQuery();
}
//鍒锋柊
function set_Refresh() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationInBillList.html"
index 4cf52d9..239c42f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationInBillList.html"
@@ -70,6 +70,7 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="SetExcel"><i class="layui-icon layui-icon-return"></i>Excel琛ㄦ牸瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
@@ -139,7 +140,8 @@
//浼樺厛绾�
case 'btn-yxj': set_Yxj();
break;
- case 'btn-back': set_Back();
+ //Excel琛ㄦ牸瀵煎嚭
+ case 'SetExcel': SetExcel();
break;
};
});
@@ -170,9 +172,7 @@
, { field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 160 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 100 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-
+
];
option = {
elem: '#mainTable'
@@ -299,6 +299,36 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+ //Excel琛ㄦ牸瀵煎嚭
+ function SetExcel() {
+ layer.confirm("纭畾瀵煎嚭鎵�鏈夋暟鎹悧", { title: "瀵煎嚭纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+
//棰勮
function get_ViewReport() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1