From 86edf5829b69a4cdd93ec443871f9d2ecb6702b2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 02 七月 2025 17:00:39 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 303 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 204 insertions(+), 99 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 6141465..1d42613 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"
@@ -2,13 +2,13 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鐢熶骇璁″垝鎺掍骇</title>
+ <title>涓夊崌鐢熶骇璁″垝鎺掍骇</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<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,25 +17,26 @@
</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">
<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="ExcelDateImport" id="ExcelDateImport">瀹屽伐鏃ユ湡瀵煎叆</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelDateImport" id="ExcelDateImport">浜ゆ湡瀵煎叆</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>
- <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="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>
<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="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</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>-->
@@ -249,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>
@@ -302,22 +303,23 @@
<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_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>
@@ -329,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>
@@ -348,7 +350,8 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
+ soulTable: 'soulTable'
+ }).use(['index', 'form', 'table', 'element', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -357,7 +360,6 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , excel = layui.excel
, soulTable = layui.soulTable
, element = layui.element;
var ins;
@@ -428,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("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ //}
//淇敼鏁版嵁
@@ -583,6 +589,29 @@
//鍑嗗鎺掑簭
case 'set_ReadyAsc':
set_ReadyAsc();
+ break;
+ //鍑嗗鍚屾浜ц兘
+ case 'set_ReadyWorkQty':
+ 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 (data.length <= 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁")
+ layer.close(index);
+ } else {
+ setTimeout(function () {
+ get_btnReady(data);
+ layer.close(index);
+ }, 5); // 寤惰繜鎵ц纭繚鎸夐挳鍥炬爣娓叉煋瀹�
+ }
+
+
+ }
+ })
break;
//閫変骇绾�
case 'set_Souce':
@@ -725,7 +754,16 @@
})
}
})
-
+ //瑕佹枡杩愮畻
+ form.on('submit(btnYLYS)', function (data) {
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnYLYS();
+ layer.close(index);
+ }
+ })
+ })
//鎻愭枡杩愮畻
form.on('submit(btnTLYS)', function (data) {
if (set_ModCheck("Sc_WorkBillSortBill_tlys") == true) {
@@ -1015,10 +1053,10 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Gy_Department/list',
+ url: GetWEBURL() + '/Gy_Department/cx',
type: "GET",
async: false,
- data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+ data: { "HInterID": HWorkShopID },
success: function (data1) {
if (data1.count == 1) {
$("#HWorkShopID").val(HWorkShopID);
@@ -1050,8 +1088,9 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery(1);
- get_FastQuery_ICMO();
+ get_FastQuery(2);
+ //鐢熶骇璁㈠崟鏌ヨ
+ /*get_FastQuery_ICMO();*/
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
function setSelect_HArrangeProductDayQty() {
@@ -1072,9 +1111,10 @@
$("#HArrangeProductDayQty").empty();
$("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
- form.render('select');
+
$("#HArrangeProductDayQty").val("40");
+ form.render('select');
}
//#endregion
@@ -1654,18 +1694,19 @@
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 });
columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, edit: 'text', filter: true, sort: true });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });//0
+ //0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, filter: true, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, filter: true, sort: true });//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>", filter: true, sort: true });
+ 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 });
@@ -1677,7 +1718,7 @@
for (var i = 0; i < HArrangeProductDayQty; i++) {
columns.push(dateColumns[i]);//0
}
-
+ 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 });
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
@@ -1692,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, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", 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 });
@@ -1712,17 +1753,43 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text' });
columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, filter: true });//0
- columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+ columns.push({ fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-120'
+ , title: "璁″垝鎶ヨ〃"
+ , height: 'full-175'
, page: false
, cellMinWidth: 90
, cols: [columns]
- , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , even: true
+ , limit: 5000//榛樿鏄剧ず鍏ㄩ儴
+ , contextmenu: {
+ // 琛ㄦ牸鍐呭鍙抽敭鑿滃崟閰嶇疆
+ body: [
+ {
+ name: '澶嶅埗',
+ icon: 'layui-icon layui-icon-template',
+ click: function (obj) {
+ soulTable.copy(obj.text)
+ layer.msg('澶嶅埗鎴愬姛锛�')
+ }
+ },
+ {
+ name: '琛�-钃濊壊',
+ click: function (obj) {
+ obj.trElem.css('background', '#01AAED')
+ }
+ },
+ {
+ name: '绾㈣壊',
+ click: function (obj) {
+ obj.elem.css('color', 'red')
+ }
+ }
+ ]
+ }
+ , even: true//琛屾嫋鎷�
, rowDrag: {/*trigger: 'row',*/
done: function (obj) {
// 瀹屾垚鏃讹紙鏉惧紑鏃讹級瑙﹀彂
@@ -1751,17 +1818,17 @@
}
, done: function (res, page, count) {
soulTable.render(this);
- $('.layui-table thead').on('click', 'th', function () {
- // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
- var field = $(this).data('field');
- set_InitGrid1(field);
- sWhere = {
- HORGID: sessionStorage["OrganizationID"]
- , HBEGINDATE: field
- , HENDDATE: field
- }
- //get_Display_3(JSON.stringify(sWhere));
- });
+ //$('.layui-table thead').on('click', 'th', function () {
+ // // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
+ // var field = $(this).data('field');
+ // set_InitGrid1(field);
+ // sWhere = {
+ // HORGID: sessionStorage["OrganizationID"]
+ // , HBEGINDATE: field
+ // , HENDDATE: field
+ // }
+ // //get_Display_3(JSON.stringify(sWhere));
+ //});
//res.data.forEach(function (item, index) {
// if (data1.data.DataColor != undefined) {
// var sj = data1.data.DataColor;
@@ -1780,6 +1847,8 @@
//})
}
}
+
+ table.render(option);
}
//缂烘枡鍒嗘瀽琛ㄦ牸鏁版嵁
@@ -1816,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) {
@@ -1830,12 +1899,8 @@
}
layer.close(ajaxLoad);
if (HinterID_S.length > 0) {
- get_Display_1(HinterID_S);
- get_Display_2(HinterID_S)
- }
-
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
+ /*get_Display_1(HinterID_S);*/
+ get_Display_2(HinterID_S);
}
} else {
@@ -1855,7 +1920,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": HinterID_S.toString(),"num":1 },
success: function (data1) {
if (data1.count == 1) {
@@ -1921,7 +1986,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": HinterID_S.toString(), "num": 2 },
success: function (data1) {
if (data1.count == 1) {
@@ -2028,7 +2093,7 @@
, area: ['100%', '100%']
, title: 'Excel瀵煎叆'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html?OperationType=1'
+ , content: '../涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS_Sec.html?OperationType=1'
, end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -2041,7 +2106,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: 'Excel瀵煎叆'
+ , title: '浜ゆ湡瀵煎叆'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS.html?OperationType=1'
, end: function () {
@@ -2367,7 +2432,33 @@
}
});
}
-
+ //瑕佹枡杩愮畻
+ function get_btnYLYS() {
+ sWhere = {
+ HProdORGID: $("#HProdORGID").val()
+ , HWorkShopID: $("#HWorkShopID").val()
+ }
+ sWhere = JSON.stringify(sWhere);
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ get_FastQuery(2);
+ layer.msg(data1.Message);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//鎻愭枡杩愮畻
function get_btnTLYS() {
if ($("#HWorkShopID").val() == 0) {
@@ -2541,10 +2632,10 @@
//鍑嗗
- function get_btnReady() {
- var data = table.cache["mainTable"];
+ function get_btnReady(data) {
+ /*var data = table.cache["mainTable"];*/
var HTotalDataList = [[]];
-
+ var ajaxData;
var index = 0;
var countEveryGroup = 50;
for (var i = 0; i < data.length; i++) {
@@ -2552,7 +2643,8 @@
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
if (isNaN(data[i]["HSourceID"])) {
- return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ data[i]["HSourceID"] = 0
+ /*return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")*/
}
if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
@@ -2572,22 +2664,26 @@
HICOMNum = HTotalDataList[t];
$.ajax({
- url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData_SS',
async: false,
type: "GET",
data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
+ ajaxData = data1.data;
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]["HSourceID"] = data1.data[i]["HSourceID"];
+ 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;
}
}
@@ -2637,10 +2733,10 @@
}
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) {
+ /*set_Priority();*/
+ /*data = table.cache["mainTable"];*/
+ for (var i = 0; i < ajaxData.length; i++) {
+ if (parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == null || parseFloat(ajaxData[i]["灏忔椂浜ц兘"]) == undefined) {
msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
}
@@ -2762,7 +2858,7 @@
});
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
- 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 + " and HLockOrder != 1 )";
+ 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 + " and HLockOrder != 1 ) or HMasterDate < CAST(GETDATE() AS DATE)";
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
@@ -2927,8 +3023,10 @@
iRow = i + 1;
//灏嗘暟鎹帓鍒扮綉鏍间腑
SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
-
- set_AddNew1(option.data[i]);
+ //鑻ュ伐鍗曡閿佸畾浜嗚烦杩囦繚瀛樺唴瀹�
+ if (option.data[i]["閿佸畾宸ュ崟"] == "鍚�") {
+ set_AddNew1(option.data[i]);
+ }
}
bFind = true;
}
@@ -3528,13 +3626,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); // 寤惰繜鎵ц纭繚鎸夐挳鍥炬爣娓叉煋瀹�
+
+
}
})
}
@@ -3544,6 +3650,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++) {
@@ -3574,12 +3684,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);
+
}
})
@@ -3605,10 +3719,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 () {
@@ -3618,7 +3736,8 @@
if (num >= data.length) {
break;
}
- if (option.data[i]["LAY_CHECKED"] == true) {
+ if ($.grep(data, function (item) {
+ return item.hmainid === option.data[i].hmainid;}).length > 0) {
option.data[i]["HSourceID"] = OptionData[0].HItemID;
option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
num += 1;
@@ -3697,7 +3816,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;
@@ -4136,7 +4255,6 @@
, limit: 200
, cellMinWidth: 90
}
- table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn_ICMO();
@@ -4385,6 +4503,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
+ async: false,
data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -4455,9 +4574,9 @@
option2.cols[0][i + 1]["fixed"] = "left";
}
}
- table.render(option2);
+ /*table.render(option2);*/
} else {
- table.render(option2);
+ /*table.render(option2);*/
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -4564,20 +4683,6 @@
})
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
- function ColFilter() {
- var Organization = '<option value="0" selected="selected" ></option>';
- 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>';
- }
- }
- $("#ColName").empty();
- $("#ColName").append(Organization);$("#ColName1").empty();
- $("#ColName1").append(Organization);$("#ColName2").empty();
- $("#ColName2").append(Organization);
- form.render('select');
- }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
--
Gitblit v1.9.1