From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 192 ++++++++++++++++++++++++++++++++----------------
1 files changed, 128 insertions(+), 64 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..f48231c 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,7 +2,7 @@
<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">
@@ -23,11 +23,11 @@
<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>
@@ -36,6 +36,7 @@
<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>-->
@@ -302,13 +303,14 @@
<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_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -348,6 +350,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ soulTable: 'soulTable'
}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable','jquery'], function () {
//#region 鍏敤鍙橀噺
@@ -584,6 +587,16 @@
case 'set_ReadyAsc':
set_ReadyAsc();
break;
+ //鍑嗗鍚屾浜ц兘
+ case 'set_ReadyWorkQty':
+ layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+ btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+ , btn1: function (index, layero) {
+ get_btnReady(data);
+ layer.close(index);
+ }
+ })
+ break;
//閫変骇绾�
case 'set_Souce':
set_Souce(data);
@@ -725,7 +738,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 +1037,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,7 +1072,7 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- get_FastQuery(1);
+ get_FastQuery(2);
get_FastQuery_ICMO();
}
//#region 鍒濆鍖栦笅鎷夊垪琛� 鎺掍骇鏃堕棿
@@ -1659,11 +1681,12 @@
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, edit: 'text', filter: true, sort: true });
@@ -1677,7 +1700,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 +1715,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, filter: true, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1712,7 +1735,7 @@
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'
@@ -1722,7 +1745,32 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- , even: true
+ , 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 +1799,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;
@@ -1831,11 +1879,7 @@
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_2(HinterID_S);
}
} else {
@@ -1855,7 +1899,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 +1965,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 +2072,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 +2085,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 +2411,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 +2611,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 +2622,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 +2643,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 +2712,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.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
}
}
@@ -2927,8 +3002,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;
}
@@ -3618,7 +3695,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;
@@ -4136,7 +4214,6 @@
, limit: 200
, cellMinWidth: 90
}
- table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn_ICMO();
@@ -4385,6 +4462,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 +4533,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 +4642,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