From 17993abe49cebdb93cec2cf9fda3ff7711c3ddca Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 24 九月 2025 16:51:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 8
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 21 ++-
WebTM/views/基础资料/公用基础资料/Gy_InspectInstruMent.html | 6
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 14 +-
WebTM/views/基础资料/生产基础资料/Gy_BadType.html | 8
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html | 9
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 28 ++--
WebTM/views/基础资料/公用基础资料/Gy_InspectValue.html | 8
WebTM/views/基础资料/公用基础资料/Gy_QualityStd.html | 8
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_InspectMethod.html | 8
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 12 +-
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 2
WebTM/views/基础资料/公用基础资料/Gy_InspectBasis.html | 8
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 61 ++++++++-
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html | 9
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 17 +-
WebTM/views/基础资料/公用基础资料/Gy_BadPhenomena.html | 10
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 80 +++++++++++-
21 files changed, 220 insertions(+), 105 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 2c4cc6e..97e0bd0 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,11 +7,11 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�
+ /*var WEBURL = "http://localhost:81/API/"; */ // 闄堥晲鍝叉湰鍦伴厤缃�
// var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html"
index 72211be..6805f3f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadPhenomena.html"
@@ -301,7 +301,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -601,7 +601,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_BadPhenomena.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -626,7 +626,7 @@
}
,end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
})
@@ -665,7 +665,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -695,7 +695,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
index 8c4a07f..3426615 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CheckItem.html"
@@ -327,7 +327,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -594,7 +594,7 @@
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html?hID=' + TagId + '&HType=1&TagParentId=' + Level + ''],
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -623,7 +623,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
//閲嶈浇tree
tree.reload('treeDepartment', {});
});
@@ -658,7 +658,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
//閲嶈浇tree
tree.reload('treeDepartment', {});
});
@@ -699,7 +699,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -726,7 +726,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
index bcb7dd7..d27ec77 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectBasis.html"
@@ -478,7 +478,7 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- if (HNumber) {
+ if (HOrgID) {
sWhere += " and HUSEORGID ='" + HOrgID + "'";
}
if (HNumber) {
@@ -632,7 +632,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectBasis.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -680,7 +680,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -711,7 +711,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
index 526229b..f9c46ec 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMent.html"
@@ -594,7 +594,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectInstruMent.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -618,7 +618,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -676,7 +676,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
index 8c27ce5..436053d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectMethod.html"
@@ -632,7 +632,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectMethod.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -668,7 +668,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
}
@@ -696,7 +696,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -727,7 +727,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
index ef3aa66..0e16a30 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectValue.html"
@@ -655,7 +655,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_InspectValue.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -679,7 +679,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -710,7 +710,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
@@ -894,7 +894,7 @@
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
//鎵ц鏌ヨ鏂规硶
- get_FastQuery();
+ //get_FastQuery();
form.render("select");
}
}, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index 9b1c0ad..f29021b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -384,7 +384,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -458,7 +458,7 @@
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
get_DefaultModule();
}
@@ -762,7 +762,7 @@
content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=1&TagParentId='],
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');;
},
success: function (layero, index) {
@@ -818,7 +818,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');;
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -845,7 +845,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');;
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1003,7 +1003,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
//閲嶈浇tree
tree.reload('treeDepartment', {});
});
@@ -1040,7 +1040,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
//閲嶈浇tree
tree.reload('treeDepartment', {});
});
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
index d3fae31..a858557 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QualityStd.html"
@@ -635,7 +635,7 @@
content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QualityStd.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -661,7 +661,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
}
@@ -689,7 +689,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -720,7 +720,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index 000fb4c..006c63a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -318,7 +318,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -679,7 +679,7 @@
content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -744,7 +744,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -798,7 +798,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
index 8c9a11f..eeb91a3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadType.html"
@@ -300,7 +300,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -630,7 +630,7 @@
content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadType.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -694,7 +694,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -725,7 +725,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 5b14c3a..2791991 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -574,7 +574,7 @@
, { field: 'HWorkTypeID', title: 'HWorkTypeID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HWorkTypeNumber', title: '宸ョ浠ｇ爜', width: 100, edit: 'text', event: "HWorkTypeNumber" } //F7
, { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', width: 100, style: 'background-color:#efefef4d;' }
- , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', width: 100, edit: 'text' }
+ , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', width: 100 }
, { field: 'HMoney', title: '宸ヨ祫', width: 100,totalRow: true }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
@@ -705,6 +705,7 @@
layer.confirm('鍒楄〃涓凡缁忓瓨鍦ㄨ亴鍛�,鏄惁瑕佽鐩栵紵', { icon: 3, title: '鎻愮ず' }, function (index) {
set_InitGrid(); //鍒濆鍖栧瓙琛�
GetEmployee(); //鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
+ DisPlay_HideColumn();//鍒楄缃�
layer.close(index); //鍏抽棴寮圭獥 瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
});
}
@@ -1298,7 +1299,7 @@
, "HWorkTypeNumber": OptionData.宸ョ浠ｇ爜
, "HWorkTypeName": OptionData.宸ョ鍚嶇О
, "HPayMoney": OptionData.灏忔椂宸ヨ祫
- , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : obj.data["HBaseTimes"])* OptionData.灏忔椂宸ヨ祫
+ , "HMoney": (obj.data["HBaseTimes"] == "" ? 0 : (obj.data["HBaseTimes"]) * OptionData.灏忔椂宸ヨ祫).toFixed(4)
})
}
})
@@ -1526,8 +1527,8 @@
var HAMTimes = HBaseTimes / 2; //涓婂崍宸ユ椂
var HPMTimes = HBaseTimes / 2; //涓嬪崍宸ユ椂
var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
- var HMoney = HPayMoney * HBaseTimes; //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
-
+ var HMoney = (HPayMoney * HBaseTimes).toFixed(4); //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+ debugger
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HBaseTimes: HBaseTimes
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
index cd79fbc..6c6fd72 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportWorkDemandPlanBillList.html"
@@ -5,14 +5,16 @@
<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/zgqCustom/zgqCustom.js"></script>
<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/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>-->
<script src="../../../layuiadmin/SetColumn.js"></script>
+ <script src="../../../layuiadmin/xm-select.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -278,18 +280,18 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left', sort: true});
- columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐', sort: true});
- columns.push({ field: '閮ㄩ棬', title: '鐢熶骇杞﹂棿', sort: true});
- columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true });
- columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true });
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true});
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true});
- columns.push({ field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', sort: true});
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true});
- columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', sort: true});
- columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true});
- columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺', sort: true, totalRow: true});
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true, filter: true});
+ columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐', sort: true, filter: true});
+ columns.push({ field: '閮ㄩ棬', title: '鐢熶骇杞﹂棿', sort: true, filter: true});
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, filter: true});
+ columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', sort: true, filter: true });
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, filter: true});
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true, filter: true});
+ columns.push({ field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', sort: true, filter: true});
+ columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true, filter: true});
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', sort: true, filter: true});
+ columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true});
+ columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true});
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 5da097d..a7e63a6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -316,6 +316,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PatrolProcCheck" id="btn-PatrolProcCheck">宸℃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-LastProcCheck" id="btn-LastProcCheck">鏈</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><i class="layui-icon layui-icon-form"></i>鍖呰澶囨敞</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
@@ -352,10 +354,10 @@
var sWhere = "";
var sWhere = "";
var HModName = "Sc_ICMOBillList";
- var HDeptID = 0;
+ //var HDeptID = 0;
var params = getUrlVars();
- var HDeptID = params[params[0]];
+ //var HDeptID = params[params[0]];
var option = [];
var page = 1;//鍒嗛〉鏁版嵁
var size = 50;
@@ -416,9 +418,9 @@
}
}
$("#HDeptName").append(HDeptName);
- if (!isNaN(HDeptID)) {
- $("#HDeptName").val(HDeptID);
- }
+ //if (!isNaN(HDeptID)) {
+ // $("#HDeptName").val(HDeptID);
+ //}
form.render('select');
}
layer.closeAll("loading");
@@ -617,6 +619,12 @@
break;
//棣栨
case 'btn-FirstPieceCheck': set_FirstPieceCheck();
+ break;
+ //宸℃
+ case 'btn-PatrolProcCheck': set_PatrolProcCheck();
+ break;
+ //宸℃
+ case 'btn-LastProcCheck': set_LastProcCheck();
break;
//鍖呰澶囨敞
case 'set_Remark': set_Remark();
@@ -1345,9 +1353,9 @@
}
//浼犻�掔殑鍙傛暟涓嶄负NAN
- if (!isNaN(HDeptID) && HDeptName == 0) {
- HDeptName = HDeptID;
- }
+ //if (!isNaN(HDeptID) && HDeptName == 0) {
+ // HDeptName = HDeptID;
+ //}
//if (!isNaN(HDeptID)) {
// HStatus = "寮�宸�";
//}
@@ -2033,8 +2041,60 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
-
-
+ //宸℃
+ function set_PatrolProcCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸℃妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //鏈
+ function set_LastProcCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid.toString();
+ var OperationType = 2;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏈妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//鍖呰澶囨敞
function set_Remark() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index b22c60d..b555e1f 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -415,7 +415,7 @@
form.on('submit(CzyyzList)', function () {
$('#Czmm').val("");
$('#Czyyz').val("");
- $('#Czmm').attr("disabled", false);
+ $('#Czmm').attr("readonly", false);
$('#Czyyz').attr("disabled", false);
Psv="Update"
});
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 7dc9fad..6fadef0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -188,11 +188,11 @@
<div class="layui-inline">
<label class="layui-form-label">鍒ゆ柇缁撹</label>
<div class="layui-input-block">
- <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸">
- <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
- <div class="layui-inline" id="hidediv1">
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -1581,10 +1581,10 @@
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
- layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+ // layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HFirstCheckEmp").val() == 0) {
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -2268,7 +2268,7 @@
$("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HMaterID);
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -4319,7 +4319,10 @@
$("#HICMOInterID").val(obj[0].hmainid);
$("#HICMOEntryID").val(obj[0].HEntryID);
$("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(obj[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(obj[0].HMaterID);
}
function GetProcExValue(obj) { //娴佽浆鍗�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 0714944..f3960f6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -116,7 +116,7 @@
<input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" id="hidediv2">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">娴佽浆鍗″彿</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -127,7 +127,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" id="hidediv1">
<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="HProcExchQty" id="HProcExchQty" value="0" style="background-color:#efefef4d;" readonly>
@@ -839,6 +839,12 @@
LoadingInformation_StationOutBill();
//鑷姩甯﹀嚭妫�楠屾柟妗�
GetCheckItemID();
+ }//鐢熶骇璁㈠崟鍒楄〃鏈
+ else if (HSouceBillType == 3710) {
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+ LoadingInformation_ICMO();
+ //鑷姩甯﹀嚭妫�楠屾柟妗�
+ GetCheckItemID();
}
//宸ュ簭娴佽浆鍗″垪琛ㄥ伐搴忔
else if (HSouceBillType == 3772) {
@@ -988,6 +994,42 @@
HCenterID = data.HCenterID == null ? sessionStorage["HWorkCenterID"] : data.HCenterID;//宸ヤ綔涓績id
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+ function LoadingInformation_ICMO() {
+ $("#hidediv1").attr({ "style": "display:none" });
+ $("#hidediv2").attr({ "style": "display:none" });
+
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+ type: "GET",
+ async: false,
+ data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data[0];
+ if (result.count == 1) {
+ $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+ $("#HICMOInterID").val(data.hmainid);
+ $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HSourceName").val(data.鐢熶骇璧勬簮);
+ $("#HSourceID").val(data.HSourceID);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.浜у搧鍚嶇О);
+ $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+ $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
+ $("#HMainSourceInterID").val(data.hmainid);
+ $("#HICMOEntryID").val(data.HEntryID);
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -1479,10 +1521,10 @@
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
- layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+ // layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HFirstCheckEmp").val() == 0) {
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -2265,7 +2307,7 @@
$("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HMaterID)
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -4293,7 +4335,10 @@
$("#HICMOInterID").val(obj[0].hmainid);
$("#HICMOEntryID").val(obj[0].HEntryID);
$("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(obj[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(obj[0].HMaterID);
}
function GetProcExValue(obj) { //娴佽浆鍗�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index 9cf366b..a17abdb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -801,7 +801,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index fcc901c..0edbb7d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -540,6 +540,7 @@
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
success: function (result) {
var Organization = "";
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -772,7 +773,7 @@
content: '../妫�楠屾柟妗堝崟/QC_Add_CheckProject.html?OperationType=1&linterid=&HSouceBillType=',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
@@ -794,7 +795,7 @@
, content: '../妫�楠屾柟妗堝崟/QC_Add_CheckProject.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
})
} else {
@@ -823,7 +824,7 @@
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
}
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -857,7 +858,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 1cabd2a..f5bfdf0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -194,7 +194,7 @@
<input type="radio" name="HLastResult" value="false" title="涓嶅悎鏍�">
</div>
</div>
- <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
+ <div class="layui-inline" style="margin-left:20px;">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -1545,10 +1545,10 @@
layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
- layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+ // layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HFirstCheckEmp").val() == 0) {
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -2307,7 +2307,7 @@
$("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
$("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
$("#HMaterID").val(checkStatus.data[0].HMaterID);
- $("#HICMOQty").val(checkStatus.data[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -4459,7 +4459,10 @@
$("#HICMOInterID").val(obj[0].hmainid);
$("#HICMOEntryID").val(obj[0].HEntryID);
$("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
- $("#HICMOQty").val(obj[0].璁″垝鐢熶骇鏁伴噺);
+ $("#HICMOQty").val(obj[0].鐢熶骇浠诲姟鍗曟暟閲�);
+ $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+ $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+ $("#HMaterID").val(obj[0].HMaterID);
}
function GetProcExValue(obj) { //娴佽浆鍗�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index ed5c7b2..c772485 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -384,7 +384,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ $("#btnSearch").trigger('click');
});
} else {
--
Gitblit v1.9.1