From fb259ceaae461fdd20a5465b7d4b750aae2b3555 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 28 三月 2024 09:56:00 +0800
Subject: [PATCH] 优化
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 1786 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 1,372 insertions(+), 414 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 2e0facc..bd2b603 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -28,6 +29,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -180,17 +182,73 @@
</div>
</div>
<div id="HProgressBar"></div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:40px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鐢熶骇璁㈠崟</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <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:120px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:120px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeptName_ICMO" id="HDeptName_ICMO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName_ICMO" id="HMaterName_ICMO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo_ICMO" id="HICMOBillNo_ICMO">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">閲嶇疆</button>
+ <!--寰呮帓璁㈠崟-->
+ <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
+ </div>
+ </div>
+ </div>
<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>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>涓婄Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverDown"><i class="layui-icon layui-icon-delete"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>浼樺厛绾�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>鍑嗗鎺掑簭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>閫変骇绾�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>宸ヨ壓璺嚎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>宸ュ巶鏃ュ巻</button>
+ </div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>鎺掍骇</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_ICMO"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -210,7 +268,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙fā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -220,12 +278,18 @@
, form = layui.form
, laydate = layui.laydate
, excel = layui.excel
+ , soulTable = layui.soulTable
, element = layui.element;
var sWhere = "";
+ var sWhere_ICMO = "";
var option = [];
+ var option2 = [];
+ var option_columns = [];
var HModName = "JIT_DayPlanPlatForm";
-
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+ var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID","HSourceID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -243,15 +307,16 @@
var yyyy = myDate.getFullYear();
var MM = myDate.getMonth() + 1;
var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
var dateHQty = 0;
+ var SumHQty = 0;//鎷嗗崟鏁伴噺
for (var i = 0; i <= (SumMonth - dd); i++) {
if (obj.field == "鐢熶骇璧勬簮") {
return;
}
if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
- dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]) ;
+ dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
}
}
for (var i = 1; i < dd; i++) {
@@ -260,16 +325,41 @@
}
}
+ //鏌ヨ鎵�鏈夋暟鎹浉鍚岀殑璁㈠崟
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["鐢熶骇璁㈠崟鍙�"] == option.data[i]["鐢熶骇璁㈠崟鍙�"] && obj.data["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] == option.data[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+ SumHQty += parseInt(option.data[i]["鎷嗗崟鏁伴噺"]);
+ }
+ }
+
+ if (obj.value == "0" && obj.field == "鎷嗗崟鏁伴噺") {
+ return layer.msg("鎷嗗崟鏁伴噺涓嶈兘涓�0!");
+ }
+
+ if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ obj.update({
+ "鎷嗗崟鏁伴噺": "0"
+ });
+ return layer.msg("鎷嗗崟鏁伴噺澶т簬璁㈠崟鏁伴噺!");
+ }
+
+ var NowDate = obj.field;
if (dateHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty - obj.value,
+ [NowDate]: 0
});
return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
}
+
+ if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+ return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ }
+
//淇敼鏁版嵁
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty,
});
})
@@ -278,27 +368,18 @@
btnrowDouble(obj.data);
})
- var objData = "";
//鐐瑰嚮琛岄�変腑鏁版嵁
table.on('row(mainTable)', function (obj) {
- if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
- objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- objData.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- layui.each(table.cache.mainTable, function (i, l) {
- if (objData.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = false;
- }
- });
- }
-
+ //閫変腑琛屾敼鍙橀鑹�
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.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
layui.each(table.cache.mainTable, function (i, l) {
@@ -306,17 +387,25 @@
l.LAY_CHECKED = flag;
}
});
+ })
- for (var i = 0; i < table.cache["mainTable"].length; i++) {
- if (table.cache["mainTable"][i]["鐢熶骇璁㈠崟鍙�"] != obj.data["鐢熶骇璁㈠崟鍙�"]) {
- table.cache["mainTable"][i].LAY_CHECKED = false;
- }
+ table.on('row(mainTable_ICMO)', 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棰滆壊
}
- option.data = table.cache["mainTable"];
- table.render(option);
-
-
- objData = obj;
+ //mainTable_ICMO 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable_ICMO, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
})
//澶村伐鍏锋爮浜嬩欢
@@ -336,6 +425,40 @@
data[0]["HSourceID"] = "";
data[0]["hmainid"] = "";
data[0]["鍗曟嵁鍙�"] = "";
+ data[0]["鎷嗗崟鏁伴噺"] = 0;
+
+ var myDate = new Date();
+ //鑾峰彇骞�
+ var yyyy = myDate.getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = myDate.getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = myDate.getDate(); //鑾峰彇褰撳ぉ鏃ユ湡澶╂暟
+ var columns = []
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (30 - k); j++) {
+
+ data[0][Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')] = "";
+
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ 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;
+ }
+ }
+
var copydata = JSON.stringify(data);
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
@@ -364,7 +487,42 @@
case 'set_Priority':
set_Priority();
break;
+ //鍑嗗鎺掑簭
+ case 'set_ReadyAsc':
+ set_ReadyAsc();
+ break;
+ //閫変骇绾�
+ case 'set_Souce':
+ set_Souce(data);
+ break;
+ //鏌ョ湅宸ヨ壓璺嚎
+ case 'set_Routing':
+ set_Routing();
+ break;
+ //宸ュ巶鏃ュ巻
+ case 'set_Calendar':
+ set_Calendar();
+ break;
}
+ });
+
+
+ table.on('toolbar(mainTable_ICMO)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鎺掍骇
+ case 'set_Arrangement':
+ set_Arrangement();
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-Close':
+ parent.layui.admin.events.closeThisTabs();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn_ICMO':
+ get_HideColumn_ICMO();
+ break;
+ };
});
//瀵煎叆
@@ -380,7 +538,29 @@
} else if (table.cache["mainTable"].length == 0) {
return layer.msg("鏃犳暟鎹�,鏃犳硶淇濆瓨!");
} else {
- set_AddNew();
+ var HYxjQty = 0;
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
+ HYxjQty++
+ }
+ }
+ }
+ if (HYxjQty > 0) {
+ layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['纭', '鍙栨秷']
+ }, function (index, layero) {
+ //纭
+ set_AddNew();
+ }, function (index) {
+ //鍙栨秷
+ return
+ });
+ } else {
+ set_AddNew();
+ }
}
});
@@ -399,9 +579,19 @@
get_FastQuery(2);
});
+ //蹇�熻繃婊�
+ form.on('submit(btnSearch_ICMO)', function (data) {
+ get_FastQuery_ICMO(2);
+ });
+
//閲嶇疆
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ });
+
+ //閲嶇疆
+ form.on('submit(btnReSearch_ICMO)', function (data) {
+ set_ClearQuery_ICMO();
});
//榻愬鍒嗘瀽
@@ -424,23 +614,58 @@
get_btnReady();
})
-
-
//鎺掍骇
form.on('submit(btnProPC)', function (data) {
var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
- get_btnProPC(HWorkShopID)
+ var index = layer.open({
+ type: 1, // page 灞傜被鍨�
+ area: ['20%', '20%'],
+ shade: 0.6, // 閬僵閫忔槑搴�
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+ anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+ content: '<div style="padding: 12px;">姝e湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
+ });
+ setTimeout(function () {
+ get_btnProPC(HWorkShopID);
+ layer.close(index);
+ }, 1000)
}
-
})
+
+ //宸ヨ壓璺嚎缂栬緫
+ form.on('submit(btnRoutEdit)', function (data) {
+ get_btnRoutEdit();
+ })
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+ //#region 淇敼鏃堕棿
+ var data = obj.data;
+ //鏃ヨ鍒掔敓浜ф棩鏈�
+ if (obj.event == 'HPlanEndDate') {
+ var field = $(this).data('field');
+ laydate.render({
+ elem: this.firstChild
+ , show: true //鐩存帴鏄剧ず
+ , closeStop: this
+ , done: function (nowDate) {
+ //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+ data[field] = nowDate;
+ obj.update(data);
+ }
+ });
+ }
+
+
+ //#endregion
});
//閿佸畾
@@ -474,6 +699,10 @@
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMastersDate").val("");
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ get_ReadConfigFile();
//缁勭粐
Organ();
//鍒濆鍖栬〃鏍�
@@ -481,6 +710,7 @@
get_FastQuery(1);
//闅愯棌鍕鹃�夊瓧娈�
DisPlay_HideColumn();
+ get_Display2(sWhere_ICMO);
}
//#endregion
@@ -512,182 +742,188 @@
var myDate = new Date();
var oneday = 1000 * 60 * 60 * 24;
- columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
- columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150});
- columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
- columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
- columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
- columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true });
+ columns.push({ type: 'numbers', title: '搴忓彿', sort: true });
+ columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
+ columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
+ columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
- columns.push({ field: '鐗╂枡浠g爜', title: '鐗╂枡缂栫爜', width:150 });
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width:150 });
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width:150 });
- columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width:150 });//0
- columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
- columns.push({field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150});//0
- columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
- columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>"});
- 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: '鐗╂枡浠g爜', 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 });//0
+ columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
+ columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0
+ columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150});
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
+ columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
+ columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
columns.push({
field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')],d,Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
- columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
- columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
- columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150 });
- columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
- columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
- columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
- columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150 });
- columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150 });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150 });
- columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150 });
- columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"});
- columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
- columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
- columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
- columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
- 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: '涓氬姟鐘舵��', 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 });
+ columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", 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, edit: 'text' });
+ 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 });
+ columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
+ 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 });
+ columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150, sort: true });
+ columns.push({ field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 150, sort: true });
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
- columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150 });
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
- columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide:true });
+ columns.push({ field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 150, hide: true });
+ columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
+
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
-
+ option_columns = columns;
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -696,6 +932,24 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , done: function (res, page, count) {
+ //res.data.forEach(function (item, index) {
+ // if (data1.data.DataColor != undefined) {
+ // var sj = data1.data.DataColor;
+ // //绂佺敤澶嶉�夋锛岃缃笉鍙�変腑鏍囪瘑锛屽皢璇ヨ璁剧疆涓洪槾褰辫壊
+ // var tr = $(".layui-table tr[data-index=" + index + "]");
+ // var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td
+ // if (sj.length > index) {
+ // for (var i = 1; i < td.length; i++) {
+ // var title = option.cols[0][i].field;
+ // if (sj[index][title] != "" && sj[index][title] != null) {
+ // td.eq(i).css("background-color", sj[index][title]);
+ // }
+ // }
+ // }
+ // }
+ //})
+ }
};
}
@@ -742,6 +996,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
+ async: false,
data: { "sWhere": HinterID_S.toString(),"num":1 },
success: function (data1) {
if (data1.count == 1) {
@@ -806,6 +1061,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
+ async: false,
data: { "sWhere": HinterID_S.toString(), "num": 2 },
success: function (data1) {
if (data1.count == 1) {
@@ -858,7 +1114,7 @@
}
//鏁伴噺鏍囪棰滆壊
- function DayColor(DaySate, DayHQty) {
+ function DayColor(DaySate, DayHQty,Data,NowData) {
if (DaySate == "榻愬" || DaySate == "鏈綈濂�") {
if (DaySate == "榻愬") {
return "<span style='color:green;'>" + DayHQty + "</span>";
@@ -870,6 +1126,9 @@
if (DayHQty == null) {
return "<span></span>";
} else {
+ if (Data[NowData] > 0 && Data[NowData] != null && Data[NowData] != "" && Date.parse(Data["璁″垝缁撴潫鏃ユ湡"]) < Date.parse(NowData)) {
+ return "<span style='background-color:#f48888;width:100%;display: inline-block;'>" + DayHQty + "</span>";
+ }
return "<span>" + DayHQty + "</span>";
}
}
@@ -899,7 +1158,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -909,9 +1168,9 @@
}
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterModel").val(checkStatus.data[0].HModel);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) { }
@@ -927,7 +1186,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -937,19 +1196,44 @@
}
//鑾峰彇鏁版嵁
$("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
- $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ get_WriteConfigFile();
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
}
, btn2: function (index, layero) { }
})
}
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("JIT_DayPlanPlatForm_HWorkShop");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#HWorkShopID").val(data2["HWorkShopID"]);
+ $("#HWorkShopIDName").val(data2["HWorkShopIDName"]);
+ form.render('select');
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("JIT_DayPlanPlatForm_HWorkShop");
+ var data = {
+ HWorkShopID: $("#HWorkShopID").val()
+ , HWorkShopIDName: $("#HWorkShopIDName").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("JIT_DayPlanPlatForm_HWorkShop", JSON.stringify(data));
+ }
+
//蹇�熻繃婊�
function get_FastQuery(number) {
var HWorkShopID = 0;
var HProdORGID = 0;
+ HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (number == 2) {
- HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
}
@@ -1007,6 +1291,35 @@
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+
+ //蹇�熻繃婊�
+ function get_FastQuery_ICMO(number) {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HDeptName_ICMO = $("#HDeptName_ICMO").val();//鐢熶骇杞﹂棿
+ var HMaterName_ICMO = $("#HMaterName_ICMO").val();//鐗╂枡鍚嶇О
+ var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //鐢熶骇璁㈠崟
+
+ if (HDate) {
+ sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HDeptName_ICMO) {
+ sWhere_ICMO += " and 鐢熶骇杞﹂棿 like '%" + HDeptName_ICMO + "%'";
+ }
+ if (HMaterName_ICMO) {
+ sWhere_ICMO += " and concat(浜у搧浠g爜,浜у搧鍚嶇О,瑙勬牸鍨嬪彿) like '%" + HMaterName_ICMO + "%'";
+ }
+ if (HICMOBillNo_ICMO) {
+ sWhere_ICMO += " and 鍗曟嵁鍙� like '%" + HICMOBillNo_ICMO + "%'";
+ }
+
+ get_Display2(sWhere_ICMO);
+ sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
//鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
function btnrowDouble(obj) {
@@ -1048,6 +1361,19 @@
$("#Comparator").val("0");
form.render('select');
sWhere = "";
+ }
+
+ //閲嶇疆
+ function set_ClearQuery_ICMO() {
+ //$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
+ //$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+
+ $("#HDeptName_ICMO").val("");//鐢熶骇杞﹂棿
+ $("#HMaterName_ICMO").val("");//鐗╂枡鍚嶇О
+ $("#HICMOBillNo_ICMO").val(""); //鐢熶骇璁㈠崟
+
+ form.render('select');
+ sWhere_ICMO = "";
}
//榻愬鍒嗘瀽
@@ -1111,17 +1437,18 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- }
+ }
//鐢熶骇璁㈠崟閫夊崟
function get_btnICMOBill() {
+ var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '鐢熶骇璁㈠崟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes']
+ , content: ['../../鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?HDeptID=' + HDeptID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1152,7 +1479,13 @@
var data = table.cache["mainTable"];
var HICOMNum = [];
for (var i = 0; i < data.length; i++) {
- HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
+ if (isNaN(data[i]["HICMOInterID"])) {
+ return layer.msg("璇峰厛杩涜淇濆瓨!!")
+ }
+ if (isNaN(data[i]["HSourceID"])) {
+ return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ }
+ HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
}
$('#HProgressBar').html(`
<div class="layui-progress" lay-filter="demo-filter-progress">
@@ -1164,7 +1497,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
type: "GET",
- data: { "HICOMNum": HICOMNum.toString() },
+ data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
for (var i = 0; i < data1.data.length; i++) {
@@ -1214,7 +1547,7 @@
$('#HProgressBar').html('')
table.render(option);
-
+
} else {
//layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1226,6 +1559,51 @@
});
}
+ //宸ヨ壓璺嚎缂栬緫
+ function get_btnRoutEdit() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (CheckStatus.data.length == 1) {
+ var HSouceID = CheckStatus.data[0]["HSourceID"];
+ var HMaterID = CheckStatus.data[0]["HMaterID"];
+ var sWhere = " select a.HInterID from Gy_RoutingBillMain a inner join Gy_RoutingBillSub b on a.HInterID = b.HInterID and a.HStandard = 1 inner join Gy_Process p on b.HProcID = p.HItemID and HTProcessFlag = 0 inner join Gy_WorkCenter w on b.HCenterID = w.HItemID inner join(select HCenterID from Gy_Source where HItemID = " + HSouceID + ")s on s.HCenterID = w.HItemID where a.HMaterID = " + HMaterID;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.data.length == 0) {
+ return layer.msg("褰撳墠鐗╂枡娌℃湁宸ヨ壓璺嚎!璇锋煡鐪嬬墿鏂欐墍瀵瑰簲鐨勫伐浣滀腑蹇冩槸鍚︽纭�!");
+ } else {
+ var HInterID = data.data[0]["HInterID"];
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ })
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽伐鑹鸿矾绾跨紪杈�");
+ }
+ }
//鎺掍骇
function get_btnProPC(HWorkShopID) {
@@ -1257,13 +1635,15 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
- var ajaxLoad = layer.load();
-
+ var HReportQty = 0;
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
var HinterID_S = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["灏忔椂浜ц兘"] == "0") {
+ return layer.msg("璇峰厛鐐瑰嚮鍑嗗鎸夐挳,纭繚灏忔椂浜ц兘涓嶄负0!!!")
+ }
HinterID_S.push(option.data[i]["hmainid"]);
}
$.ajax({
@@ -1286,13 +1666,13 @@
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
$.ajax({
- url: GetWEBURL() +'/Gy_SOPBillList/UpDelSQL',
+ url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
async: false,
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
- HDelData = 1;
+
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -1301,275 +1681,293 @@
}
});
- get_FastQuery(2);
+ get_HFData(0, 0);
- if (HDelData == 1) {
- //鎸変换鍔″崟浼樺厛绾� 寰幆
- for (var i = 0; i < option.data.length; i++) {
- //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
- lMainID = option.data[i]["HICMOInterID"];
- sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
- dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
- sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
- sPlanQty = option.data[i]["璁″垝鏁伴噺"];
- lHGroupID = option.data[i]["HGroupID"];
- sGroupName = option.data[i]["HGroupName"];
- lMaterID = option.data[i]["HMaterID"];
- sMaterNumber = option.data[i]["鐗╂枡浠g爜"];
- sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
- sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
- sYX = option.data[i]["浼樺厛绾�"];
- //鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty;
- if (sWorkQty <= 0) {
- sLeftProdTimes = 0;
- }
- else {
- sLeftProdTimes = iLeftQty / sWorkQty;
- }
- //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
- if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = option.data[i]["HSourceID"];
- sSourceName = option.data[i]["鐢熶骇璧勬簮"];
- sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠g爜"];
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
- {
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
- {
- //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
- $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
- continue;
- }
- else {
- $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
- //寮�濮嬫帓鍗�
- bFind = false;
- //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
- if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
- {
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠g爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
- }
- if (dsSub != null)//涓嶅姞鐝帓绋�
- {
- iRow = i + 1;
- //灏嗘暟鎹帓鍒扮綉鏍间腑
- //grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- //Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, false, oClsGridValues);
- SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
- }
- bFind = true;
- }
- }
- }
- if (!bFind) {
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
- if (iLeftQty > 0) {
-
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- grdMain.RowCount = grdMain.RowCount + 1;
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠g爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
- bFind = true;
- }
- }
- }
-
- if (!bFind) {
- //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[ds.length - 1]["HitemID"];
- sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[ds.length - 1]["璧勬簮浠g爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
-
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
+ //鍒濆鍖栬〃鏍兼暟鎹�
+ for (var i = 0; i < option.data.length; i++) {
+ for (var j = (22 + HPlanDay); j < 53; j++) {
+ if (option.data[i][option.cols[0][j].field] != null) {
+ option.data[i][option.cols[0][j].field] = "";
}
}
- table.render(option);
-
- set_AddNew();
- } else {
- layer.msg("鏁版嵁娓呯┖澶辫触!")
}
- layer.close(ajaxLoad);
+
+ //get_FastQuery(2);
+
+ //鎸変换鍔″崟浼樺厛绾� 寰幆
+ for (var i = 0; i < option.data.length; i++) {
+ //鑾峰彇閿佸畾鐨勬帓浜ф暟閲�
+ var SDSum = 0;
+ if (HPlanDay > 0) {
+ for (var j = 22; j < (22 + HPlanDay); j++) {
+ SDSum += TableData[i][option.cols[0][j].field];
+ }
+ }
+
+ //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
+ lMainID = option.data[i]["HICMOInterID"];
+ sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
+ dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
+ sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
+ sPlanQty = option.data[i]["鎷嗗崟鏁伴噺"];
+ lHGroupID = option.data[i]["HGroupID"];
+ sGroupName = option.data[i]["HGroupName"];
+ lMaterID = option.data[i]["HMaterID"];
+ sMaterNumber = option.data[i]["鐗╂枡浠g爜"];
+ sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
+ sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
+ sWorkQty = option.data[i]["灏忔椂浜ц兘"];
+ sYX = option.data[i]["浼樺厛绾�"];
+ HReportQty = option.data[i]["鎷嗗崟姹囨姤鏁伴噺"];
+
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum - HReportQty;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty - HReportQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+ //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
+ if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = option.data[i]["HSourceID"];
+ sSourceName = option.data[i]["鐢熶骇璧勬簮"];
+ sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠g爜"];
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
+ {
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
+ {
+ get_HFData(1, i);
+ //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ continue;
+ }
+ else {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
+ //寮�濮嬫帓鍗�
+ bFind = false;
+ //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
+ for (var j = 0; j < ds.length; j++) {
+ //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
+ if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) >= sLeftProdTimes) {
+ if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
+ {
+ //鍦ㄦ湰璧勬簮涓婄敓浜�
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = ds[j]["HitemID"];
+ sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ sSourceNumber = ds[j]["璧勬簮浠g爜"];
+ option.data[i]["HSourceID"] = lSourceID;
+ option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
+
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dsSub = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ if (dsSub == null || dsSub.length == 0) {
+ get_HFData(1, i);
+ continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
+ }
+ if (dsSub != null)//涓嶅姞鐝帓绋�
+ {
+ iRow = i + 1;
+ //灏嗘暟鎹帓鍒扮綉鏍间腑
+ SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
+
+ set_AddNew1(option.data[i]);
+ }
+ bFind = true;
+ }
+ } else {
+ get_HFData(1, i);
+ }
+ }
+ //if (!bFind) {
+ // for (var j = 0; j < ds.length; j++) {
+ // //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
+ // if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
+ // if (iLeftQty > 0) {
+
+ // //鍦ㄦ湰璧勬簮涓婄敓浜�
+ // grdMain.RowCount = grdMain.RowCount + 1;
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[j]["HitemID"];
+ // sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[j]["璧勬簮浠g爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
+
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ // }
+ // bFind = true;
+ // }
+ // }
+ //}
+
+ //if (!bFind) {
+ // //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[ds.length - 1]["HitemID"];
+ // sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[ds.length - 1]["璧勬簮浠g爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠g爜"] = sSourceNumber;
+
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ //}
+ }
+ }
+ table.render(option);
+ }
+
+ var TableData = [];
+ function get_HFData(num,nums) {
+ if (num == 0) {
+ TableData = option.data;
+ } else {
+ option.data[nums] = TableData[nums];
+ if (nums == option.data.length-1) {
+ set_AddNew();
+ }
+ }
}
//灏嗘暟鎹帓绋嬪埌缃戞牸
@@ -1641,9 +2039,12 @@
//}
}
else {
- if (sLeftQty > parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"])) {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]);
- sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]));
+ var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
+ var Numzu = dayWorkQty.split('.');
+ dayWorkQty = Numzu[0] + 1;
+ if (sLeftQty > dayWorkQty) {
+ grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
+ sLeftQty = sLeftQty - dayWorkQty;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
@@ -1653,7 +2054,7 @@
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
@@ -1676,7 +2077,7 @@
else {
for (var i = 0; i < ds.length; i++) {
//鎵惧埌瀵瑰簲鐨勫垪
- for (var j = 22; j < grd.cols[0].length; j++) {
+ for (var j = 22; j < 53; j++) {
if (sLeftQty > 0) {
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) {
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
@@ -1734,24 +2135,33 @@
//}
}
else {
- if (sLeftQty > parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"])) {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
- sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
+ var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
+ var Numzu = dayWorkQty.toString().split(".");
+ if (Numzu.length > 1) {
+ dayWorkQty = parseInt(Numzu[0]) + 1;
+ } else {
+ dayWorkQty = parseInt(Numzu[0]);
+ }
+ if (sLeftQty > dayWorkQty) {
+ grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
+ sLeftQty = sLeftQty - dayWorkQty;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HUseTimes"] = ds[i]["鍓╀綑宸ユ椂"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j].field] = Math.round(sLeftQty * 10) / 10;
+ //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
@@ -1762,6 +2172,7 @@
}
}
}
+
}
}
@@ -1831,7 +2242,11 @@
//鍒犻櫎琛�
function set_DeleteBill() {
var CheckStatus = table.checkStatus("mainTable");
-
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
if (CheckStatus.data.length == 0) {
return layer.msg("璇烽�夋嫨鏁版嵁!")
} else {
@@ -1855,9 +2270,15 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ get_FastQuery(2);
////閲嶈浇tree
//tree.reload('treeDepartment', {});
+
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -1873,12 +2294,17 @@
function set_MoverUp(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[0]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ } else if (option.data[0]["hmainid"] == data[0]["hmainid"]) {
layer.msg("棣栬鏁版嵁鏃犳硶绉诲姩锛�");
} else {
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
var tables = [];
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[i]["hmainid"] == data[0]["hmainid"]) {
tables.push(option.data[i - 1]);
data[0].LAY_CHECKED = true;
option.data[i - 1] = data[0];
@@ -1887,6 +2313,11 @@
break;
}
}
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
}
}
@@ -1894,20 +2325,34 @@
function set_MoverDown(data) {
if (data.length != 1) {
layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
- } else if (option.data[option.data.length - 1]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
+ } else
+ if (option.data[option.data.length - 1]["hmainid"] == data[0]["hmainid"]) {
layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
} else {
+ var scrollTop = 0;
+ var layuiTable = $('.layui-table-main');
+ if (layuiTable != null && layuiTable.length > 0) {
+ scrollTop = layuiTable[0].scrollTop;
+ }
var tables = [];
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["鐢熶骇璁㈠崟鍙�"] == data[0]["鐢熶骇璁㈠崟鍙�"]) {
- tables.push(option.data[i + 1]);
- data[0].LAY_CHECKED = true;
- option.data[i + 1] = data[0];
+ if (option.data[i]["hmainid"] == data[0]["hmainid"]) {
+ var len = data.length;
+ tables.push(option.data[i + len]);
+ for (var j = 0; j < len; j++) {
+ data[j].LAY_CHECKED = true;
+ option.data[i + 1 + j] = data[j];
+ }
option.data[i] = tables[0];
table.render(option);
break;
}
}
+ setTimeout(function () {
+ if (layuiTable != null && layuiTable.length > 0) {
+ $('.layui-table-main').scrollTop(scrollTop)
+ }
+ }, 100)
}
}
@@ -1915,27 +2360,127 @@
function set_Priority() {
var data = table.cache["mainTable"];
for (var i = 0; i < data.length; i++) {
- data[i]["浼樺厛绾�"] = (i + 1);
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
}
option.data = data;
table.render(option);
+ }
+
+ //鍑嗗鎺掑簭
+ function set_ReadyAsc() {
+ if (option.data.length != 0) {
+ for (var i = 0; i < option.data.length - 1; i++) {
+ for (var j = 0; j < option.data.length - i - 1; j++) {
+ var tables = [];
+ //鎸夌収璁″垝缁撴潫鏃ユ湡 鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟鏄庣粏琛屽彿鐨勯『搴忓幓鎺�
+ if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] > option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] == option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鍙�"] > option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["鐢熶骇璁㈠崟鍙�"] == option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] > option.data[j + 1]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ }
+ }
+ }
+ }
+ }
+ table.render(option);
+ }
+ else {
+ return layer.msg("鏃犳暟鎹�!")
+ }
+ }
+
+ //閫変骇绾�
+ function set_Souce(data) {
+
+ //data1.data[j]["婧愬崟涓诲唴鐮�"] == dataPush[i]["婧愬崟涓诲唴鐮�"] && data1.data[j]["婧愬崟瀛愬唴鐮�"] == dataPush[i]["婧愬崟瀛愬唴鐮�"]
+ if (data != 0) {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "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("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData[0] = checkStatus.data[0];
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData.length > 0) {
+ var num = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (num >= data.length) {
+ break;
+ }
+ if (option.data[i]["LAY_CHECKED"] == true) {
+ option.data[i]["HSourceID"] = OptionData[0].HItemID;
+ option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
+ num += 1;
+ }
+ }
+ table.render(option);
+ }
+ //obj.update({
+ // "HSourceID": OptionData.HItemID
+ // , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
+ //})
+ }
+ })
+
+
+ }
+ else {
+ return layer.msg("璇烽�夋嫨鏁版嵁!")
+ }
}
//淇濆瓨
function set_AddNew() {
//鍒犻櫎瀛愯〃鏁版嵁 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
- var num = [];
+ var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
+ return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
+ }
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) - parseFloat(table.cache["mainTable"][i]["鎷嗗崟姹囨姤鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"])) { // - 宸叉眹鎶ユ暟閲�
+ return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
+ }
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
- }
+ }
//var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr +";" + sessionStorage["HUserName"];
+ var sMainSub = sSubStr +"&鍜�" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -1967,6 +2512,36 @@
});
}
+ function set_AddNew1(num) {
+
+ //var sMainStr = JSON.stringify(data.field);
+ var sSubStr = "["+JSON.stringify(num)+"]";
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("淇濆瓨鎴愬姛");
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//琛屽唴蹇嵎閿�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
@@ -1981,7 +2556,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=鐢熶骇绾�", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1991,6 +2566,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
+ OptionData = checkStatus.data[0];
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": checkStatus.data[0].HItemID
@@ -2067,6 +2643,270 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
+ }
+ }
+
+
+ //鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
+ function get_Display2(sWhere_ICMO) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/NotInDayPlan',
+ type: "GET",
+ data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ 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' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData_ICMO) > -1) {
+ 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: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option2 = {
+ elem: '#mainTable_ICMO'
+ , toolbar: '#toolbarDemo2'
+ , cols: [col]
+ , data: data1.data
+ , height: 400
+ , page: true
+ , limits: [200, 500, 5000, 50000]
+ , limit: 200
+ , cellMinWidth: 90
+ }
+ table.render(option2);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn_ICMO();
+
+ layer.close(ajaxLoad);
+ //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ //}
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏌ョ湅宸ヨ壓璺嚎
+ function set_Routing() {
+ var checkStatus = table.checkStatus('mainTable');
+ var ajaxLoad = layer.load();
+ if (checkStatus.data.length != 1) {
+ layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ } else {
+ var TabData = checkStatus.data;
+ var HMaterID = TabData[0].HMaterID;
+ var HMaterNumber = TabData[0].鐗╂枡浠g爜;
+ var HMaterName = TabData[0].鐗╂枡鍚嶇О;
+ var HMaterModel = TabData[0].瑙勬牸鍨嬪彿;
+ var HRoutingInterID = 0;//宸ヨ壓璺嚎涓诲唴鐮�
+ var HStandardQty = 0; //鐗╂枡榛樿宸ヨ壓璺嚎鏁伴噺
+ //鏍规嵁鐗╂枡ID 鏌ヨ褰撳墠鐗╂枡鏄惁瀛樺湪 榛樿鐨勫伐鑹鸿矾绾�
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetRoutingListByMater',
+ type: "GET",
+ data: { "HMaterID": HMaterID, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data
+ //鑾峰彇褰撳墠閫夋嫨鐗╂枡鐨勯粯璁ゅ伐鑹鸿矾绾� 涓诲唴鐮�
+ for (let i = 0; i < data.length; i++) {
+ if (data[i].HStandard == 1) {
+ HRoutingInterID = data[i].HInterID;
+ HStandardQty++;
+ }
+ }
+ if (HStandardQty > 1) {
+ layer.alert("褰撳墠鐗╂枡瀛樺湪澶氫釜榛樿宸ヨ壓璺嚎锛岃杩涜璋冩暣");
+ } else if (HStandardQty == 0) {
+ layer.alert("褰撳墠鐗╂枡娌℃湁璁剧疆榛樿宸ヨ壓璺嚎锛岃鍓嶅線宸ヨ壓璺嚎缁存姢椤甸潰璁剧疆榛樿宸ヨ壓璺嚎");
+ } else if (HStandardQty == 1) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HRoutingInterID + '&HSouceBillType=4610&IsHavingPermissions=' + data1.IsHavingPermissions
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+
+ //褰撳墠鐢ㄦ埛鏈夋柊澧為〉闈�
+ if (data1.IsHavingPermissions == 1) {
+ layer.confirm('褰撳墠鐗╂枡娌℃湁璁剧疆宸ヨ壓璺嚎,鏄惁璺宠浆鑷冲伐鑹鸿矾绾挎柊澧為〉闈紵', function (index) {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=' + HRoutingInterID + '&HSouceBillType=4610&HMaterID='+ HMaterID + '&HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+
+ //璁剧疆宸ュ巶鏃ュ巻
+ function set_Calendar() {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ巶鏃ュ巻'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html?OperationType=3'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ //鎺掍骇鍔熻兘
+ function set_Arrangement() {
+ var checkStatus = table.checkStatus('mainTable_ICMO')
+ , data = checkStatus.data;
+ if (checkStatus.data.length > 0) {
+ //var arr_field = [];
+ ////鑾峰彇宸叉帓璁㈠崟鍒楄〃瀛楁
+ //for (let i = 0; i < option_columns.length; i++) {
+ // if (option_columns[i].field != undefined && option_columns[i].field != null) {
+ // arr_field.push(option_columns[i].field);
+ // }
+ //}
+ //鎶婂凡鎺掕鍗曞垪琛ㄥ瓧娈靛瓨鍏bj瀵硅薄涓紝浠ヤ究缁欏瓧娈佃祴鍊�
+ //var obj = {};
+ //for (let i = 0; i < arr_field.length; i++) {
+ // var key = arr_field[i];
+ // var value = '';
+ // obj[key] = value;
+ //}
+ //鑾峰彇鍕鹃�変笂鐨勫緟鎺掔敓浜ц鍗�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var newObj = {
+ "HMaterID" : data[i].HMaterID,
+ "HProdORGID" : data[i].HPRDORGID,
+ "HUnitID" : data[i].HUnitID,
+ "HWorkShopID" : data[i].HDeptID,
+ "鎷嗗崟鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "婧愬崟涓诲唴鐮�" : data[i].hmainid,
+ "婧愬崟瀛愬唴鐮�" : data[i].HEntryID,
+ "鐗╂枡浠g爜" : data[i].浜у搧浠g爜,
+ "鐗╂枡鍚嶇О" : data[i].浜у搧鍚嶇О,
+ "鐢熶骇缁勭粐": data[i].鐢熶骇缁勭粐,
+ "鐢熶骇璁㈠崟鍗曟嵁绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
+ "鐢熶骇璁㈠崟鍙�" : data[i].鍗曟嵁鍙�,
+ "鐢熶骇璁㈠崟鏄庣粏琛屽彿" : data[i].HEntryID,
+ "鐢熶骇杞﹂棿" : data[i].鐢熶骇杞﹂棿,
+ "瑙勬牸鍨嬪彿" : data[i].瑙勬牸鍨嬪彿,
+ "璁″垝寮�濮嬫棩鏈�" : data[i].璁″垝寮�宸ユ棩鏈�,
+ "璁″垝鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "璁″垝缁撴潫鏃ユ湡" : data[i].璁″垝瀹屽伐鏃ユ湡,
+ "璁¢噺鍗曚綅" : data[i].璁¢噺鍗曚綅,
+ "璁㈠崟鍙帓鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "璁㈠崟绛夌骇" : data[i].璁㈠崟绛夌骇,
+ "璁㈠崟绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
+ "閿�鍞鍗曞彿" : data[i].閿�鍞鍗曞彿,
+ "閿�鍞鍗曟暟閲�" : data[i].閿�鍞暟閲�
+ }
+
+ option.data.push(newObj);
+ table.render(option)
+ }
+
+ //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+ var compareList = [];
+ for (var i = 0; i < option.data.length; i++) {
+ var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+ compareList.push(temp);
+ }
+
+ //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+ var tables = [];
+ for (var i = 0; i < option2.data.length; i++) {
+ var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+ if ($.inArray(temp, compareList) == -1) {
+ tables.push(option2.data[i]);
+ }
+ }
+ option2.data = tables;
+
+ //閲嶆柊娓叉煋瀛愯〃2
+ table.render(option2);
+
+ //var wait = layer.load();
+ ////閫昏緫鏂规硶
+ //$.ajax({
+ // url: GetWEBURL() + '/LEMS/ProcessExchangeArrangement_Add',
+ // type: "GET",
+ // data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // layer.msg(result.Message, { icon: 1 }, function () {
+ // // 寰楀埌frame绱㈠紩
+ // var index = layer.getFrameIndex(window.name);
+ // //鍏抽棴褰撳墠frame
+ // layer.close(wait);
+ // get_Display(" and HSourceID=" + DataSourceID);
+ // //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ // get_FastQuery();
+ // });
+ // } else {
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // layer.close(wait);
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // layer.close(wait);
+ // }
+ //});
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁锛�');
}
}
@@ -2188,10 +3028,128 @@
})
}
+ function get_HideColumn_ICMO() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option2.cols[0].length; i++) {
+ colName += option2.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + "Main" + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn_ICMO();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ function DisPlay_HideColumn_ICMO() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ /* var titleData_ICMO = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option2.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option2.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option2.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option2.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) == -1) {
+ option2.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option2.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option2.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option2.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option2.cols[0].length - 1; i++) {
+ if (option2.cols[0][i]["fixed"] != null) {
+ option2.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option2.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option2);
+ } else {
+ table.render(option2);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
- for (var i = 1; i < option.cols[0].length; i++) {
+ for (var i = 2; i < option.cols[0].length - 1; i++) {
if (option.cols[0][i].hide != true) {
Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
--
Gitblit v1.9.1