From 8e448ff7e8cb209eb5dd4400552f263cf6cfeb21 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 29 五月 2023 14:28:37 +0800
Subject: [PATCH] 单击高亮
---
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 388 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 319 insertions(+), 69 deletions(-)
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/Kf_MaterOutEntryReport_Cloth.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/Kf_MaterOutEntryReport_Cloth.html"
index 145f2d0..47374ee 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/Kf_MaterOutEntryReport_Cloth.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/Kf_MaterOutEntryReport_Cloth.html"
@@ -34,17 +34,35 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
- <select name="HState" lay-verify="HState" id="HState">
- <option value="0" selected="selected">鍏ㄩ儴</option>
- <option value="1">鏈紑宸�</option>
- <option value="3">宸插叆搴�</option>
- </select>
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HState" lay-verify="HState" id="HState">
+ <option value="0" selected="selected">鍏ㄩ儴</option>
+ <option value="1">鏈紑宸�</option>
+ <option value="3">宸插叆搴�</option>
+ </select>
+ </div>
+ </div>-->
+ <div class="layui-form layui-inline" style="position:relative;top:10px;">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HBeginDate" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
</div>
- </div>-->
- <div class="layui-inline">
- <label class="layui-form-label">涓嬭揪鏃ユ湡</label>
+ <div class="layui-form-item layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">-</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" id="HEndDate" placeholder="yyyy-MM-dd HH:mm:ss">
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
</div>
@@ -54,21 +72,27 @@
<div class="layui-input-block">
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
- </div>
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--<div class="layui-inline">
- <div style="padding-left: 10px;">
- <input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="鏈笅鎺ㄥ強宸插叆搴�">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚堣鍏枻鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
</div>
- </div>-->
+ </div>
+ <!--<div class="layui-inline">
+ <div style="padding-left: 10px;">
+ <input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="鏈笅鎺ㄥ強宸插叆搴�">
+ </div>
+ </div>-->
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
</div>
@@ -156,6 +180,8 @@
var sWhere = "";
var option = [];
var HModName = "MaterOutEntryReport_Cloth";
+
+ var detailBar = 0; //鐢ㄤ簬姹囨�绘姤琛ㄦ煡鐪嬫槑缁嗘姤琛紝褰撲负0鏃舵樉绀烘槑缁嗘眹鎬绘姤琛ㄥ搴旀槑缁嗘姤琛ㄣ��
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -187,6 +213,24 @@
get_FastQuery();
});
+ //琛岀洃鍚簨浠�-鍗曞嚮
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -194,8 +238,27 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH'
+ , value: HBeginDate
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH'
+ , value: HEndDate
+ });
+
+
+ ////鍒濆鍖栨椂闂�
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -206,46 +269,163 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
- , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', width: 160 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
- ]]
- ,done: function (res) {
- //var count = 0;
- //var OnlyID = -1;
- //for (var i = 0; i < res.data.length; i++) {
- // if (res.data[i]["鍞竴ID"] != OnlyID) {
- // count += res.data[i]["鏁存壒"];
- // OnlyID = res.data[i]["鍞竴ID"];
- // }
- //}
- //var divArr = $(".layui-table-total div.layui-table-cell");
- //$.each(divArr, function (index, item) {
- // var _div = $(item);
- // var content = _div.html();
- // if (index == 9) {
- // content = count;
- // }
- // _div.html(content);
- //});
- }
- };
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ //var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ //var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+ var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
+ var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
+
+ //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+
+ //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
+ var com = "";
+ if (ColName != 0 && Comparator != 0) {
+ 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;
+ }
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HMaterNumber: HMaterNumber
+ , HBillNo: HBillNo
+ , HProductName: HProductName
+ , HProductModel: HProductModel
+ , RandomSearch: com
+ }
+ sWhere = JSON.stringify(sWhere);
+
+
+ //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
+ $.ajax({
+ url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere },
+ //async: false,
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ var width = data1.list[key].width * 23;
+ if (width < 150) {
+ width = 150;
+ } else if (width > 300) {
+ width = 300;
+ }
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ } else {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
+ , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
+ ]]
+ , done: function (res) {
+ //var count = 0;
+ //var OnlyID = -1;
+ //for (var i = 0; i < res.data.length; i++) {
+ // if (res.data[i]["鍞竴ID"] != OnlyID) {
+ // count += res.data[i]["鏁存壒"];
+ // OnlyID = res.data[i]["鍞竴ID"];
+ // }
+ //}
+ //var divArr = $(".layui-table-total div.layui-table-cell");
+ //$.each(divArr, function (index, item) {
+ // var _div = $(item);
+ // var content = _div.html();
+ // if (index == 9) {
+ // content = count;
+ // }
+ // _div.html(content);
+ //});
+ }
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
+ }
+ })
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -271,6 +451,14 @@
data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
+ //璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃� 鍒�
+ for (var i = 0; i < data1.data.length; i++) {
+ if (data1.data[i].鏃ユ湡 != null) {
+ data1.data[i].鏃ユ湡 = data1.data[i]["鏃ユ湡"].split(":")[0] + ":" + data1.data[i]["鏃ユ湡"].split(":")[1];
+ data1.data[i].鏃ユ湡 = data1.data[i]["鏃ユ湡"].replace("T", " ");
+ }
+ }
+
option.data = data1.data;
//var num = 0;
//for (let i = 0; i < data1.data.length; i++) {
@@ -285,12 +473,22 @@
// }
//}
table.render(option);
+
+ //璁＄畻鍚堣鍏枻鏁�
+ var sumHMaterOutQty = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ sumHMaterOutQty += data1.data[i]["鐧藉澂鍙戝竷"];
+ }
+ $("#SumHMaterOutQty").val(sumHMaterOutQty);
+
layer.close(wait);
} else {
+ $("#SumHMaterOutQty").val("");
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
+ $("#SumHMaterOutQty").val("");
layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
@@ -301,6 +499,20 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+ if (HBeginDate == '') {
+ HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ HEndDate = $("#HEndDate").val() + ":00:00";//缁撴潫鏃ユ湡
+ }
+
+ //var HBeginDate = $("#HBeginDate").val()+":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ //var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
@@ -310,37 +522,57 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+ //鎷兼帴浠讳竴瀛楁杩囨护鏌ヨ鏉′欢
+ var com = "";
if (ColName != 0 && Comparator != 0) {
- var com = "";
switch (Comparator) {
case "7":
- com = "like'%" + ColContent + "%'";
+ com = "like ''%" + ColContent + "%''";
break;
case "8":
- com = "like'%" + ColContent + "'";
+ com = "like ''%" + ColContent + "''";
break;
case "9":
- com = "like'" + ColContent + "%'";
+ com = "like ''" + ColContent + "%''";
break;
case "10":
- com = "not like'%" + ColContent + "%'";
+ com = "not like ''%" + ColContent + "%''";
break;
default:
- com = "" + Comparator + "'" + ColContent + "'";
+ com = "" + Comparator + " ''" + ColContent + "''";
break;
}
- sWhere += " and " + ColName + " " + com;
+ com = " and (" + ColName + " " + com + ")";
+ }
+
+ var params = get_UrlVars();
+ if (params[params[0]] != null && detailBar == 0) {
+ //姹囨�绘姤琛ㄧ殑鐢熶骇璁㈠崟鍙�
+ HBillNo = params[params[0]];
+ //璁剧疆鐢熶骇璁㈠崟鍙锋爣绛�
+ $("#HBillNo").val(HBillNo);
+
+ //璁剧疆鏃堕棿涓轰竴涓緢澶х殑鍊硷紝榛樿鎼滅储鎵�鏈夋椂闂寸殑鏄庣粏
+ HBeginDate = "1900-01-01 00:00:00";
+ HEndDate = "2200-01-01 00:00:00";
+
+ detailBar = 1;
+ } else {
+ HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
}
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
- ,HMaterNumber: HMaterNumber
+ , HMaterNumber: HMaterNumber
, HBillNo: HBillNo
, HProductName: HProductName
, HProductModel: HProductModel
+ , RandomSearch: com
}
+ //set_InitGrid(JSON.stringify(sWhere));
get_Display(JSON.stringify(sWhere));
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -348,8 +580,26 @@
//閲嶇疆杩囨护鏉′欢
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"));//缁撴潫鏃ユ湡
+ //鍒濆鍖栨椂闂�
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+ laydate.render({
+ elem: '#HBeginDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH'
+ , value: HBeginDate
+ });
+ laydate.render({
+ elem: '#HEndDate',
+ type: 'datetime',
+ fullPanel: true
+ , format: 'yyyy-MM-dd HH'
+ , value: HEndDate
+ });
+
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HMaterNumber").val("");
$("#HBillNo").val("");
$("#HProductName").val("");
@@ -366,7 +616,7 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
@@ -405,7 +655,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
if (dataCol[i]) {
var dataCols = dataCol[i].split('|');
}
--
Gitblit v1.9.1