From 5b155f18c496a8f5d2572cf03d9f5ff22014dc13 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 03 十二月 2025 17:18:46 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 119 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 38 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 59a98c7..99c612f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -7,8 +7,8 @@
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <!--<script src="../../../layuiadmin/Scripts/json2.js"></script>-->
+ <!--<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>-->
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -17,7 +17,7 @@
</head>
<body>
<div class="layui-fluid">
- <div class="layui-col-md12">
+ <div class="layui-col-md13">
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
@@ -29,8 +29,8 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</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="btnLock" id="btnLock">閿佸畾</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">閿佸畾鐢宠</button>
<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>
@@ -250,10 +250,10 @@
</div>
</div>
<div id="HProgressBar"></div>
- <div class="layui-row" style="padding:10px 0">
+ <div class="layui-row" style="padding:0px 0">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
- <div class="resizable-container layui-tab layui-tab-card" style="margin-top:40px;">
+ <div class="resizable-container layui-tab layui-tab-card" style="margin-top: 40px; display: none;">
<ul class="layui-tab-title">
<li class="layui-this">鐢熶骇璁㈠崟</li>
<li>缂烘枡鍒嗘瀽</li>
@@ -312,14 +312,14 @@
<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_ReadyWorkQty"><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_Emp"><i class="layui-icon layui-icon-delete"></i>閫夋搷浣滃伐</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
- <script type="text/html" id="toolbarDemo2">
+ <!--<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>
@@ -331,7 +331,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn_Material"><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>
+ </script>-->
</form>
</div>
</div>
@@ -351,7 +351,7 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
soulTable: 'soulTable'
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -360,7 +360,6 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , excel = layui.excel
, soulTable = layui.soulTable
, element = layui.element;
var ins;
@@ -431,25 +430,29 @@
return layer.msg("鎷嗗崟鏁伴噺涓嶈兘涓�0!");
}
- if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"])) && obj.field == "鎷嗗崟鏁伴噺") {
obj.update({
- "鎷嗗崟鏁伴噺": "0"
+ "鎷嗗崟鏁伴噺": $(this).prev().text()
});
+
+ obj.tr.find('td[data-field=鎷嗗崟鏁伴噺] input').val($(this).prev().text()); // 杩欏彞浠ｇ爜鏄繀瑕佺殑鏇存柊鏄剧ず鍐呭
+
return layer.msg("鎷嗗崟鏁伴噺澶т簬璁㈠崟鏁伴噺!");
}
var NowDate = obj.field;
- if (dateHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ if (dateHQty > (parseInt(obj.data["鎷嗗崟鏁伴噺"]))) {
obj.update({
"鏃ヨ鍒掓暟閲忔�婚噺": dateHQty - obj.value,
[NowDate]: 0
});
- return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
+ obj.tr.find(`td[data-field=${NowDate}] input`).val(0); // 杩欏彞浠ｇ爜鏄繀瑕佺殑鏇存柊鏄剧ず鍐呭
+ return layer.msg("鎺掍骇鏁伴噺澶т簬鎷嗗崟鏁伴噺!")
}
- if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
- return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
- }
+ //if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+ // return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ //}
//淇敼鏁版嵁
@@ -592,8 +595,21 @@
layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
, btn1: function (index, layero) {
- get_btnReady(data);
- layer.close(index);
+ // 1. 鑾峰彇鈥滅‘瀹氣�濇寜閽苟娣诲姞鍔犺浇鍔ㄧ敾
+ var confirmBtn = $(layero).find('.layui-layer-btn0'); // 纭畾鎸夐挳
+ confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> 澶勭悊涓�...');
+ confirmBtn.prop('disabled', true);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁")
+ layer.close(index);
+ } else {
+ setTimeout(function () {
+ get_btnReady(data);
+ layer.close(index);
+ }, 5); // 寤惰繜鎵ц纭繚鎸夐挳鍥炬爣娓叉煋瀹�
+ }
+
+
}
})
break;
@@ -1073,7 +1089,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
get_FastQuery(2);
- get_FastQuery_ICMO();
+ //鐢熶骇璁㈠崟鏌ヨ
+ /*get_FastQuery_ICMO();*/
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
function setSelect_HArrangeProductDayQty() {
@@ -1094,9 +1111,10 @@
$("#HArrangeProductDayQty").empty();
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
- form.render('select');
+
$("#HArrangeProductDayQty").val("40");
+ form.render('select');
}
//#endregion
@@ -1676,7 +1694,7 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, filter: true, sort: true});
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, filter: true, sort: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, filter: true, sort: true});
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
@@ -1688,7 +1706,7 @@
columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
- columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, sort: true});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true, sort: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', filter: true, sort: true });
@@ -1715,7 +1733,7 @@
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, filter: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1741,11 +1759,11 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, title: "璁″垝鎶ヨ〃"
- , height: 'full-120'
+ , height: 'full-175'
, page: false
, cellMinWidth: 90
, cols: [columns]
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , limit: 5000//榛樿鏄剧ず鍏ㄩ儴
, contextmenu: {
// 琛ㄦ牸鍐呭鍙抽敭鑿滃崟閰嶇疆
body: [
@@ -1829,6 +1847,8 @@
//})
}
}
+
+ table.render(option);
}
//缂烘枡鍒嗘瀽琛ㄦ牸鏁版嵁
@@ -1865,7 +1885,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -1879,7 +1899,7 @@
}
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
- get_Display_1(HinterID_S);
+ /*get_Display_1(HinterID_S);*/
get_Display_2(HinterID_S);
}
@@ -2878,7 +2898,10 @@
SDSum += TableData[i][option.cols[0][j].field];
}
}
-
+ //璺宠繃 閿佸畾宸ュ崟
+ if (option.data[i].閿佸畾宸ュ崟 == "鏄�") {
+ continue;
+ }
//鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
lMainID = option.data[i]["HICMOInterID"];
sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
@@ -3606,13 +3629,21 @@
layer.confirm('浣犵‘瀹氳鎵ц浼樺厛绾ф搷浣滃悧锛�', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
, btn1: function (index, layero) {
+ // 1. 鑾峰彇鈥滅‘瀹氣�濇寜閽苟娣诲姞鍔犺浇鍔ㄧ敾
+ var confirmBtn = $(layero).find('.layui-layer-btn0'); // 纭畾鎸夐挳
+ confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> 澶勭悊涓�...');
+ confirmBtn.prop('disabled', true);
var data = table.cache["mainTable"];
for (var i = 0; i < data.length; i++) {
data[i]["浼樺厛绾�"] = ((i + 1) * 5);
}
option.data = data;
- table.render(option);
- layer.close(index);
+ setTimeout(function () {
+ table.reload('mainTable', { data: data });
+ layer.close(index);
+ }, 5); // 寤惰繜鎵ц纭繚鎸夐挳鍥炬爣娓叉煋瀹�
+
+
}
})
}
@@ -3622,6 +3653,10 @@
layer.confirm('浣犵‘瀹氳鎵ц鎺掑簭鎿嶄綔鍚楋紵', {
btn: ['纭畾', '鍙栨秷'] //鎸夐挳
, btn1: function (index, layero) {
+ // 1. 鑾峰彇鈥滅‘瀹氣�濇寜閽苟娣诲姞鍔犺浇鍔ㄧ敾
+ var confirmBtn = $(layero).find('.layui-layer-btn0'); // 纭畾鎸夐挳
+ confirmBtn.html('<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate"></i> 澶勭悊涓�...');
+ confirmBtn.prop('disabled', true);
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++) {
@@ -3652,12 +3687,16 @@
}
}
}
- table.render(option);
+ setTimeout(function () {
+ table.reload('mainTable', { data: option.data });
+ layer.close(index);
+ }, 5); // 寤惰繜鎵ц纭繚鎸夐挳鍥炬爣娓叉煋瀹�
}
else {
return layer.msg("鏃犳暟鎹�!")
+ layer.close(index);
}
- layer.close(index);
+
}
})
@@ -3683,10 +3722,14 @@
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
+ if (checkStatus.data.length == 1) {
+ OptionData[0] = checkStatus.data[0];
+ } else if (checkStatus.data.length == 0) {
+ //绛変簬0鏃舵竻绌虹敓浜ц祫婧�
+ OptionData[0] = { "HItemID": 0, "鐢熶骇璧勬簮鍚嶇О": "" };
+ } else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- OptionData[0] = checkStatus.data[0];
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
@@ -3776,7 +3819,7 @@
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]["鏃ヨ鍒掓暟閲忔�婚噺"])) { // - 宸叉眹鎶ユ暟閲�
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) > parseFloat(table.cache["mainTable"][i]["璁″垝鏁伴噺"])) { // - 宸叉眹鎶ユ暟閲�
return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
--
Gitblit v1.9.1