Commit 2c8f7499 by yukang

处理相关BUG

parent f0d80ef0
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
PRDT_CODE LIKE ('%$prdtCode$%') PRDT_CODE LIKE ('%$prdtCode$%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="prdtName"> <isNotEmpty prepend=" AND " property="prdtName">
PRDT_NAME = #prdtName# PRDT_NAME LIKE ('%$prdtName$%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="planCompletionDate"> <isNotEmpty prepend=" AND " property="planCompletionDate">
PLAN_COMPLETION_DATE = #planCompletionDate# PLAN_COMPLETION_DATE = #planCompletionDate#
......
...@@ -135,9 +135,9 @@ $(function () { ...@@ -135,9 +135,9 @@ $(function () {
* e.preventDefault 阻止事件发生 * e.preventDefault 阻止事件发生
*/ */
beforeAdd: function (e) { beforeAdd: function (e) {
var lv = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId.lv; var lv = IPLATUI.EFTree.materialTree.selectTreeNode.lv;
var logic = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId ? false : true; var logic = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId ? false : true;
if (lv === 3) { if (lv === '3') {
IPLAT.alert({ IPLAT.alert({
message: '<b>不能在零件下进行新增</b>', message: '<b>不能在零件下进行新增</b>',
okFn: function (e) { okFn: function (e) {
...@@ -363,17 +363,28 @@ $(function () { ...@@ -363,17 +363,28 @@ $(function () {
* 导入 * 导入
*/ */
$("#IMPORT").on("click", function (e) { $("#IMPORT").on("click", function (e) {
var lv = IPLATUI.EFTree.materialTree.selectTreeNode.lv;
var logic = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId ? false : true; var logic = IPLATUI.EFTree.materialTree.selectTreeNode.nodeId ? false : true;
if (logic) { // 通过业务逻辑判断, 控制是否进行新增 if (lv === '3') {
IPLAT.alert({ IPLAT.alert({
message: '<b>请选择项目列表</b>', message: '<b>不能在零件下进行导入</b>',
okFn: function (e) { okFn: function (e) {
}, },
title: '提示' title: '提示'
}); });
e.preventDefault(); e.preventDefault();
} else { } else {
openFileWindow.open(); if (logic) { // 通过业务逻辑判断, 控制是否进行新增
IPLAT.alert({
message: '<b>请选择项目列表</b>',
okFn: function (e) {
},
title: '提示'
});
e.preventDefault();
} else {
openFileWindow.open();
}
} }
}); });
IPLATUI.EFUpload = { IPLATUI.EFUpload = {
......
...@@ -349,6 +349,7 @@ function saveDetail(btn) { ...@@ -349,6 +349,7 @@ function saveDetail(btn) {
JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true); JSUtils.submitGridsData("detail", "HPSC003", "updatePlanDetail", true);
//释放禁用按钮 //释放禁用按钮
btn.attr("disabled", false); btn.attr("disabled", false);
query();
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment