From e57b2edbffff5a653ba9eda65eae100ceb2e7822 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 九月 2025 16:16:41 +0800
Subject: [PATCH] 乔一：客户物料即时库存报表、客户手工抄包报表
---
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 398 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 286 insertions(+), 112 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 94ef871..a5288ca 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -13,6 +13,26 @@
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ .loader {
+ border: 8px solid #f3f3f3; /* Light grey */
+ border-top: 8px solid #3498db; /* Blue */
+ border-radius: 50%;
+ width: 50px;
+ height: 50px;
+ animation: spin 2s linear infinite;
+ }
+
+ @keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -22,6 +42,7 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Excel_DayImport" id="Excel_DayImport">鏃ヨ鍒掓粴鍔ㄥ鍏�</button>
<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="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
@@ -34,8 +55,8 @@
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙ｉ攣宸ュ崟</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">娆犳枡杩愮畻</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">娆犳枡杩愮畻</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 resizable-container">
@@ -644,6 +665,11 @@
btnExcelImport();
});
+ //鏃ヨ鍒掓粴鍔ㄥ鍏�
+ form.on('submit(Excel_DayImport)', function () {
+ btnExcel_DayImport();
+ });
+
//淇濆瓨
form.on('submit(btnSave)', function (data) {
var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
@@ -783,7 +809,7 @@
shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
});
setTimeout(function () {
get_btnProPC(HWorkShopID);
@@ -1057,8 +1083,8 @@
var lastDay = new Date(year, month, 0).getDate(); //褰撴湀鏈�鍚庝竴澶�
var thisDay = new Date().getDay(); //褰撳ぉ鏄湰鏈堢鍑犲ぉ
- var valueList = [7, lastDay - thisDay+1,31,34];
- var titleList = ["7澶�", "鏈湀","31澶�","34澶�"];
+ var valueList = [7, lastDay - thisDay+1,31,40,50];
+ var titleList = ["7澶�", "鏈湀","31澶�","40澶�","50澶�"];
var HArrangeProductDayQty_ArrayList = '';
for (var i = 0; i < valueList.length; i++) {
@@ -1069,7 +1095,7 @@
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
form.render('select');
- $("#HArrangeProductDayQty").val("7");
+ $("#HArrangeProductDayQty").val("40");
}
//#endregion
@@ -1080,175 +1106,272 @@
var oneday = 1000 * 60 * 60 * 24;
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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], 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) {
+ 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')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 31 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+ field: Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 31 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 31 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 32 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+ field: Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 32 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 32 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'));
}
})//0
columns.push({
- field: Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 33 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+ field: Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 33 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
return DayColor(d[Format(myDate.getTime() + 33 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'));
}
})//0
+
+
+
+
+ columns.push({
+ field: Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 34 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 34 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 35 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 35 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 36 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 36 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 37 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 37 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 38 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 38 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 39 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 39 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 40 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 40 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+ columns.push({
+ field: Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 41 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 41 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 42 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 42 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 43 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 43 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 44 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 44 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 45 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 45 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 46 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 46 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 47 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 47 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 48 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 48 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 49 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 49 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+ columns.push({
+ field: Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 50 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+ return DayColor(d[Format(myDate.getTime() + 50 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'));
+ }
+ })//0
+
+
return columns;
}
//#endregion
@@ -1366,7 +1489,19 @@
console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
- option.data = table.cache["mainTable"];
+
+ var data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+ }
+ option.data = data;
+
+ table.reload('mainTable', {
+ data: option.data
+ });
+
+ //table.render(option);
+ //option.data = table.cache["mainTable"];
}
}
, sort: function (obj) { // 鎺掑簭浜嬩欢
@@ -1661,6 +1796,22 @@
, title: 'Excel瀵煎叆'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html?OperationType=1'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ }
+
+ //鏃ヨ鍒掓粴鍔ㄥ鍏�
+ function btnExcel_DayImport() {
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鏃ヨ鍒掓粴鍔ㄥ鍏�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../瀹濆伐鎺掍骇/JIT_DayPlanPlatForm_DayImport.html?OperationType=1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -2160,7 +2311,10 @@
//鍑嗗
function get_btnReady() {
var data = table.cache["mainTable"];
- var HICOMNum = [];
+ var HTotalDataList = [[]];
+
+ var index = 0;
+ var countEveryGroup = 50;
for (var i = 0; i < data.length; i++) {
if (isNaN(data[i]["HICMOInterID"])) {
return layer.msg("璇峰厛杩涜淇濆瓨!!")
@@ -2168,86 +2322,101 @@
if (isNaN(data[i]["HSourceID"])) {
return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
}
- HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
+
+ if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
+ HTotalDataList.push([]);
+ }
+ HTotalDataList[(index / countEveryGroup).toFixed(0) * 1].push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
+ index++;
}
- $('#HProgressBar').html(`
- <div class="layui-progress" lay-filter="demo-filter-progress">
- <div class="layui-progress-bar" lay-percent="40%"></div>
- </div>
- `);
- // 娓叉煋杩涘害鏉＄粍浠�
- element.render('progress', 'demo-filter-progress');
- $.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
- type: "GET",
- data: { "SWhere": HICOMNum.toString() },
- success: function (data1) {
- if (data1.count == 1) {
- for (var i = 0; i < data1.data.length; i++) {
- for (var j = 0; j < option.data.length; j++) {
- if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
- option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
- option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
- option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
- option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
- option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
- option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
- option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
- break;
- }
- }
- }
+ var msg = "";
+ for (var t = 0; t < HTotalDataList.length; t++) {
+ $('#HProgressBar').html('');
+ var str = '<div class="layui-progress" lay-filter="demo-filter-progress"> <div class="layui-progress-bar" lay-percent="' + (t / HTotalDataList.length)*100 + '%"></div></div>';
+ $('#HProgressBar').html(str);
+ // 娓叉煋杩涘害鏉＄粍浠�
+ element.render('progress', 'demo-filter-progress');
- 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];
-
- }
+ HICOMNum = HTotalDataList[t];
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+ async: false,
+ type: "GET",
+ data: { "SWhere": HICOMNum.toString() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ for (var i = 0; i < data1.data.length; i++) {
+ for (var j = 0; j < option.data.length; j++) {
+ if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
+ option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
+ option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
+ option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
+ option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
+ option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
+ option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
+ option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
+ break;
}
}
}
- }
- $('#HProgressBar').html('')
- table.render(option);
- set_Priority();
- data = table.cache["mainTable"];
- for (var i = 0; i < data.length; i++) {
- if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
- return layer.alert("绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�');
- }
- }
+ //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]["鏈�杩熷畬宸ユ棩鏈�"]) {
- } else {
- //layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ // 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];
+
+ // }
+ // }
+ // }
+ // }
+ //}
+
+ } else {
+ //layer.close(ajaxLoad);
+ //layer.alert(data1.code + data1.Message, { icon: 5 });
+
+ msg += data1.Message;
+ }
+ }, error: function (e) {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ return;
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ });
+ }
+
+ table.render(option);
+ set_Priority();
+ data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
- });
+ }
+
+ if (msg != "") {
+ layer.alert(msg, { icon: 5 });
+ }
+ $('#HProgressBar').html('')
}
//宸ヨ壓璺嚎缂栬緫
@@ -2328,6 +2497,11 @@
var HJDLen = 0;
var HReportQty = 0;
+ if (set_ModCheck("Sc_WorkBillSortBill_Edit") == false) {
+ return layer.msg("鏃犳帓浜ф潈闄�!!!")
+ }
+
+
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
var HinterID_S = [];
--
Gitblit v1.9.1