From 0e15b8f03be294dcf1a3ca88d18e327d5ce989bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 10 八月 2023 13:45:26 +0800
Subject: [PATCH] 生产日记导入 产量汇报单 查询修改 jit 完善 出站单注释多余工序HProcID字段 客户订单报表 修改状态 备注 不刷新
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 641 +++++++++++++++++++++++++++++-----------------------
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 6
WebTM/views/车间管理/报表分析/SC_DayRkReport.html | 8
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 4
5 files changed, 368 insertions(+), 293 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 63cbbe6..5bec0ab 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -492,9 +492,9 @@
if (Source) {
sWhere += " and 鐢熶骇璧勬簮 like '%" + Dept + "%'";
}
- if (HOrgID) {
- sWhere += " and HOrgID = '" + HOrgID + "'";
- }
+ //if (HOrgID) {
+ // sWhere += " and HOrgID = '" + HOrgID + "'";
+ //}
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
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 c16c86c..e96347d 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"
@@ -430,21 +430,20 @@
if (HWorkShopID == 0) {
return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
} else {
-
- layer.open({
+ var index = layer.open({
type: 1, // page 灞傜被鍨�
- area: ['500px', '300px'],
- title: 'Hello layer',
+ area: ['20%', '20%'],
shade: 0.6, // 閬僵閫忔槑搴�
- shadeClose: true, // 鐐瑰嚮閬僵鍖哄煙锛屽叧闂脊灞�
- maxmin: true, // 鍏佽鍏ㄥ睆鏈�灏忓寲
+ shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+ maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
- content: '<div style="padding: 32px;">涓�涓櫘閫氱殑椤甸潰灞傦紝浼犲叆浜嗚嚜瀹氫箟鐨� HTML</div>'
+ content: '<div style="padding: 12px;">姝ｅ湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
});
- setTimeout(get_btnProPC(HWorkShopID), 3000);
- layer.closeAll();
+ setTimeout(function () {
+ get_btnProPC(HWorkShopID);
+ layer.close(index);
+ }, 1000)
}
-
})
//琛屽唴浜嬩欢
@@ -706,6 +705,28 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ , done: function (res, page, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
+ for (var i = 0; i < Days; i++) {
+ var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
+ if (item[dateNowTime] != null) {
+ if (NumCount > parseFloat(item[dateNowTime])) {
+ NumCount -= parseFloat(item[dateNowTime]);
+ } else {
+ var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ rq = tr.children()[num + 1 + i];
+ rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ rq = tr.children()[num];
+ rq.style.color = '#f66161';//鐒跺悗鍙樿壊
+ }
+ }
+ }
+ });
+ $('.layui-table-cell').css({ 'height': 'auto' });
+ }
};
}
@@ -1162,6 +1183,9 @@
var data = table.cache["mainTable"];
var HICOMNum = [];
for (var i = 0; i < data.length; i++) {
+ if (isNaN(data[i]["HICMOInterID"])) {
+ return layer.msg("璇峰厛杩涜淇濆瓨!!")
+ }
HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
}
$('#HProgressBar').html(`
@@ -1267,12 +1291,14 @@
var HDelData = 0;
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
- var ajaxLoad = layer.load();
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
var HinterID_S = [];
for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["灏忔椂浜ц兘"] == "0") {
+ return layer.msg("璇峰厛鐐瑰嚮鍑嗗鎸夐挳,纭繚灏忔椂浜ц兘涓嶄负0!!!")
+ }
HinterID_S.push(option.data[i]["hmainid"]);
}
$.ajax({
@@ -1295,13 +1321,13 @@
//鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
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 + ")";
$.ajax({
- url: GetWEBURL() +'/Gy_SOPBillList/UpDelSQL',
+ url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
async: false,
data: { "sWhere": sql },
success: function (data1) {
if (data1.count == 1) {
- HDelData = 1;
+
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -1310,274 +1336,287 @@
}
});
- get_FastQuery(2);
+ get_HFData(0, 0);
- if (HDelData == 1) {
- //鎸変换鍔″崟浼樺厛绾� 寰幆
- for (var i = 0; i < option.data.length; i++) {
- //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
- lMainID = option.data[i]["HICMOInterID"];
- sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
- dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
- sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
- sPlanQty = option.data[i]["璁″垝鏁伴噺"];
- lHGroupID = option.data[i]["HGroupID"];
- sGroupName = option.data[i]["HGroupName"];
- lMaterID = option.data[i]["HMaterID"];
- sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
- sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
- sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
- sYX = option.data[i]["浼樺厛绾�"];
- //鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty;
- if (sWorkQty <= 0) {
- sLeftProdTimes = 0;
- }
- else {
- sLeftProdTimes = iLeftQty / sWorkQty;
- }
- //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
- if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = option.data[i]["HSourceID"];
- sSourceName = option.data[i]["鐢熶骇璧勬簮"];
- sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
- {
- //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
- var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- ds = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
- {
- //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
- $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
- continue;
- }
- else {
- $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
- //寮�濮嬫帓鍗�
- bFind = false;
- //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
- if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
- {
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
- }
- if (dsSub != null)//涓嶅姞鐝帓绋�
- {
- iRow = i + 1;
- //灏嗘暟鎹帓鍒扮綉鏍间腑
- //grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- //grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- //Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, false, oClsGridValues);
- SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
- }
- bFind = true;
- }
- }
- }
- if (!bFind) {
- for (var j = 0; j < ds.length; j++) {
- //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
- if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
- if (iLeftQty > 0) {
-
- //鍦ㄦ湰璧勬簮涓婄敓浜�
- grdMain.RowCount = grdMain.RowCount + 1;
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[j]["HitemID"];
- sSourceName = ds[j]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
- bFind = true;
- }
- }
- }
-
- if (!bFind) {
- //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- lSourceID = ds[ds.length - 1]["HitemID"];
- sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
- sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
- option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
-
- //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
- $.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
- type: "GET",
- async: false,
- data: { "sWhere": sql },
- success: function (data1) {
- if (data1.count == 1) {
- dsSub = data1.data
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- if (dsSub == null || dsSub.length == 0) {
- continue;
- }
- //if (dsSub != null)//鍔犵彮鎺掔▼
- //{
- // //灏嗘暟鎹帓鍒扮綉鏍间腑
- // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
- // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
- // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
- //}
- }
+ //鍒濆鍖栬〃鏍兼暟鎹�
+ for (var i = 0; i < option.data.length; i++) {
+ for (var j = (22 + HPlanDay); j < 53; j++) {
+ if (option.data[i][option.cols[0][j].field] != null) {
+ option.data[i][option.cols[0][j].field] = "";
}
}
- table.render(option);
- set_AddNew();
- } else {
- layer.msg("鏁版嵁娓呯┖澶辫触!")
}
- layer.close(ajaxLoad);
+
+ //get_FastQuery(2);
+
+ //鎸変换鍔″崟浼樺厛绾� 寰幆
+ for (var i = 0; i < option.data.length; i++) {
+ //鑾峰彇閿佸畾鐨勬帓浜ф暟閲�
+ var SDSum = 0;
+ if (HPlanDay > 0) {
+ for (var j = 22; j < (22 + HPlanDay); j++) {
+ SDSum += TableData[i][option.cols[0][j].field];
+ }
+ }
+
+ //鎵惧埌鏈换鍔″崟 鍙敤鐢熶骇璧勬簮
+ lMainID = option.data[i]["HICMOInterID"];
+ sICMOBillNo = option.data[i]["鐢熶骇璁㈠崟鍙�"];
+ dEndDate = Format(option.data[i]["鏈�杩熷畬宸ユ棩鏈�"], 'yyyy/MM/dd');
+ sProdTimes = option.data[i]["鐢熶骇鍛ㄦ湡"];
+ sPlanQty = option.data[i]["璁㈠崟鍙帓鏁伴噺"];
+ lHGroupID = option.data[i]["HGroupID"];
+ sGroupName = option.data[i]["HGroupName"];
+ lMaterID = option.data[i]["HMaterID"];
+ sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
+ sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
+ sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
+ sWorkQty = option.data[i]["灏忔椂浜ц兘"];
+ sYX = option.data[i]["浼樺厛绾�"];
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+ //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
+ if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = option.data[i]["HSourceID"];
+ sSourceName = option.data[i]["鐢熶骇璧勬簮"];
+ sSourceNumber = option.data[i]["鐢熶骇璧勬簮浠ｇ爜"];
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource2 " + lMaterID + ",'" + dEndDate + "'," + sProdTimes + "," + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
+ {
+ //鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
+ var sql = "exec h_p_Sc_ICMOGetWorkSource " + lMaterID + ",'" + dEndDate + "'," + sProdTimes;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ ds = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
+ {
+ get_HFData(1, i);
+ //璺冲埌涓嬩竴鍗� 鏈崟绾㈣壊鏄剧ず
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ continue;
+ }
+ else {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:White;color:black;" });
+ //寮�濮嬫帓鍗�
+ bFind = false;
+ //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
+ for (var j = 0; j < ds.length; j++) {
+ //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
+ if (parseFloat(ds[j]["鍓╀綑宸ユ椂"]) > sLeftProdTimes) {
+ if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
+ {
+ //鍦ㄦ湰璧勬簮涓婄敓浜�
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = ds[j]["HitemID"];
+ sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ option.data[i]["HSourceID"] = lSourceID;
+ option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dsSub = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ if (dsSub == null || dsSub.length == 0) {
+ get_HFData(1, i);
+ continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
+ }
+ if (dsSub != null)//涓嶅姞鐝帓绋�
+ {
+ iRow = i + 1;
+ //灏嗘暟鎹帓鍒扮綉鏍间腑
+ SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
+
+ set_AddNew1(option.data[i]);
+ }
+ bFind = true;
+ }
+ } else {
+ get_HFData(1, i);
+ }
+ }
+ //if (!bFind) {
+ // for (var j = 0; j < ds.length; j++) {
+ // //鍒ゆ柇璧勬簮鏈�澶у墿浣欏伐鏃讹紝鏄惁澶т簬 鐢熶骇鍛ㄦ湡
+ // if (parseFloat(ds[j]["鏈�澶у墿浣欏伐鏃�"]) > sLeftProdTimes) {
+ // if (iLeftQty > 0) {
+
+ // //鍦ㄦ湰璧勬簮涓婄敓浜�
+ // grdMain.RowCount = grdMain.RowCount + 1;
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[j]["HitemID"];
+ // sSourceName = ds[j]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ // }
+ // bFind = true;
+ // }
+ // }
+ //}
+
+ //if (!bFind) {
+ // //濡傛灉娌℃湁鎵惧埌鍚堥�傝祫婧愬垯锛岀洿鎺ユ帓鏈�鍚庝竴涓墿浣欐渶澶х殑璧勬簮銆�
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // lSourceID = ds[ds.length - 1]["HitemID"];
+ // sSourceName = ds[ds.length - 1]["璧勬簮鍚嶇О"];
+ // sSourceNumber = ds[ds.length - 1]["璧勬簮浠ｇ爜"];
+ // option.data[i]["HSourceID"] = lSourceID;
+ // option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ // option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ // //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ // var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ // type: "GET",
+ // async: false,
+ // data: { "sWhere": sql },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // dsSub = data1.data
+ // } else {
+ // layer.alert(data1.code + data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+
+ // if (dsSub == null || dsSub.length == 0) {
+ // continue;
+ // }
+ // //if (dsSub != null)//鍔犵彮鎺掔▼
+ // //{
+ // // //灏嗘暟鎹帓鍒扮綉鏍间腑
+ // // grdMain.RowCount = grdMain.RowCount + 1; // grdmain 鏂板涓�琛�
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOBillNoCol].Value = sICMOBillNo;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecICMOInterIDCol].Value = lMainID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecLeftQtyCol].Value = iLeftQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupIDCol].Value = lHGroupID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecGroupNameCol].Value = sGroupName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterIDCol].Value = lMaterID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNameCol].Value = sMaterName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterNumberCol].Value = sMaterNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecMaterModelCol].Value = sMaterModel;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanEndDateCol].Value = dEndDate;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecPlanQtyCol].Value = sPlanQty;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceIDCol].Value = lSourceID;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNameCol].Value = sSourceName;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecSourceNumberCol].Value = sSourceNumber;
+ // // grdMain.Rows[grdMain.RowCount - 1].Cells[HSecYXCol].Value = sYX;
+ // // Sc_ICMOSortBillFun.SetInfoToGrid(grdMain, dsSub, null, grdMain.RowCount - 1, ref iLeftQty, sWorkQty, true, oClsGridValues);
+ // //}
+ //}
+ }
+ }
+ table.render(option);
+ }
+ var TableData = [];
+ function get_HFData(num,nums) {
+ if (num == 0) {
+ TableData = option.data;
+ } else {
+ option.data[nums] = TableData[nums];
+ }
}
//灏嗘暟鎹帓绋嬪埌缃戞牸
@@ -1684,7 +1723,7 @@
else {
for (var i = 0; i < ds.length; i++) {
//鎵惧埌瀵瑰簲鐨勫垪
- for (var j = 22; j < grd.cols[0].length; j++) {
+ for (var j = 22; j < 53; j++) {
if (sLeftQty > 0) {
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) {
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
@@ -1743,33 +1782,36 @@
}
else {
if (sLeftQty > parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"])) {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
+ grd.data[iRow][grd.cols[0][j].field] = parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HUseTimes"] = ds[i]["鍓╀綑宸ユ椂"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
else {
- grd.data[iRow][grd.cols[0][j + HPlanDay].field] = sLeftQty;
+ grd.data[iRow][grd.cols[0][j].field] = sLeftQty;
+ //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
//oSub = new ClsGridValues();
//oSub.iRow = iRow;
//oSub.iCol = j;
- option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
//oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
//oClsGridValues.Add(oSub);
}
}
}
- }
+ }
}
}
}
+
}
}
@@ -1936,6 +1978,9 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["璁㈠崟鍙帓鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
+ return layer.msg("绗�" + (i + 1) + "琛屾帓浜ф暟閲忚秴鍑鸿鍗曟暟閲�!");
+ }
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
@@ -1975,6 +2020,36 @@
});
}
+ function set_AddNew1(num) {
+
+ //var sMainStr = JSON.stringify(data.field);
+ var sSubStr = "["+JSON.stringify(num)+"]";
+ var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg("淇濆瓨鎴愬姛");
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+
//琛屽唴蹇嵎閿�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 58646bd..47aaec6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -177,7 +177,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" value="0" name="HProcID" id="HProcID">
+ <!--<input type="hidden" value="0" name="HProcID" id="HProcID">-->
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
index 736a550..4f50ad1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/SC_DayRkReport.html"
@@ -97,8 +97,8 @@
<table class="" id="mainTable1" lay-filter="mainTable1"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
</div>
</script>
</form>
@@ -243,7 +243,7 @@
}
option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
@@ -314,7 +314,7 @@
}
option = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, cellMinWidth: 120
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 500
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
index 5cebee3..3715bcf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
@@ -397,7 +397,7 @@
success: function (data1) {
if (data1.count == 1) {
layer.msg(data1.Message);
- get_FastQuery();
+ //get_FastQuery();
} else {
layer.msg(data1.Message);
}
@@ -427,7 +427,7 @@
data: { "sMainSub": sMainSub },
success: function (data1) {
if (data1.count == 1) {
- get_FastQuery();
+ //get_FastQuery();
layer.close(index);
layer.msg(data1.Message);
} else {
--
Gitblit v1.9.1