From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库：子表件数可以输入为0 乔一客户物料即时库存报表：把米数和件数的合计加上去 （按生产订单）客户订单：过滤条件改为模糊查询
---
WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysisReport.html | 336 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 257 insertions(+), 79 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
index a944d2c..aff4e9c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
@@ -53,16 +53,12 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
</div>
</div>
-
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娆犳枡鏃ユ湡</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -76,12 +72,33 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡灞炴��</label>
+ <div class="layui-input-block">
+ <select name="HMaterClsID" id="HMaterClsID" lay-verify="HMaterClsID">
+ <option value="0" selected>鍏ㄩ儴</option>
+ <option value="1">澶栬喘</option>
+ <option value="2">鑷埗</option>
+ <option value="3">濮斿</option>
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">鍒楄缃�</button>
</div>
-
+
<!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
@@ -152,6 +169,14 @@
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ //$('input[type="text"]').on('keydown', function (event) {
+ // if (event.keyCode == 13) {
+ // $("#btnSearch").click();
+ // }
+ //});
+ //#endregion
+
//#region 浜у搧缂栫爜
form.on('submit(btnHMATERIALID)', function (data) {
btnHMATERIALID();
@@ -188,21 +213,42 @@
var HWorkShopID = obj.data.闇�姹傝溅闂碔D;
var HBEGINDATE = $("#HBEGINDATE").val();//娆犳枡鏃ユ湡
var HENDDATE = $("#HENDDATE").val();//鑷�
- layer.open({
- type: 2
- , skin: 'layui-layer-rim'//鍔犱笂杈规
- , area: ['90%', '90%']
- , title: '涓婂眰缂烘枡鎯呭喌'
- , shift: 2//寮瑰嚭鍔ㄧ敾
- , shade: 0.6 //閬僵閫忔槑搴�
- //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE, 'yes']
- })
+ window.open('../../鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE);
+ //layer.open({
+ // type: 2
+ // , skin: 'layui-layer-rim'//鍔犱笂杈规
+ // , area: ['90%', '90%']
+ // , title: '涓婂眰缂烘枡鎯呭喌'
+ // , shift: 2//寮瑰嚭鍔ㄧ敾
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisDetailReport.html?type=2&HOrgID=' + HOrgID + "&HMaterID=" + HMaterID + "&HWorkShopID=" + HWorkShopID + "&HBEGINDATE=" + HBEGINDATE + "&HENDDATE=" + HENDDATE, 'yes']
+ //})
})
//#endregion
//#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle !=0) {
+ //$('#HBeginDate').prop('disabled', true);
+ //$('#HEndDate').prop('disabled', true);
+
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ }
+ else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
//#endregion
@@ -241,10 +287,14 @@
}
})
-
- //鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle !=0) {
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
+ }
//鐢熶骇缁勭粐鍔犺浇
Organ();
//杞﹂棿
@@ -262,58 +312,66 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left', sort: true });
- columns.push({ field: '闇�姹傝溅闂碔D', title: '闇�姹傝溅闂碔D', sort: true, filter: true });
- columns.push({ field: '闇�姹傝溅闂寸紪鐮�', title: '闇�姹傝溅闂寸紪鐮�', sort: true, filter: true });
- columns.push({ field: '闇�姹傝溅闂村悕绉�', title: '闇�姹傝溅闂村悕绉�', sort: true, filter: true });
- columns.push({ field: '鐗╂枡ID', title: '鐗╂枡ID', sort: true, filter: true });
- columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true, filter: true });
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true });
- columns.push({ field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true });
- columns.push({ field: '渚涜揣杞﹂棿ID', title: '渚涜揣杞﹂棿ID', sort: true, filter: true });
- columns.push({ field: '渚涜揣杞﹂棿缂栫爜', title: '渚涜揣杞﹂棿缂栫爜', sort: true, filter: true });
- columns.push({ field: '渚涜揣杞﹂棿鍚嶇О', title: '渚涜揣杞﹂棿鍚嶇О', sort: true, filter: true });
- columns.push({ field: '鏄惁鍖归厤鍒拌鍗�', title: '鏄惁鍖归厤鍒拌鍗�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鍗� ? '鍚�' : '鏄�'; } });
- //columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
- //columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
- //columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
- columns.push({ field: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', title: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭� ? '鍚�' : '鏄�'; } });
- /*columns.push({ field: '灞傜骇', title: '灞傜骇', sort: true, filter: true });*/
- //columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true });
- //columns.push({ field: 'TQSUM', title: '娆犳枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
- //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
- var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
- var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
- var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
- //鑾峰彇骞�
- var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
- //鑾峰彇鏈堜唤
- var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
- //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
- var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
- //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
- var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+ //columns.push({ type: 'checkbox', fixed: 'left', sort: true });
+ //columns.push({ field: '闇�姹傝溅闂碔D', title: '闇�姹傝溅闂碔D', sort: true, filter: true });
+ //columns.push({ field: '闇�姹傝溅闂寸紪鐮�', title: '闇�姹傝溅闂寸紪鐮�', sort: true, filter: true });
+ //columns.push({ field: '闇�姹傝溅闂村悕绉�', title: '闇�姹傝溅闂村悕绉�', sort: true, filter: true });
+ //columns.push({ field: '鐗╂枡ID', title: '鐗╂枡ID', sort: true, filter: true });
+ //columns.push({ field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', sort: true, filter: true });
+ //columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true });
+ //columns.push({ field: '鐗╂枡灞炴��', title: '鐗╂枡灞炴��', sort: true, filter: true });
+ //columns.push({ field: '渚涜揣杞﹂棿ID', title: '渚涜揣杞﹂棿ID', sort: true, filter: true });
+ //columns.push({ field: '渚涜揣杞﹂棿缂栫爜', title: '渚涜揣杞﹂棿缂栫爜', sort: true, filter: true });
+ //columns.push({ field: '渚涜揣杞﹂棿鍚嶇О', title: '渚涜揣杞﹂棿鍚嶇О', sort: true, filter: true });
+ //columns.push({ field: '鏄惁鍖归厤鍒拌鍗�', title: '鏄惁鍖归厤鍒拌鍗�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鍗� ? '鍚�' : '鏄�'; } });
+ ////columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
+ ////columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
+ ////columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
+ //columns.push({ field: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', title: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭� ? '鍚�' : '鏄�'; } });
+ // columns.push({ field: '鏃ヨ鍒掗渶姹傛暟閲�', title: '鏃ヨ鍒掗渶姹傛暟閲�', sort: true, filter: true });
+ //columns.push({ field: '鍗虫椂搴撳瓨鎬绘暟閲�', title: '鍗虫椂搴撳瓨鎬绘暟閲�', sort: true, filter: true });
+ //columns.push({ field: '棰嗘枡鏁伴噺', title: '棰嗘枡鏁伴噺', sort: true, filter: true });
+ //columns.push({ field: '鍙敤鎬绘暟閲�', title: '鍙敤鎬绘暟閲�', sort: true, filter: true });
+ //columns.push({ field: '搴撳瓨宸插崰鐢ㄦ�绘暟閲�', title: '搴撳瓨宸插崰鐢ㄦ�绘暟閲�', sort: true, filter: true });
+ //columns.push({ field: '搴撳瓨鍓╀綑鍙敤鏁伴噺', title: '搴撳瓨鍓╀綑鍙敤鏁伴噺', sort: true, filter: true });
+ //columns.push({ field: '渚涜揣鎻愬墠鏈�', title: '渚涜揣鎻愬墠鏈�', sort: true, filter: true });
+ //columns.push({ field: '鍒拌揣鍓嶇疆鏈�', title: '鍒拌揣鍓嶇疆鏈�', sort: true, filter: true });
+ ///*columns.push({ field: '灞傜骇', title: '灞傜骇', sort: true, filter: true });*/
+ ////columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true });
+ ////columns.push({ field: 'TQSUM', title: '娆犳枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
+ ////鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ //var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ //var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
+ //var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
+ ////鑾峰彇骞�
+ //var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ ////鑾峰彇鏈堜唤
+ //var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ ////鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ //var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ ////鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ //var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
- var k = 0;//鏀堕泦寰幆娆℃暟
- 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, filter: 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({ field: 'Total', title: '娆犳枡璁″垝鍚堣', filter: true });
+ //var k = 0;//鏀堕泦寰幆娆℃暟
+ //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, filter: 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({ field: 'Total', title: '娆犳枡璁″垝鍚堣', filter: true });
option = {
elem: '#mainTable'
@@ -328,6 +386,14 @@
, cols: [columns]
, done: function (res, curr, count) {
soulTable.render(this);
+ for (var i in res.data) {
+ var item = res.data[i];
+
+ if (item["鏈尮閰嶈鍗曟暟閲�"] > 0) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ }
+
+ }
}
};
}
@@ -360,11 +426,12 @@
function get_Dept() {
//鑾峰彇杞﹂棿鍒�
var HDeptID = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+ var sql = "exec h_p_Gy_GetHDeptListISWorkShop " + sessionStorage["OrganizationID"]
$.ajax({
type: "get",
- url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "sWhere": sql},
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data;
@@ -403,6 +470,68 @@
data: { "sWhere": sWhere, "HBEGINDATE": HBEGINDATE, "HENDDATE": HENDDATE, user: sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ } else if (data[i].name == '鏈尮閰嶈鍗曟暟閲�') {
+ col.push({
+ field: '鏈尮閰嶈鍗曟暟閲�', title: '鏈尮閰嶈鍗曟暟閲�', sort: true, filter: true, templet: function (d) {
+ return d.鏈尮閰嶈鍗曟暟閲� > 0 ? '<span style="color: black;">' + d.鏈尮閰嶈鍗曟暟閲� + '</span>' : d.鏈尮閰嶈鍗曟暟閲�;
+ } });
+ }
+ else if (data[i].name == '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�') {
+ col.push({
+ field: '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�', title: '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�', sort: true, filter: true, templet: function (d) {
+ return d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲� > 0 ? '<span style="color: black;">' + d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲� + '</span>' : d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�;
+ }
+ });
+ } else if (isValidDate(data[i].name)) {
+ col.push({
+ field: data[i].name, title: Format(data[i].name, 'MM-dd'), width: 70, totalRow: true, filter: true, templet: function (d) {
+ //鑾峰彇褰撳墠浠婂ぉ鏄庡ぉ鍚庡ぉ涓夊ぉ鐨勬棩鏈熷瓧绗︿覆
+ const dates = [];
+ const today = new Date();
+ for (let i = 0; i < 3; i++) {
+ const date = new Date(today);
+ date.setDate(today.getDate() + i);
+ const dateStr = date.toISOString().slice(0, 10);
+ dates.push(`${dateStr}`);
+ }
+ // 濡傛灉琛屾棩鏈熷湪褰撳墠鏃ユ湡涓夊ぉ鍚庯紝鍒欏唴瀹规爣绾�
+ if ((this.field == dates[0] || this.field == dates[1] || this.field == dates[2]) && d[this.field] != null) {
+ return '<span style="color:Orange">' + (d[this.field] == null ? 0 : d[this.field]) + '</span>';
+ } else {
+ return d[this.field] == null ? 0 : d[this.field]
+ }
+ }
+ })
+ }
+ 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 == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, width: 200 });
+ }
+ }
+ }
+ option.cols = [col];
option.data = data1.data;
//鍒楄缃�
DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
@@ -420,6 +549,27 @@
}
//#endregion
+
+ // 绛涢�夊嚱鏁帮細妫�鏌ュ瓧绗︿覆鏄惁绗﹀悎鏍煎紡绛涢�夋棩鏈�
+ function isValidDate(dateStr) {
+ // 姝ｅ垯琛ㄨ揪寮忛獙璇佹牸寮�
+ const formatRegex = /^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/;
+ if (!formatRegex.test(dateStr)) return false;
+
+ // 鍒嗗壊骞存湀鏃ュ苟杞崲涓烘暟鍊�
+ const [year, month, day] = dateStr.split('-').map(Number);
+
+ // 鍒涘缓Date瀵硅薄锛堟湀浠戒粠0寮�濮嬶級
+ const date = new Date(year, month - 1, day);
+
+ // 妫�鏌ユ棩鏈熸槸鍚︽湁鏁堬紙涓庤緭鍏ョ殑骞存湀鏃ヤ竴鑷达級
+ return (
+ date.getFullYear() === year &&
+ date.getMonth() === month - 1 &&
+ date.getDate() === day
+ );
+ }
+
//#region 鑾峰彇瀵煎嚭鏁版嵁
function getExportData() {
@@ -445,8 +595,10 @@
var HBEGINDATE = $("#HBEGINDATE").val();//娆犳枡鏃ユ湡
var HENDDATE = $("#HENDDATE").val();//鑷�
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
+ var HMATERIALNAME = $("#HMATERIALNAME").val();//鐗╂枡鍚嶇О
var HWorkShopID = $("#HWorkShopID").val();//鐗╂枡/浜у搧
var HWorkShopID2 = $("#HWorkShopID2").val();//鐗╂枡/浜у搧闇�姹傝溅闂�
+ var HMaterClsID = $("#HMaterClsID").val();//鐗╂枡灞炴��
if (HBEGINDATE > HENDDATE) {
return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
}
@@ -460,11 +612,18 @@
if (HWorkShopID2 != 0) {
sWhere += " and T1.HWorkShopID= " + HWorkShopID2 + " ";
}
+ if (HMaterClsID != 0) {
+ sWhere += " and T1.HMaterClsID=" + HMaterClsID + " ";
+ }
//if (HBEGINDATE != null && HENDDATE != null) {
// sWhere += " and HDate between ''" + HBEGINDATE + "'' and ''" + HENDDATE + "'' ";
//}
- if (HMATERIALID!=0) {
- sWhere += " and T1.HMaterID= " + HMATERIALID+" ";
+ if (HMATERIALID != 0) {
+ sWhere += " and T1.HMaterID= " + HMATERIALID + " ";
+ } else {
+ if (HMATERIALNAME != "") {
+ sWhere += " and (T2.HName like ''%" + HMATERIALNAME + "%'' or T2.HNumber like ''%" + HMATERIALNAME + "%'') ";
+ }
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -480,6 +639,7 @@
$("#HMATERIALNAME").val("");
$("#HWorkShopID").val("0");
$("#HWorkShopID2").val("0");
+ $("#HMaterClsID").val("0");
form.render('select');
sWhere = "";
}
@@ -510,6 +670,24 @@
})
}
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [30, 45, 60];
+ var titleList = ["杩戜竴鏈�", "杩�45澶�", "杩�60澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("60");
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1