From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库：子表件数可以输入为0 乔一客户物料即时库存报表：把米数和件数的合计加上去 （按生产订单）客户订单：过滤条件改为模糊查询
---
WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 c702df4..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>
@@ -33,9 +54,9 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">瑙ｉ攣鐢宠</button>
<!--<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="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="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,40];
- var titleList = ["7澶�", "鏈湀","31澶�","40澶�"];
+ 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
@@ -1463,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) { // 鎺掑簭浜嬩欢
@@ -1758,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();
@@ -2443,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