From b22b27bdac918e717def68d5b0bdecb6c953ee61 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 28 十二月 2023 11:03:39 +0800
Subject: [PATCH] 生产计划平台下方选生产订单功能，生产汇报单编辑修改，报工时改为勾选一条数据 其余数据由系统自动带出
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 8
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html | 39 +++---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 257 +++++++++++++++++++++---------------------
3 files changed, 154 insertions(+), 150 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index b568186..63ca205 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -368,28 +368,27 @@
form.on('submit(ProdReport)', function (data) {
var checkStatus = table.checkStatus('mainTable');
var TabData = checkStatus.data;
- var HInterID = [];
+ var HInterID = TabData[0].HInterID;
- for (let i = 0; i < TabData.length;i++) {
- HInterID.push(TabData[i].HInterID);
- }
+ if (checkStatus.data.length != 1) {
+ layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!鍚屼竴璁㈠崟鐨勭敓浜ф暟閲忓皢鐢辩郴缁熷垽鏂苟鑷姩甯﹀嚭銆�");
+ } else {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇姹囨姤鍗�-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?OperationType=2&linterid=' + HInterID.toString() + '&HSouceBillType=' + 3724, 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ , end: function () {
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鐢熶骇姹囨姤鍗�-缂栬緫'
- , shade: 0.6
- , maxmin: false
- , anim: 0
- , content: ['../鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html?OperationType=2&linterid=' + HInterID.toString() + '&HSouceBillType=' + 3724, 'yes']
- , resize: false
- , cancel: function () {
- }
- , end: function () {
-
- }
- })
-
+ }
+ })
+ }
})
//閫�鍑�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 0cb8b35..9829060 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -512,7 +512,7 @@
if (OperationType == 1 || OperationType == 2) {
refSav = "Add";
}
- if (linterid == 3) {
+ if (OperationType == 3) {
refSav = "Update";
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
@@ -913,7 +913,9 @@
option_prodReport = {
id: 'mainTable_prodReport'
, elem: '#mainTable_prodReport'
- , page: false
+ , page: true
+ , limit: 1000
+ , limits: [500,1000,1500,2000,3000]
, cellMinWidth: 120
, height: 500
, cols: [columns_prodReport]
@@ -994,7 +996,7 @@
"HMaterID": data[i].鐗╂枡ID, "HMaterCode": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterSpec": data[i].瑙勬牸鍨嬪彿,
"HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
"HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkerid": data[i].鎿嶄綔鍛業D, "HWorkerCode": data[i].鎿嶄綔鍛樹唬鐮�,
- "HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
+ "HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺 == '' ? 0 : data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
"HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": ""
});
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 862b6fb..6a6f012 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -191,25 +191,37 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:120px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:120px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杞﹂棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input" name="HDeptName_ICMO" id="HDeptName_ICMO">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input" name="HMaterName_ICMO" id="HMaterName_ICMO">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
+ <input type="text" class="layui-input" name="HICMOBillNo_ICMO" id="HICMOBillNo_ICMO">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch_ICMO" id="btnSearch_ICMO">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_ICMO" id="btnReSearch_ICMO">閲嶇疆</button>
<!--寰呮帓璁㈠崟-->
<table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
</div>
@@ -232,7 +244,7 @@
<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_HideColumn2"><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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -274,6 +286,7 @@
var HModName = "JIT_DayPlanPlatForm";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = [];
+ var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID","HSourceID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -364,6 +377,25 @@
}
//mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+
+ table.on('row(mainTable_ICMO)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable_ICMO 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable_ICMO, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
}
@@ -475,8 +507,8 @@
parent.layui.admin.events.closeThisTabs();
break;
//鍒楄缃�
- case 'set_HideColumn2':
- get_HideColumn2();
+ case 'set_HideColumn_ICMO':
+ get_HideColumn_ICMO();
break;
};
});
@@ -513,9 +545,19 @@
get_FastQuery(2);
});
+ //蹇�熻繃婊�
+ form.on('submit(btnSearch_ICMO)', function (data) {
+ get_FastQuery_ICMO(2);
+ });
+
//閲嶇疆
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
+ });
+
+ //閲嶇疆
+ form.on('submit(btnReSearch_ICMO)', function (data) {
+ set_ClearQuery_ICMO();
});
//榻愬鍒嗘瀽
@@ -617,6 +659,9 @@
$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMastersDate").val("");
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
get_ReadConfigFile();
//缁勭粐
Organ();
@@ -1207,67 +1252,32 @@
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
-
+
//蹇�熻繃婊�
function get_FastQuery_ICMO(number) {
- var HWorkShopID = 0;
- var HProdORGID = 0;
- HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
- if (number == 2) {
- if (HWorkShopID == 0) {
- return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
- }
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HDeptName_ICMO = $("#HDeptName_ICMO").val();//鐢熶骇杞﹂棿
+ var HMaterName_ICMO = $("#HMaterName_ICMO").val();//鐗╂枡鍚嶇О
+ var HICMOBillNo_ICMO = $("#HICMOBillNo_ICMO").val(); //鐢熶骇璁㈠崟
- HProdORGID = $("#HProdORGID").val();//鐢熶骇璁㈠崟缁勭粐
+ if (HDate) {
+ sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
- if (number == 1) {
- HProdORGID = sessionStorage["OrganizationID"];//鐢熶骇璁㈠崟缁勭粐
+ if (HDate1) {
+ sWhere_ICMO += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
- var HPlanBeginDate = $("#HPlanBeginDate").val();//寮�宸ヨ捣濮嬫棩鏈�
- var HPlanEndDate = $("#HPlanEndDate").val();//寮�宸ユ埅姝㈡棩鏈�
- var HMastersDate = $("#HMastersDate").val();//鎺掍骇鏃ユ湡
- var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
- var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
- var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
- var sWhere_ICMO = "";
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like''%" + ColContent + "%''";
- break;
- case "8":
- com = "like''%" + ColContent + "''";
- break;
- case "9":
- com = "like''" + ColContent + "%''";
- break;
- case "10":
- com = "not like''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + "''" + ColContent + "''";
- break;
- }
- sWhere_ICMO += " and [" + ColName + "] " + com;
+ if (HDeptName_ICMO) {
+ sWhere_ICMO += " and 鐢熶骇杞﹂棿 like '%" + HDeptName_ICMO + "%'";
+ }
+ if (HMaterName_ICMO) {
+ sWhere_ICMO += " and concat(浜у搧浠ｇ爜,浜у搧鍚嶇О,瑙勬牸鍨嬪彿) like '%" + HMaterName_ICMO + "%'";
+ }
+ if (HICMOBillNo_ICMO) {
+ sWhere_ICMO += " and 鍗曟嵁鍙� like '%" + HICMOBillNo_ICMO + "%'";
}
- sWhere_ICMO = {
- HPlanBeginDate: HPlanBeginDate
- , HProdORGID: HProdORGID
- , HSeOrderBillNo: HSeOrderBillNo
- , HPlanEndDate: HPlanEndDate
- , HMaterID: HMaterID
- , HICMOBillNo: HICMOBillNo
- , HWorkShopID: HWorkShopID
- , HMastersDate: HMastersDate
- , sWheres: sWheres
- }
- get_Display2(JSON.stringify(sWhere_ICMO));
+ get_Display2(sWhere_ICMO);
sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1313,24 +1323,16 @@
form.render('select');
sWhere = "";
}
-
+
//閲嶇疆
function set_ClearQuery_ICMO() {
- $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
- $("#HSeOrderBillNo").val("");//閿�鍞鍗曞彿
- $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
- $("#HMastersDate").val("");//鎺掍骇鏃ユ湡
- $("#HMaterID").val("0");//鐗╂枡缂栫爜id
- $("#HMaterNumber").val("");//鐗╂枡缂栫爜
- $("#HMaterName").val("");//鐗╂枡鍚嶇О
- $("#HMaterModel").val("");//瑙勬牸鍨嬪彿
- $("#HICMOBillNo").val("");//鐢熶骇璁㈠崟鍙�
- $("#HWorkShopID").val("0");//鐢熶骇杞﹂棿id
- $("#HWorkShopIDName").val("");//鐢熶骇杞﹂棿
- $("#HProdORGID").val(sessionStorage["OrganizationID"])//鐢熶骇璁㈠崟缁勭粐
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
+ //$("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
+ //$("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ユ埅姝㈡棩鏈�
+
+ $("#HDeptName_ICMO").val("");//鐢熶骇杞﹂棿
+ $("#HMaterName_ICMO").val("");//鐗╂枡鍚嶇О
+ $("#HICMOBillNo_ICMO").val(""); //鐢熶骇璁㈠崟
+
form.render('select');
sWhere_ICMO = "";
}
@@ -2559,7 +2561,7 @@
function get_Display2(sWhere_ICMO) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ url: GetWEBURL() + '/Sc_ICMOBill/NotInDayPlan',
type: "GET",
data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -2574,7 +2576,7 @@
col.push({ type: 'checkbox', fixed: 'left' });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
+ if ($.inArray(data[i].name, titleData_ICMO) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
else {
@@ -2597,14 +2599,14 @@
, data: data1.data
, height: 400
, page: true
- , limits: [50, 500, 5000, 50000]
+ , limits: [200, 500, 5000, 50000]
, limit: 200
, cellMinWidth: 90
}
table.render(option2);
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn2();
+ DisPlay_HideColumn_ICMO();
layer.close(ajaxLoad);
//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2627,49 +2629,50 @@
var checkStatus = table.checkStatus('mainTable_ICMO')
, data = checkStatus.data;
if (checkStatus.data.length > 0) {
- console.log(option.data);
- var arr_field = [];
- //鑾峰彇宸叉帓璁㈠崟鍒楄〃瀛楁
- for (let i = 0; i < option_columns.length; i++) {
- if (option_columns[i].field != undefined && option_columns[i].field != null) {
- arr_field.push(option_columns[i].field);
- }
- }
+ //var arr_field = [];
+ ////鑾峰彇宸叉帓璁㈠崟鍒楄〃瀛楁
+ //for (let i = 0; i < option_columns.length; i++) {
+ // if (option_columns[i].field != undefined && option_columns[i].field != null) {
+ // arr_field.push(option_columns[i].field);
+ // }
+ //}
//鎶婂凡鎺掕鍗曞垪琛ㄥ瓧娈靛瓨鍏bj瀵硅薄涓紝浠ヤ究缁欏瓧娈佃祴鍊�
- var obj = {};
- for (let i = 0; i < arr_field.length; i++) {
- var key = arr_field[i];
- var value = '';
- obj[key] = value;
- }
+ //var obj = {};
+ //for (let i = 0; i < arr_field.length; i++) {
+ // var key = arr_field[i];
+ // var value = '';
+ // obj[key] = value;
+ //}
//鑾峰彇鍕鹃�変笂鐨勫緟鎺掔敓浜ц鍗�
for (var i = 0; i < checkStatus.data.length; i++) {
- obj.HMaterID = data[i].HMaterID;
- obj.HProdORGID = data[i].HPRDORGID;
- obj.HUnitID = data[i].HUnitID;
- obj.HWorkShopID = data[i].HDeptID;
- obj.鎷嗗崟鏁伴噺 = data[i].鐢熶骇浠诲姟鍗曟暟閲�;
- obj.婧愬崟涓诲唴鐮� = data[i].hmainid;
- obj.婧愬崟瀛愬唴鐮� = data[i].HEntryID;
- obj.鐗╂枡浠ｇ爜 = data[i].浜у搧浠ｇ爜;
- obj.鐗╂枡鍚嶇О = data[i].浜у搧鍚嶇О;
- obj.鐢熶骇缁勭粐 = "鏅轰簯杩堟��";
- obj.鐢熶骇璁㈠崟鍗曟嵁绫诲瀷 = data[i].鍗曟嵁绫诲瀷;
- obj.鐢熶骇璁㈠崟鍙� = data[i].鍗曟嵁鍙�;
- obj.鐢熶骇璁㈠崟鏄庣粏琛屽彿 = data[i].HEntryID;
- obj.鐢熶骇杞﹂棿 = data[i].鐢熶骇杞﹂棿;
- obj.瑙勬牸鍨嬪彿 = data[i].瑙勬牸鍨嬪彿;
- obj.璁″垝寮�濮嬫棩鏈� = data[i].璁″垝寮�宸ユ棩鏈�;
- obj.璁″垝鏁伴噺 = data[i].鐢熶骇浠诲姟鍗曟暟閲�;
- obj.璁″垝缁撴潫鏃ユ湡 = data[i].璁″垝瀹屽伐鏃ユ湡;
- obj.璁￠噺鍗曚綅 = data[i].璁￠噺鍗曚綅;
- obj.璁㈠崟鍙帓鏁伴噺 = data[i].鐢熶骇浠诲姟鍗曟暟閲�;
- obj.璁㈠崟绛夌骇 = data[i].璁㈠崟绛夌骇;
- obj.璁㈠崟绫诲瀷 = data[i].鍗曟嵁绫诲瀷;
- obj.閿�鍞鍗曞彿 = data[i].閿�鍞鍗曞彿;
- obj.閿�鍞鍗曟暟閲� = data[i].閿�鍞暟閲�;
+ var newObj = {
+ "HMaterID" : data[i].HMaterID,
+ "HProdORGID" : data[i].HPRDORGID,
+ "HUnitID" : data[i].HUnitID,
+ "HWorkShopID" : data[i].HDeptID,
+ "鎷嗗崟鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "婧愬崟涓诲唴鐮�" : data[i].hmainid,
+ "婧愬崟瀛愬唴鐮�" : data[i].HEntryID,
+ "鐗╂枡浠ｇ爜" : data[i].浜у搧浠ｇ爜,
+ "鐗╂枡鍚嶇О" : data[i].浜у搧鍚嶇О,
+ "鐢熶骇缁勭粐": data[i].鐢熶骇缁勭粐,
+ "鐢熶骇璁㈠崟鍗曟嵁绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
+ "鐢熶骇璁㈠崟鍙�" : data[i].鍗曟嵁鍙�,
+ "鐢熶骇璁㈠崟鏄庣粏琛屽彿" : data[i].HEntryID,
+ "鐢熶骇杞﹂棿" : data[i].鐢熶骇杞﹂棿,
+ "瑙勬牸鍨嬪彿" : data[i].瑙勬牸鍨嬪彿,
+ "璁″垝寮�濮嬫棩鏈�" : data[i].璁″垝寮�宸ユ棩鏈�,
+ "璁″垝鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "璁″垝缁撴潫鏃ユ湡" : data[i].璁″垝瀹屽伐鏃ユ湡,
+ "璁￠噺鍗曚綅" : data[i].璁￠噺鍗曚綅,
+ "璁㈠崟鍙帓鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
+ "璁㈠崟绛夌骇" : data[i].璁㈠崟绛夌骇,
+ "璁㈠崟绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
+ "閿�鍞鍗曞彿" : data[i].閿�鍞鍗曞彿,
+ "閿�鍞鍗曟暟閲�" : data[i].閿�鍞暟閲�
+ }
- option.data.push(obj);
+ option.data.push(newObj);
table.render(option)
}
@@ -2843,7 +2846,7 @@
})
}
- function get_HideColumn2() {
+ function get_HideColumn_ICMO() {
var colName = "";
var contentUrl = "";
for (var i = 1; i < option2.cols[0].length; i++) {
@@ -2870,14 +2873,14 @@
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn2();
+ DisPlay_HideColumn_ICMO();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
})
}
- function DisPlay_HideColumn2() {
+ function DisPlay_HideColumn_ICMO() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
@@ -2887,7 +2890,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+ /* var titleData_ICMO = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
dataCol = data1.data[0].HGridString.split(',');
@@ -2916,7 +2919,7 @@
// option.cols[0][i + 1]["width"] = "";
//}
//鏄剧ず鍒�
- if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+ if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) == -1) {
option2.cols[0][i + 1]["hide"] = false;
}
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
@@ -2945,7 +2948,7 @@
//鍐荤粨鍒�
if (data1.data[0].HFixCols != 0) {
for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
+ if ($.inArray(option2.cols[0][i + 1]["title"], titleData_ICMO) != -1) {
data1.data[0].HFixCols += 1;
}
option2.cols[0][i + 1]["fixed"] = "left";
--
Gitblit v1.9.1