diff --git a/CCFlow/.vs/CCFlowCloud/v17/.suo b/CCFlow/.vs/CCFlowCloud/v17/.suo index f0f4640f..22a78622 100644 Binary files a/CCFlow/.vs/CCFlowCloud/v17/.suo and b/CCFlow/.vs/CCFlowCloud/v17/.suo differ diff --git a/CCFlow/CCFlow/DataUser/JSLibData/MyFlowPublic.js b/CCFlow/CCFlow/DataUser/JSLibData/MyFlowPublic.js index 9fcc963f..90628e0f 100644 --- a/CCFlow/CCFlow/DataUser/JSLibData/MyFlowPublic.js +++ b/CCFlow/CCFlow/DataUser/JSLibData/MyFlowPublic.js @@ -252,17 +252,17 @@ function beforeSend() { var bh = ccfrom["TB_ZLYDBH"].value; //重复审批判断 - if (fk_flow == '008') { + if (fk_flow == '008' && nodeID == '801') { var JSXYSP = "SELECT ZLYDBH FROM Frm_BCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'"; var isHave = DBAccess.RunSQLReturnTable(JSXYSP); if (isHave.length > 0) { - alert("该质量要点编号:“" + bh + "”已经发起创建流程。"); + alert("该质量要点编号:“" + bh + "”已经发起创建流程。"); return false; } } - if (fk_flow == '029') { + if (fk_flow == '029' && nodeID == '2901') { var JSXYSP = "SELECT ZLYDBH FROM Frm_DCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'"; var isHave = DBAccess.RunSQLReturnTable(JSXYSP); if (isHave.length > 0) { @@ -272,7 +272,7 @@ function beforeSend() { } - if (fk_flow == '009') { + if (fk_flow == '009' && nodeID == '901') { var JSXYSP = "SELECT ZLYDBH FROM Frm_GCLZLYD WHERE ZLYDBH='" + bh + "' AND WFState = '2'"; var isHave = DBAccess.RunSQLReturnTable(JSXYSP); if (isHave.length > 0) { @@ -566,6 +566,22 @@ function beforeSend() { } } + //验证审批 + if (fk_flow == '002') { + var JSXYBH = $("#TB_JSBZXYBH").val().trim();//技术协议编号 + var ZLYDBH = $("#TB_ZLYDBH").val().trim();//质量要点编号 + if (ZLYDBH.length == 0 && $("#CB_ZLYDSP").prop("checked")) { + alert("请检查'质量要点编号'的填写,因为启用了质量要点审批。"); + return false; + } + if (JSXYBH.length == 0 && $("#CB_JSBZXYSP").prop("checked")) { + alert("请检查'技术标准(协议)编号'的填写,因为启用了技术标准(协议)审批。"); + return false; + } + + + } + return true; } diff --git a/CCFlow/CCFlow/web.config b/CCFlow/CCFlow/web.config index 379c5ba1..1b9141c1 100644 --- a/CCFlow/CCFlow/web.config +++ b/CCFlow/CCFlow/web.config @@ -76,7 +76,7 @@ --> - + @@ -212,9 +212,9 @@ - + - +