diff --git a/.gitignore b/.gitignore index 9491a2f..d4a088d 100644 --- a/.gitignore +++ b/.gitignore @@ -341,7 +341,7 @@ ASALocalRun/ # MSBuild Binary and Structured Log *.binlog -# NVidia Nsight GPU debugger configuration file +# NVidia Nsight GPU configuration file *.nvuser # MFractors (Xamarin productivity tool) working folder diff --git a/DBUtility/CeramicProject/newyt/Common/scd_dy.aspx b/DBUtility/CeramicProject/newyt/Common/scd_dy.aspx index 7571ed8..72d6b90 100644 --- a/DBUtility/CeramicProject/newyt/Common/scd_dy.aspx +++ b/DBUtility/CeramicProject/newyt/Common/scd_dy.aspx @@ -29,7 +29,7 @@ } var jzs = "0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/DBUtility/CeramicProject/newyt/Common/scd_dy_hx.aspx b/DBUtility/CeramicProject/newyt/Common/scd_dy_hx.aspx index 94f45d7..a5d9ee8 100644 --- a/DBUtility/CeramicProject/newyt/Common/scd_dy_hx.aspx +++ b/DBUtility/CeramicProject/newyt/Common/scd_dy_hx.aspx @@ -28,7 +28,7 @@ } var jzs="0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/DBUtility/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js b/DBUtility/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js index 8f06d9b..d255fd5 100644 --- a/DBUtility/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js +++ b/DBUtility/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js @@ -259,7 +259,7 @@ var JSHINT = (function () { camelcase : true, // if identifiers should be required in camel case couch : true, // if CouchDB globals should be predefined curly : true, // if curly braces around all blocks should be required - debug : true, // if debugger statements should be allowed + debug : true, // if statements should be allowed devel : true, // if logging globals should be predefined (console, // alert, etc.) dojo : true, // if Dojo Toolkit globals should be predefined @@ -4140,9 +4140,9 @@ loop: } }).labelled = true; - stmt("debugger", function () { + stmt("", function () { if (!option.debug) { - warning("All 'debugger' statements should be removed."); + warning("All '' statements should be removed."); } return this; }).exps = true; diff --git a/DBUtility/CeramicProject/newyt/Js/TcOrder.js b/DBUtility/CeramicProject/newyt/Js/TcOrder.js index f1bc301..feb1ed7 100644 --- a/DBUtility/CeramicProject/newyt/Js/TcOrder.js +++ b/DBUtility/CeramicProject/newyt/Js/TcOrder.js @@ -12,7 +12,7 @@ function opendiv(div) { function jscpxmje(hcountx) { -debugger + var mtsl = $("#dhsl" + hcountx).val()*1; var cpdj = $("#danjia" + hcountx).val()*1; var xiaoji = parseFloat(mtsl * cpdj).toFixed(4); diff --git a/DBUtility/CeramicProject/newyt/Js/common.js b/DBUtility/CeramicProject/newyt/Js/common.js index e6e91cd..126be5e 100644 --- a/DBUtility/CeramicProject/newyt/Js/common.js +++ b/DBUtility/CeramicProject/newyt/Js/common.js @@ -105,7 +105,7 @@ var dianshu; 有下拉框的时候需要修改这里，根据不同的状态，点击显示每月中每天的数据条数 */ function gjzk(obj) { -debugger + if (obj == dianshu) { gjshouqi(); dianshu = ""; @@ -1101,7 +1101,7 @@ function pxtiaojian() { return wherecode; } function riqicode(riqi) { -debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/DBUtility/CeramicProject/newyt/Js/messageshow.js b/DBUtility/CeramicProject/newyt/Js/messageshow.js index c74db70..b8e23d0 100644 --- a/DBUtility/CeramicProject/newyt/Js/messageshow.js +++ b/DBUtility/CeramicProject/newyt/Js/messageshow.js @@ -21,7 +21,7 @@ }); } function msgshow() { -debugger + $.ajax({ type: "POST", contentType: "application/json", diff --git a/DBUtility/CeramicProject/newyt/Js/prettify.js b/DBUtility/CeramicProject/newyt/Js/prettify.js index 34b912a..270a73f 100644 --- a/DBUtility/CeramicProject/newyt/Js/prettify.js +++ b/DBUtility/CeramicProject/newyt/Js/prettify.js @@ -117,7 +117,7 @@ var prettyPrint; "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," + "throw,true,try,unless,until,when,while,yes"; var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS, - "debugger,eval,export,function,get,null,set,undefined,var,with," + + ",eval,export,function,get,null,set,undefined,var,with," + "Infinity,NaN"]; var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," + "goto,if,import,last,local,my,next,no,our,print,package,redo,require," + diff --git a/DBUtility/CeramicProject/newyt/Js/scpcedit.js b/DBUtility/CeramicProject/newyt/Js/scpcedit.js index 66ba2f2..0c17d75 100644 --- a/DBUtility/CeramicProject/newyt/Js/scpcedit.js +++ b/DBUtility/CeramicProject/newyt/Js/scpcedit.js @@ -283,7 +283,7 @@ function pxtiaojian() { } function riqicode(riqi) { - debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/DBUtility/CeramicProject/newyt/Js/setmibao.js b/DBUtility/CeramicProject/newyt/Js/setmibao.js index 4aff632..906ec70 100644 --- a/DBUtility/CeramicProject/newyt/Js/setmibao.js +++ b/DBUtility/CeramicProject/newyt/Js/setmibao.js @@ -22,7 +22,7 @@ function panduan() { var fanhuicount = Common_gsmima.serchmingcheng($("#zhanghao").val()).value; //查询是否存在问题 - debugger; + ; if (fanhuicount > 0) { $("#z_zhanghao").html("账号匹配成功!"); diff --git a/DBUtility/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx b/DBUtility/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx index dbdb75f..9dc0971 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx @@ -33,7 +33,7 @@ } function tcpkk(id) { if (confirm("是否初始化期初金额?")) { - debugger; + ; var wlinfo = CustomerAccount_list.pkwlinfo(id).value; var strs = new Array(); strs = wlinfo.split(","); diff --git a/DBUtility/CeramicProject/newyt/Module_data/Customer_Form.aspx b/DBUtility/CeramicProject/newyt/Module_data/Customer_Form.aspx index 48d79f9..83a43e7 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Customer_Form.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Customer_Form.aspx @@ -32,7 +32,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger + var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/DBUtility/CeramicProject/newyt/Module_data/Employee_Form.aspx b/DBUtility/CeramicProject/newyt/Module_data/Employee_Form.aspx index f168382..bd2a9d0 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Employee_Form.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Employee_Form.aspx @@ -67,7 +67,7 @@ $("#<%=severbc.ClientID%>").click(); } function jscsrq() { - debugger + var c = $("#sfzh").val(); var res = IdentityCodeValid(c); if (res) @@ -79,7 +79,7 @@ function bcgyqxxx() { var c = $("#sfzh").val(); - debugger + IdentityCodeValid(c); if ($("#xm").val() == "") { $("#z_error").text("姓名不能为空!"); diff --git a/DBUtility/CeramicProject/newyt/Module_data/External_Form.aspx b/DBUtility/CeramicProject/newyt/Module_data/External_Form.aspx index 943b71a..413c0e4 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/External_Form.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/External_Form.aspx @@ -29,7 +29,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger; + ; var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/DBUtility/CeramicProject/newyt/Module_data/Jurisdiction.aspx b/DBUtility/CeramicProject/newyt/Module_data/Jurisdiction.aspx index 66ebdfc..0128d0a 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Jurisdiction.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Jurisdiction.aspx @@ -50,7 +50,7 @@ } function pd() { - debugger; + ; if ($("#jsmc").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").html("角色名不允许为空!"); return false; diff --git a/DBUtility/CeramicProject/newyt/Module_data/Materiel_Form.aspx b/DBUtility/CeramicProject/newyt/Module_data/Materiel_Form.aspx index be60f7b..676b94a 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Materiel_Form.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/DBUtility/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx b/DBUtility/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx index 312275e..70888c1 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx @@ -49,9 +49,9 @@ dialogfocus('ifa_wx'); } function pd() { - debugger + setfy(); - debugger + if ($("#wxdw").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").text("请选择外协单位!"); return false; diff --git a/DBUtility/CeramicProject/newyt/Module_data/Product_Formt.aspx b/DBUtility/CeramicProject/newyt/Module_data/Product_Formt.aspx index 9269de6..771214e 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Product_Formt.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Product_Formt.aspx @@ -61,7 +61,7 @@ - debugger; + ; var jsonStr2 = ""; //获取数据行的行数 var hang = $("#qdxmtb tr").length - 1; diff --git a/DBUtility/CeramicProject/newyt/Module_data/Suite_browse.aspx b/DBUtility/CeramicProject/newyt/Module_data/Suite_browse.aspx index 6ac3e8e..54e64d4 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/Suite_browse.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/Suite_browse.aspx @@ -49,7 +49,7 @@ if (hang > 0) { //开始给变量赋值 jsonStr2 += "["; - debugger + //循环获取行id,拼接 for (var x = 1; x <= hang; x++) { var trid = $("#bomxmtb").find("tr").eq(x).attr("id"); diff --git a/DBUtility/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx b/DBUtility/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx index f3bf0be..548d544 100644 --- a/DBUtility/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx +++ b/DBUtility/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx @@ -79,7 +79,7 @@ function qrdjft() { if (confirm("确定要登记吗？")) { - debugger + var jsonStr2 = ""; //获取数据行的行数 var hang = $("#djtb tr").length - 1; diff --git a/DBUtility/CeramicProject/newyt/ddselect/Materiel_Form.aspx b/DBUtility/CeramicProject/newyt/ddselect/Materiel_Form.aspx index 065390e..d8efe3e 100644 --- a/DBUtility/CeramicProject/newyt/ddselect/Materiel_Form.aspx +++ b/DBUtility/CeramicProject/newyt/ddselect/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/DBUtility/CeramicProject/newyt/ddselect/Materiel_list.aspx b/DBUtility/CeramicProject/newyt/ddselect/Materiel_list.aspx index b97a46d..c0c2aee 100644 --- a/DBUtility/CeramicProject/newyt/ddselect/Materiel_list.aspx +++ b/DBUtility/CeramicProject/newyt/ddselect/Materiel_list.aspx @@ -118,7 +118,7 @@ $("body", parent.document).find('#' + rowval).attr('name', wlzu[0]); $("body", parent.document).find('#' + rowval).val(wlzu[1]); } else if (pagename == "cpkc") { - debugger; + ; if ($("body", parent.document).find('#wlmc' + rowval).length > 0) { $("body", parent.document).find('#wlmc' + rowval).val(wlzu[1]); $("body", parent.document).find('#wlbh' + rowval).val(wlzu[0]); diff --git a/DBUtility/CeramicProject/newyt/ddselect/Suite_list.aspx b/DBUtility/CeramicProject/newyt/ddselect/Suite_list.aspx index da3f259..3bda131 100644 --- a/DBUtility/CeramicProject/newyt/ddselect/Suite_list.aspx +++ b/DBUtility/CeramicProject/newyt/ddselect/Suite_list.aspx @@ -26,7 +26,7 @@ var rowval = $("body", parent.document).find('#dialogcp').attr("tag"); var pagename = $("body", parent.document).find('#pagename').val(); if (pagename == 'cpbom') { - debugger; + ; $("body", parent.document).find('#cpbh' + rowval).val(xinxizu[0]); $("body", parent.document).find('#cpmc'+ rowval).val(xinxizu[1]); $("body", parent.document).find('#mxlx'+ rowval).val("母件"); diff --git a/Model/CeramicProject/newyt/Common/scd_dy.aspx b/Model/CeramicProject/newyt/Common/scd_dy.aspx index 7571ed8..72d6b90 100644 --- a/Model/CeramicProject/newyt/Common/scd_dy.aspx +++ b/Model/CeramicProject/newyt/Common/scd_dy.aspx @@ -29,7 +29,7 @@ } var jzs = "0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/Model/CeramicProject/newyt/Common/scd_dy_hx.aspx b/Model/CeramicProject/newyt/Common/scd_dy_hx.aspx index 94f45d7..a5d9ee8 100644 --- a/Model/CeramicProject/newyt/Common/scd_dy_hx.aspx +++ b/Model/CeramicProject/newyt/Common/scd_dy_hx.aspx @@ -28,7 +28,7 @@ } var jzs="0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/Model/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js b/Model/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js index 8f06d9b..d255fd5 100644 --- a/Model/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js +++ b/Model/CeramicProject/newyt/Jquery-ui/development-bundle/external/jshint.js @@ -259,7 +259,7 @@ var JSHINT = (function () { camelcase : true, // if identifiers should be required in camel case couch : true, // if CouchDB globals should be predefined curly : true, // if curly braces around all blocks should be required - debug : true, // if debugger statements should be allowed + debug : true, // if statements should be allowed devel : true, // if logging globals should be predefined (console, // alert, etc.) dojo : true, // if Dojo Toolkit globals should be predefined @@ -4140,9 +4140,9 @@ loop: } }).labelled = true; - stmt("debugger", function () { + stmt("", function () { if (!option.debug) { - warning("All 'debugger' statements should be removed."); + warning("All '' statements should be removed."); } return this; }).exps = true; diff --git a/Model/CeramicProject/newyt/Js/TcOrder.js b/Model/CeramicProject/newyt/Js/TcOrder.js index f1bc301..feb1ed7 100644 --- a/Model/CeramicProject/newyt/Js/TcOrder.js +++ b/Model/CeramicProject/newyt/Js/TcOrder.js @@ -12,7 +12,7 @@ function opendiv(div) { function jscpxmje(hcountx) { -debugger + var mtsl = $("#dhsl" + hcountx).val()*1; var cpdj = $("#danjia" + hcountx).val()*1; var xiaoji = parseFloat(mtsl * cpdj).toFixed(4); diff --git a/Model/CeramicProject/newyt/Js/common.js b/Model/CeramicProject/newyt/Js/common.js index e6e91cd..126be5e 100644 --- a/Model/CeramicProject/newyt/Js/common.js +++ b/Model/CeramicProject/newyt/Js/common.js @@ -105,7 +105,7 @@ var dianshu; 有下拉框的时候需要修改这里，根据不同的状态，点击显示每月中每天的数据条数 */ function gjzk(obj) { -debugger + if (obj == dianshu) { gjshouqi(); dianshu = ""; @@ -1101,7 +1101,7 @@ function pxtiaojian() { return wherecode; } function riqicode(riqi) { -debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/Model/CeramicProject/newyt/Js/messageshow.js b/Model/CeramicProject/newyt/Js/messageshow.js index c74db70..b8e23d0 100644 --- a/Model/CeramicProject/newyt/Js/messageshow.js +++ b/Model/CeramicProject/newyt/Js/messageshow.js @@ -21,7 +21,7 @@ }); } function msgshow() { -debugger + $.ajax({ type: "POST", contentType: "application/json", diff --git a/Model/CeramicProject/newyt/Js/prettify.js b/Model/CeramicProject/newyt/Js/prettify.js index 34b912a..270a73f 100644 --- a/Model/CeramicProject/newyt/Js/prettify.js +++ b/Model/CeramicProject/newyt/Js/prettify.js @@ -117,7 +117,7 @@ var prettyPrint; "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," + "throw,true,try,unless,until,when,while,yes"; var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS, - "debugger,eval,export,function,get,null,set,undefined,var,with," + + ",eval,export,function,get,null,set,undefined,var,with," + "Infinity,NaN"]; var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," + "goto,if,import,last,local,my,next,no,our,print,package,redo,require," + diff --git a/Model/CeramicProject/newyt/Js/scpcedit.js b/Model/CeramicProject/newyt/Js/scpcedit.js index 66ba2f2..0c17d75 100644 --- a/Model/CeramicProject/newyt/Js/scpcedit.js +++ b/Model/CeramicProject/newyt/Js/scpcedit.js @@ -283,7 +283,7 @@ function pxtiaojian() { } function riqicode(riqi) { - debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/Model/CeramicProject/newyt/Js/setmibao.js b/Model/CeramicProject/newyt/Js/setmibao.js index 4aff632..906ec70 100644 --- a/Model/CeramicProject/newyt/Js/setmibao.js +++ b/Model/CeramicProject/newyt/Js/setmibao.js @@ -22,7 +22,7 @@ function panduan() { var fanhuicount = Common_gsmima.serchmingcheng($("#zhanghao").val()).value; //查询是否存在问题 - debugger; + ; if (fanhuicount > 0) { $("#z_zhanghao").html("账号匹配成功!"); diff --git a/Model/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx b/Model/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx index dbdb75f..9dc0971 100644 --- a/Model/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx +++ b/Model/CeramicProject/newyt/Module_data/CustomerAccount_list.aspx @@ -33,7 +33,7 @@ } function tcpkk(id) { if (confirm("是否初始化期初金额?")) { - debugger; + ; var wlinfo = CustomerAccount_list.pkwlinfo(id).value; var strs = new Array(); strs = wlinfo.split(","); diff --git a/Model/CeramicProject/newyt/Module_data/Customer_Form.aspx b/Model/CeramicProject/newyt/Module_data/Customer_Form.aspx index 48d79f9..83a43e7 100644 --- a/Model/CeramicProject/newyt/Module_data/Customer_Form.aspx +++ b/Model/CeramicProject/newyt/Module_data/Customer_Form.aspx @@ -32,7 +32,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger + var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/Model/CeramicProject/newyt/Module_data/Employee_Form.aspx b/Model/CeramicProject/newyt/Module_data/Employee_Form.aspx index f168382..bd2a9d0 100644 --- a/Model/CeramicProject/newyt/Module_data/Employee_Form.aspx +++ b/Model/CeramicProject/newyt/Module_data/Employee_Form.aspx @@ -67,7 +67,7 @@ $("#<%=severbc.ClientID%>").click(); } function jscsrq() { - debugger + var c = $("#sfzh").val(); var res = IdentityCodeValid(c); if (res) @@ -79,7 +79,7 @@ function bcgyqxxx() { var c = $("#sfzh").val(); - debugger + IdentityCodeValid(c); if ($("#xm").val() == "") { $("#z_error").text("姓名不能为空!"); diff --git a/Model/CeramicProject/newyt/Module_data/External_Form.aspx b/Model/CeramicProject/newyt/Module_data/External_Form.aspx index 943b71a..413c0e4 100644 --- a/Model/CeramicProject/newyt/Module_data/External_Form.aspx +++ b/Model/CeramicProject/newyt/Module_data/External_Form.aspx @@ -29,7 +29,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger; + ; var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/Model/CeramicProject/newyt/Module_data/Jurisdiction.aspx b/Model/CeramicProject/newyt/Module_data/Jurisdiction.aspx index 66ebdfc..0128d0a 100644 --- a/Model/CeramicProject/newyt/Module_data/Jurisdiction.aspx +++ b/Model/CeramicProject/newyt/Module_data/Jurisdiction.aspx @@ -50,7 +50,7 @@ } function pd() { - debugger; + ; if ($("#jsmc").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").html("角色名不允许为空!"); return false; diff --git a/Model/CeramicProject/newyt/Module_data/Materiel_Form.aspx b/Model/CeramicProject/newyt/Module_data/Materiel_Form.aspx index be60f7b..676b94a 100644 --- a/Model/CeramicProject/newyt/Module_data/Materiel_Form.aspx +++ b/Model/CeramicProject/newyt/Module_data/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/Model/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx b/Model/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx index 312275e..70888c1 100644 --- a/Model/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx +++ b/Model/CeramicProject/newyt/Module_data/OutsourcingContract_Form.aspx @@ -49,9 +49,9 @@ dialogfocus('ifa_wx'); } function pd() { - debugger + setfy(); - debugger + if ($("#wxdw").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").text("请选择外协单位!"); return false; diff --git a/Model/CeramicProject/newyt/Module_data/Product_Formt.aspx b/Model/CeramicProject/newyt/Module_data/Product_Formt.aspx index 9269de6..771214e 100644 --- a/Model/CeramicProject/newyt/Module_data/Product_Formt.aspx +++ b/Model/CeramicProject/newyt/Module_data/Product_Formt.aspx @@ -61,7 +61,7 @@ - debugger; + ; var jsonStr2 = ""; //获取数据行的行数 var hang = $("#qdxmtb tr").length - 1; diff --git a/Model/CeramicProject/newyt/Module_data/Suite_browse.aspx b/Model/CeramicProject/newyt/Module_data/Suite_browse.aspx index 6ac3e8e..54e64d4 100644 --- a/Model/CeramicProject/newyt/Module_data/Suite_browse.aspx +++ b/Model/CeramicProject/newyt/Module_data/Suite_browse.aspx @@ -49,7 +49,7 @@ if (hang > 0) { //开始给变量赋值 jsonStr2 += "["; - debugger + //循环获取行id,拼接 for (var x = 1; x <= hang; x++) { var trid = $("#bomxmtb").find("tr").eq(x).attr("id"); diff --git a/Model/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx b/Model/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx index f3bf0be..548d544 100644 --- a/Model/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx +++ b/Model/CeramicProject/newyt/Module_data/WorkRecord_browse.aspx @@ -79,7 +79,7 @@ function qrdjft() { if (confirm("确定要登记吗？")) { - debugger + var jsonStr2 = ""; //获取数据行的行数 var hang = $("#djtb tr").length - 1; diff --git a/Model/CeramicProject/newyt/ddselect/Materiel_Form.aspx b/Model/CeramicProject/newyt/ddselect/Materiel_Form.aspx index 065390e..d8efe3e 100644 --- a/Model/CeramicProject/newyt/ddselect/Materiel_Form.aspx +++ b/Model/CeramicProject/newyt/ddselect/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/Model/CeramicProject/newyt/ddselect/Materiel_list.aspx b/Model/CeramicProject/newyt/ddselect/Materiel_list.aspx index b97a46d..c0c2aee 100644 --- a/Model/CeramicProject/newyt/ddselect/Materiel_list.aspx +++ b/Model/CeramicProject/newyt/ddselect/Materiel_list.aspx @@ -118,7 +118,7 @@ $("body", parent.document).find('#' + rowval).attr('name', wlzu[0]); $("body", parent.document).find('#' + rowval).val(wlzu[1]); } else if (pagename == "cpkc") { - debugger; + ; if ($("body", parent.document).find('#wlmc' + rowval).length > 0) { $("body", parent.document).find('#wlmc' + rowval).val(wlzu[1]); $("body", parent.document).find('#wlbh' + rowval).val(wlzu[0]); diff --git a/Model/CeramicProject/newyt/ddselect/Suite_list.aspx b/Model/CeramicProject/newyt/ddselect/Suite_list.aspx index da3f259..3bda131 100644 --- a/Model/CeramicProject/newyt/ddselect/Suite_list.aspx +++ b/Model/CeramicProject/newyt/ddselect/Suite_list.aspx @@ -26,7 +26,7 @@ var rowval = $("body", parent.document).find('#dialogcp').attr("tag"); var pagename = $("body", parent.document).find('#pagename').val(); if (pagename == 'cpbom') { - debugger; + ; $("body", parent.document).find('#cpbh' + rowval).val(xinxizu[0]); $("body", parent.document).find('#cpmc'+ rowval).val(xinxizu[1]); $("body", parent.document).find('#mxlx'+ rowval).val("母件"); diff --git a/newyt/Common/scd_dy.aspx b/newyt/Common/scd_dy.aspx index 7571ed8..72d6b90 100644 --- a/newyt/Common/scd_dy.aspx +++ b/newyt/Common/scd_dy.aspx @@ -29,7 +29,7 @@ } var jzs = "0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/newyt/Common/scd_dy_hx.aspx b/newyt/Common/scd_dy_hx.aspx index 94f45d7..a5d9ee8 100644 --- a/newyt/Common/scd_dy_hx.aspx +++ b/newyt/Common/scd_dy_hx.aspx @@ -28,7 +28,7 @@ } var jzs="0" function dyjia() { - debugger; + ; if (jzs == "0") { $("#sec").css("display", "block"); jzs = "1"; diff --git a/newyt/Jquery-ui/development-bundle/external/jshint.js b/newyt/Jquery-ui/development-bundle/external/jshint.js index 8f06d9b..d255fd5 100644 --- a/newyt/Jquery-ui/development-bundle/external/jshint.js +++ b/newyt/Jquery-ui/development-bundle/external/jshint.js @@ -259,7 +259,7 @@ var JSHINT = (function () { camelcase : true, // if identifiers should be required in camel case couch : true, // if CouchDB globals should be predefined curly : true, // if curly braces around all blocks should be required - debug : true, // if debugger statements should be allowed + debug : true, // if statements should be allowed devel : true, // if logging globals should be predefined (console, // alert, etc.) dojo : true, // if Dojo Toolkit globals should be predefined @@ -4140,9 +4140,9 @@ loop: } }).labelled = true; - stmt("debugger", function () { + stmt("", function () { if (!option.debug) { - warning("All 'debugger' statements should be removed."); + warning("All '' statements should be removed."); } return this; }).exps = true; diff --git a/newyt/Js/TcOrder.js b/newyt/Js/TcOrder.js index 389506a..12f7b73 100644 --- a/newyt/Js/TcOrder.js +++ b/newyt/Js/TcOrder.js @@ -12,7 +12,7 @@ function opendiv(div) { function jscpxmje(hcountx) { -debugger + var mtsl = $("#dhsl" + hcountx).val()*1; var cpdj = $("#danjia" + hcountx).val()*1; var xiaoji = parseFloat(mtsl * cpdj).toFixed(4); @@ -40,14 +40,39 @@ function add_cp() { //给每行的id 赋值上一行的id 加1； 不会重复的id; var hcount = parseFloat($("#ddxm tbody").children().eq($("#ddxm tbody").children().length - 1).attr("id")) + 1; $("#ddxm").append(" " - + "" - + "" - + " " - + " " - + " " - + " "); + + "" + + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " " + +" " + + " " + +" " + + " " + +" "); } - +/* +string biao = "" + + "" + + "" + + "" + + "" + + "" + + "" + + " " + + "" + + "" + + "" + + "" + + " " + + "" + + "" + + ""; +*/ function addscd_cp() { //给每行的id 赋值上一行的id 加1； 不会重复的id; var hcount = parseFloat($("#ddxm tbody").children().eq($("#ddxm tbody").children().length - 1).attr("id")) + 1; diff --git a/newyt/Js/common.js b/newyt/Js/common.js index e6e91cd..126be5e 100644 --- a/newyt/Js/common.js +++ b/newyt/Js/common.js @@ -105,7 +105,7 @@ var dianshu; 有下拉框的时候需要修改这里，根据不同的状态，点击显示每月中每天的数据条数 */ function gjzk(obj) { -debugger + if (obj == dianshu) { gjshouqi(); dianshu = ""; @@ -1101,7 +1101,7 @@ function pxtiaojian() { return wherecode; } function riqicode(riqi) { -debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/newyt/Js/messageshow.js b/newyt/Js/messageshow.js index c74db70..b8e23d0 100644 --- a/newyt/Js/messageshow.js +++ b/newyt/Js/messageshow.js @@ -21,7 +21,7 @@ }); } function msgshow() { -debugger + $.ajax({ type: "POST", contentType: "application/json", diff --git a/newyt/Js/prettify.js b/newyt/Js/prettify.js index 34b912a..270a73f 100644 --- a/newyt/Js/prettify.js +++ b/newyt/Js/prettify.js @@ -117,7 +117,7 @@ var prettyPrint; "for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then," + "throw,true,try,unless,until,when,while,yes"; var JSCRIPT_KEYWORDS = [COMMON_KEYWORDS, - "debugger,eval,export,function,get,null,set,undefined,var,with," + + ",eval,export,function,get,null,set,undefined,var,with," + "Infinity,NaN"]; var PERL_KEYWORDS = "caller,delete,die,do,dump,elsif,eval,exit,foreach,for," + "goto,if,import,last,local,my,next,no,our,print,package,redo,require," + diff --git a/newyt/Js/scpcedit.js b/newyt/Js/scpcedit.js index 66ba2f2..0c17d75 100644 --- a/newyt/Js/scpcedit.js +++ b/newyt/Js/scpcedit.js @@ -283,7 +283,7 @@ function pxtiaojian() { } function riqicode(riqi) { - debugger + var endtimeval = $("#endtime").val(); if (endtimeval != '') { endtimeval = dateOperator(endtimeval, 1, "+"); diff --git a/newyt/Js/setmibao.js b/newyt/Js/setmibao.js index 4aff632..906ec70 100644 --- a/newyt/Js/setmibao.js +++ b/newyt/Js/setmibao.js @@ -22,7 +22,7 @@ function panduan() { var fanhuicount = Common_gsmima.serchmingcheng($("#zhanghao").val()).value; //查询是否存在问题 - debugger; + ; if (fanhuicount > 0) { $("#z_zhanghao").html("账号匹配成功!"); diff --git a/newyt/Module_data/CustomerAccount_list.aspx b/newyt/Module_data/CustomerAccount_list.aspx index dbdb75f..9dc0971 100644 --- a/newyt/Module_data/CustomerAccount_list.aspx +++ b/newyt/Module_data/CustomerAccount_list.aspx @@ -33,7 +33,7 @@ } function tcpkk(id) { if (confirm("是否初始化期初金额?")) { - debugger; + ; var wlinfo = CustomerAccount_list.pkwlinfo(id).value; var strs = new Array(); strs = wlinfo.split(","); diff --git a/newyt/Module_data/Customer_Form.aspx b/newyt/Module_data/Customer_Form.aspx index db3d385..0f42eb0 100644 --- a/newyt/Module_data/Customer_Form.aspx +++ b/newyt/Module_data/Customer_Form.aspx @@ -32,7 +32,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger + var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/newyt/Module_data/Employee_Form.aspx b/newyt/Module_data/Employee_Form.aspx index 089e113..bbf417e 100644 --- a/newyt/Module_data/Employee_Form.aspx +++ b/newyt/Module_data/Employee_Form.aspx @@ -67,7 +67,7 @@ $("#<%=severbc.ClientID%>").click(); } function jscsrq() { - debugger + var c = $("#sfzh").val(); var res = IdentityCodeValid(c); if (res) @@ -79,7 +79,7 @@ function bcgyqxxx() { var c = $("#sfzh").val(); - debugger + IdentityCodeValid(c); if ($("#xm").val() == "") { $("#z_error").text("姓名不能为空!"); diff --git a/newyt/Module_data/External_Form.aspx b/newyt/Module_data/External_Form.aspx index 1f61a6a..939cdb7 100644 --- a/newyt/Module_data/External_Form.aspx +++ b/newyt/Module_data/External_Form.aspx @@ -29,7 +29,7 @@ $(document).ready(function () { beforval=$("#mingcheng").val(); $("#severbc").click(function () { - debugger; + ; var jsonStr2 = ""; jsonStr2 += "["; $("#lxjia tr").each(function(){ diff --git a/newyt/Module_data/Jurisdiction.aspx b/newyt/Module_data/Jurisdiction.aspx index 66ebdfc..0128d0a 100644 --- a/newyt/Module_data/Jurisdiction.aspx +++ b/newyt/Module_data/Jurisdiction.aspx @@ -50,7 +50,7 @@ } function pd() { - debugger; + ; if ($("#jsmc").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").html("角色名不允许为空!"); return false; diff --git a/newyt/Module_data/Materiel_Form.aspx b/newyt/Module_data/Materiel_Form.aspx index 69bc988..c9b53c4 100644 --- a/newyt/Module_data/Materiel_Form.aspx +++ b/newyt/Module_data/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/newyt/Module_data/OutsourcingContract_Form.aspx b/newyt/Module_data/OutsourcingContract_Form.aspx index 312275e..70888c1 100644 --- a/newyt/Module_data/OutsourcingContract_Form.aspx +++ b/newyt/Module_data/OutsourcingContract_Form.aspx @@ -49,9 +49,9 @@ dialogfocus('ifa_wx'); } function pd() { - debugger + setfy(); - debugger + if ($("#wxdw").val().replace(/(^\s*)|(\s*$)/g, "") == "") { $("#z_error").text("请选择外协单位!"); return false; diff --git a/newyt/Module_data/Product_Formt.aspx b/newyt/Module_data/Product_Formt.aspx index 791f507..5a3b6f1 100644 --- a/newyt/Module_data/Product_Formt.aspx +++ b/newyt/Module_data/Product_Formt.aspx @@ -61,7 +61,7 @@ - debugger; + ; var jsonStr2 = ""; //获取数据行的行数 var hang = $("#qdxmtb tr").length - 1; diff --git a/newyt/Module_data/Suite_browse.aspx b/newyt/Module_data/Suite_browse.aspx index 5a101c5..1740c91 100644 --- a/newyt/Module_data/Suite_browse.aspx +++ b/newyt/Module_data/Suite_browse.aspx @@ -49,7 +49,7 @@ if (hang > 0) { //开始给变量赋值 jsonStr2 += "["; - debugger + //循环获取行id,拼接 for (var x = 1; x <= hang; x++) { var trid = $("#bomxmtb").find("tr").eq(x).attr("id"); diff --git a/newyt/Module_data/TcOrder_Form.aspx b/newyt/Module_data/TcOrder_Form.aspx index a175096..b553547 100644 --- a/newyt/Module_data/TcOrder_Form.aspx +++ b/newyt/Module_data/TcOrder_Form.aspx @@ -1,161 +1,254 @@ -<%@ Page Language="C#" AutoEventWireup="true" EnableEventValidation="false" CodeFile="TcOrder_Form.aspx.cs" Inherits="TcOrder_Form" %> +<%@ Page Language="C#" AutoEventWireup="true" EnableEventValidation="false" CodeFile="TcOrder_Form.aspx.cs" + Inherits="TcOrder_Form" %> - + - - - - - - - - - - - - - - - + + + + + + + + + - - - - -
-
-

合同订单表单页   

回到列表
-
-保存 -重置表单 -返回上级 - -
-
-
-温馨提示： -

• 信息表单中加*号红色标题框为必填项，为了可以顺利保存信息，请您注意填写红色栏目中的信息

-

• 系统合同订单结算提醒将根据结账日期发起提醒

-

• 产品项目中，点选产品时将根据项目类型提取对应产品

-
-
-
*项目类型*产品货号产品名称重量(G)体积(ML)规格(CM)种类烧成方式订货数量单位单价金额交货日期备注

合同订单基本信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
单据编号单据名称订单类型订单状态*客户编号 客户名称  
联系人 联系方式 下单日期*业务员 *制单人审核人 
*结账日期审核结果审核意见订单备注 
- -

产品信息

-
-

费用信息

- - - - -
订单总金额
- - - - - - - - - - - - - - - - - + }) + function seleckehu() { + $("#dialog-modal").dialog({ + resizable: false, + height: 510, + width: 1230, + modal: true, + close: function () { + $(".ui-widget-overlay").css("display", "none"); + } + }); + //用来弹出层条件框获取焦点 + dialogfocus('ifa_kh'); + } + function selecttccp(hang) { + $("#dialogcp").attr("tag", hang); + $("#dialogcp").dialog({ + resizable: false, + height: 510, + width: 1230, + modal: true, + close: function () { + $(".ui-widget-overlay").css("display", "none"); + } + }); + + if ($("#mxlx" + hang).val() == "产品") { + $("#selectcp").attr("src", "../ddselect/Product_list.aspx"); + } else { + + $("#selectcp").attr("src", "../ddselect/Suite_list.aspx"); + } + //用来弹出层条件框获取焦点 + dialogfocus('selectcp'); + } + //调用添加方法 + function setbcbd() { + $("#<%=severbc.ClientID%>").click(); + } + + + + + + +
+
+
+
+

合同订单表单页   

回到列表 +
+
+ 保存 + 重置表单 + 返回上级 + +
+
+
+ 温馨提示： +

• 信息表单中加*号红色标题框为必填项，为了可以顺利保存信息，请您注意填写红色栏目中的信息

+

• 系统合同订单结算提醒将根据结账日期发起提醒

+

• 产品项目中，点选产品时将根据项目类型提取对应产品

+
+
+ + + + +
+

合同订单基本信息

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
单据编号 + + + 单据名称 + + 订单类型 + + 订单状态 + + + + *客户编号 + 客户名称  
联系人 + + 联系方式 下单日期 + *业务员 + + *制单人 + + + + 审核人 + + +  
+ *结账日期 + 审核结果 + + + 审核意见 + + + 订单备注 + +  
+ + + + + +
+

产品信息

+
+
+ + + + +
+

费用信息

+
+ + + + + +
订单总金额
+ +
+
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/newyt/Module_data/TcOrder_Form.aspx.cs b/newyt/Module_data/TcOrder_Form.aspx.cs index 4eb1147..c175851 100644 --- a/newyt/Module_data/TcOrder_Form.aspx.cs +++ b/newyt/Module_data/TcOrder_Form.aspx.cs @@ -22,7 +22,7 @@ public partial class TcOrder_Form : CommonPage //创建一个共用的订单模板 Maticsoft.Model.nr_z_dd dd = new Maticsoft.Model.nr_z_dd(); //创建一个操作项目bll - Maticsoft.BLL.nr_z_dd_tccp xmbll = new Maticsoft.BLL.nr_z_dd_tccp(); + Maticsoft.BLL.nr_z_dd_tccp xmbll = new Maticsoft.BLL.nr_z_dd_tccp(); //创建一个操作记录模板 Maticsoft.Model.nr_sys_rizhi rizhi = new Maticsoft.Model.nr_sys_rizhi(); //创建一个操作记录bll @@ -32,68 +32,68 @@ public partial class TcOrder_Form : CommonPage protected void Page_Load(object sender, EventArgs e) { Utility.RegisterTypeForAjax(typeof(TcOrder_Form)); - if (!IsPostBack) - { - if (Session["user"] == null) - { - Response.Redirect("../index.aspx"); - } - //获取角色权限 - Maticsoft.Model.nr_z_yhzh user = (Maticsoft.Model.nr_z_yhzh)(Session["user"]); - - binddata(); - if (Request.QueryString["uid"] != null && Request.QueryString["uid"].ToString().Length > 0) - { - pdquanxianbj(user.juese); - string uid = Request.QueryString["uid"].ToString(); - id.Value = uid; - initdata(uid); - updatewlxx(Convert.ToInt32(uid)); - } - else - { - pdquanxian(user.juese); - if (Request.QueryString["fid"] != null && Request.QueryString["fid"].ToString().Length > 0) - { - string fid = Request.QueryString["fid"].ToString(); - initdata(fid); - updatewlxx(Convert.ToInt32(fid)); - } - else if (Request.QueryString["kid"] != null && Request.QueryString["kid"].ToString().Length > 0) - { - string kid = Request.QueryString["kid"].ToString(); - khid.Value = kid; - kehumodel=kehubll.GetModel(Convert.ToInt32(kid)); - khmc.Value = kehumodel.mingcheng; - ywy.Value = kehumodel.yewuyuan; - khbh.Value = kehumodel.bianhao; - DataTable tbl_lianxiren = DBHlper.Execute("select id,lianxiren,shouji from nr_z_lianxiren_kh where kh_bh='" +kehumodel.bianhao + "'").Tables[0]; - if (tbl_lianxiren.Rows.Count > 0) - { - fanhuicode = ""; - foreach (DataRow dr in tbl_lianxiren.Rows) - { - fanhuicode += ""; - } - lxfs.Value = tbl_lianxiren.Rows[0]["shouji"].ToString(); - lxrvalue.Value = tbl_lianxiren.Rows[0]["lianxiren"].ToString(); - } - addwlxx(); - } - else - { - addwlxx(); - } - Maticsoft.Model.nr_z_yhzh zh = (Maticsoft.Model.nr_z_yhzh)Session["user"]; - //必要默认值赋值 - bh.Text = "自动生成"; - xdrq.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm"); - ddzt.Text = "草稿"; - zdr.Text = zh.zhanghao; - - } + if (!IsPostBack) + { + if (Session["user"] == null) + { + Response.Redirect("../index.aspx"); + } + //获取角色权限 + Maticsoft.Model.nr_z_yhzh user = (Maticsoft.Model.nr_z_yhzh)(Session["user"]); - } + binddata(); + if (Request.QueryString["uid"] != null && Request.QueryString["uid"].ToString().Length > 0) + { + pdquanxianbj(user.juese); + string uid = Request.QueryString["uid"].ToString(); + id.Value = uid; + initdata(uid); + updatewlxx(Convert.ToInt32(uid)); + } + else + { + pdquanxian(user.juese); + if (Request.QueryString["fid"] != null && Request.QueryString["fid"].ToString().Length > 0) + { + string fid = Request.QueryString["fid"].ToString(); + initdata(fid); + updatewlxx(Convert.ToInt32(fid)); + } + else if (Request.QueryString["kid"] != null && Request.QueryString["kid"].ToString().Length > 0) + { + string kid = Request.QueryString["kid"].ToString(); + khid.Value = kid; + kehumodel = kehubll.GetModel(Convert.ToInt32(kid)); + khmc.Value = kehumodel.mingcheng; + ywy.Value = kehumodel.yewuyuan; + khbh.Value = kehumodel.bianhao; + DataTable tbl_lianxiren = DBHlper.Execute("select id,lianxiren,shouji from nr_z_lianxiren_kh where kh_bh='" + kehumodel.bianhao + "'").Tables[0]; + if (tbl_lianxiren.Rows.Count > 0) + { + fanhuicode = ""; + foreach (DataRow dr in tbl_lianxiren.Rows) + { + fanhuicode += ""; + } + lxfs.Value = tbl_lianxiren.Rows[0]["shouji"].ToString(); + lxrvalue.Value = tbl_lianxiren.Rows[0]["lianxiren"].ToString(); + } + addwlxx(); + } + else + { + addwlxx(); + } + Maticsoft.Model.nr_z_yhzh zh = (Maticsoft.Model.nr_z_yhzh)Session["user"]; + //必要默认值赋值 + bh.Text = "自动生成"; + xdrq.Value = DateTime.Now.ToString("yyyy-MM-dd HH:mm"); + ddzt.Text = "草稿"; + zdr.Text = zh.zhanghao; + + } + + } } #region 获取页面参数赋值model对象 @@ -102,7 +102,7 @@ public partial class TcOrder_Form : CommonPage dd.bh = bh.Text; dd.djmc = djmc.Text; dd.ddlx = ddlx.Text; - dd.ddzt = ddzt.Text; + dd.ddzt = ddzt.Text; dd.kh_bh = khbh.Value; dd.lianxiren = lxrvalue.Value; dd.lianxifangshi = lxfs.Value; @@ -115,7 +115,7 @@ public partial class TcOrder_Form : CommonPage dd.xdrq = Convert.ToDateTime(xdrq.Value); } dd.ywy = ywy.Value; - dd.zdr = zdr.Text; + dd.zdr = zdr.Text; if (jzrq.Value == "") { dd.jzrq = DateTime.Now; @@ -123,7 +123,7 @@ public partial class TcOrder_Form : CommonPage else { dd.jzrq = Convert.ToDateTime(jzrq.Value); - } + } dd.shyj = shyj.Text; dd.ddbz = ddbz.Text; dd.ddzje = Convert.ToDecimal(ddzje.Value); @@ -137,45 +137,45 @@ public partial class TcOrder_Form : CommonPage #region 修改时获取真正数据值 private void initdata(string did) { - int idz = Convert.ToInt32(did); - dd=ddbll.GetModel(idz); - DataTable tbl_lianxiren = DBHlper.Execute("select id,lianxiren,shouji from nr_z_lianxiren_kh where kh_bh='"+dd.kh_bh+ "'").Tables[0]; - foreach (DataRow dr in tbl_lianxiren.Rows) - { - if (dd.lianxiren == dr["lianxiren"].ToString()) - { - fanhuicode += ""; - } - else - { - fanhuicode += ""; - } - } - bh.Text = dd.bh; - djmc.Text = dd.djmc; - ddlx.Text = dd.ddlx; - ddzt.Text = dd.ddzt; - khbh.Value = dd.kh_bh; - khmc.Value = kehubll.GetList("bianhao='" + dd.kh_bh + "'").Tables[0].Rows[0]["mingcheng"].ToString(); - lxr.Text = dd.lianxiren; - lxrvalue.Value = dd.lianxiren; - lxfs.Value = dd.lianxifangshi; - ywy.Value = dd.ywy; - xdrq.Value = DateTime.Parse(dd.xdrq.ToString()).ToString("yyyy-MM-dd HH:mm"); - jzrq.Value = DateTime.Parse(dd.jzrq.ToString()).ToString("yyyy-MM-dd"); - zdr.Text = dd.zdr; - shr.Text = dd.shr; - shjg.Text = dd.shjg; - shyj.Text = dd.shyj; - ddbz.Text = dd.ddbz; - ddzje.Value = dd.ddzje.ToString(); + int idz = Convert.ToInt32(did); + dd = ddbll.GetModel(idz); + DataTable tbl_lianxiren = DBHlper.Execute("select id,lianxiren,shouji from nr_z_lianxiren_kh where kh_bh='" + dd.kh_bh + "'").Tables[0]; + foreach (DataRow dr in tbl_lianxiren.Rows) + { + if (dd.lianxiren == dr["lianxiren"].ToString()) + { + fanhuicode += ""; + } + else + { + fanhuicode += ""; + } + } + bh.Text = dd.bh; + djmc.Text = dd.djmc; + ddlx.Text = dd.ddlx; + ddzt.Text = dd.ddzt; + khbh.Value = dd.kh_bh; + khmc.Value = kehubll.GetList("bianhao='" + dd.kh_bh + "'").Tables[0].Rows[0]["mingcheng"].ToString(); + lxr.Text = dd.lianxiren; + lxrvalue.Value = dd.lianxiren; + lxfs.Value = dd.lianxifangshi; + ywy.Value = dd.ywy; + xdrq.Value = DateTime.Parse(dd.xdrq.ToString()).ToString("yyyy-MM-dd HH:mm"); + jzrq.Value = DateTime.Parse(dd.jzrq.ToString()).ToString("yyyy-MM-dd"); + zdr.Text = dd.zdr; + shr.Text = dd.shr; + shjg.Text = dd.shjg; + shyj.Text = dd.shyj; + ddbz.Text = dd.ddbz; + ddzje.Value = dd.ddzje.ToString(); } #endregion #region 用来初始化绑定下拉框等值 private void binddata() { - jzrq.Value = DateTime.Now.ToString("yyyy-MM-dd"); + jzrq.Value = DateTime.Now.ToString("yyyy-MM-dd"); DataSet hylx = bmlx.GetAllList(); DataRow[] dr = hylx.Tables[0].Select("leixing='订单类型'"); if (dr != null && dr.Length > 0) @@ -191,7 +191,7 @@ public partial class TcOrder_Form : CommonPage } } - + } @@ -203,11 +203,11 @@ public partial class TcOrder_Form : CommonPage string biao = "" + "" + "" - + " " + + " " + "
*项目类型*产品货号产品名称重量(G)体积(ML)规格(CM)种类特殊工艺要求订货数量单位规格(CM)种类烧成方式订货数量单位单价金额交货日期备注
"; cpxx.InnerHtml = biao; } - #endregion + #endregion #region 修改时用来加载定单产品项目 private void updatewlxx(int dd_id) @@ -215,9 +215,20 @@ public partial class TcOrder_Form : CommonPage //修改页面时，首先吧项目明细的表头加载出来 string biao = "" + "" - + "" - + " " - + " "; + + "" + + "" + + "" + + "" + + "" + + " " + + "" + + "" + + "" + + "" + + " " + + "" + + "" + + ""; //查询数据视图，获取当前订单下的所有明细 DataSet ds = DBHlper.Execute("select * from view_nr_z_dd_tccp where dd_id='" + dd_id + "' order by id "); if (ds != null && ds.Tables[0].Rows.Count > 0) @@ -229,23 +240,31 @@ public partial class TcOrder_Form : CommonPage string hcount = r["id"].ToString(); biao += "" + "" - + " " - + " " - + " " - + "" - + " " - + " " - + " "; + if (r["mxlx"].ToString() == "产品") + { + biao += ""; + } + else + { + biao += ""; + } + biao += "" + + " " + + "" + + " " + + "" + + " " + + " " + + "" + + " " + + "" + + " " + + "" + + " " + + " "; } } - cpxx.InnerHtml = biao + "
*项目类型*产品货号产品名称重量(G)体积(ML)规格(CM)种类特殊工艺要求订货数量单位单价金额交货日期备注
*项目类型*产品货号产品名称重量(G)体积(ML)规格(CM)种类烧成方式订货数量单位单价金额交货日期备注
"; - }else{ - biao+=""; - } - biao += "
"; + cpxx.InnerHtml = biao + ""; } #endregion @@ -350,17 +369,17 @@ public partial class TcOrder_Form : CommonPage #endregion - + protected void bt_tj_Click(object sender, EventArgs e) { try { - + string caozuo = "添加"; getmd(); //接收成功参数值 int rtx = 0; - dd.shjg = "等待审核"; + dd.shjg = "等待审核"; //判断uid是否存在值，有值为修改，无值为添加 if (id.Value != null && id.Value != "") { @@ -377,7 +396,7 @@ public partial class TcOrder_Form : CommonPage dd.bh = DBHlper.getbh("ID-", "nr_z_dd", "bh", 4); bh.Text = dd.bh; rtx = ddbll.Add(dd); - + } if (rtx > 0) { @@ -387,7 +406,7 @@ public partial class TcOrder_Form : CommonPage int ci = 0; try { - + foreach (Maticsoft.Model.nr_z_dd_tccp x in xmmds) { ci = ci + 1; @@ -396,12 +415,12 @@ public partial class TcOrder_Form : CommonPage if (x.id > 0 && Request.QueryString["uid"] != null) { xmbll.Update(x); - deletecmd +=" and id !="+x.id; + deletecmd += " and id !=" + x.id; } else { - int mxid=xmbll.Add(x); - deletecmd += " and id !=" + mxid; + int mxid = xmbll.Add(x); + deletecmd += " and id !=" + mxid; } } @@ -409,8 +428,8 @@ public partial class TcOrder_Form : CommonPage } catch { - Response.Write(""); - } + Response.Write(""); + } //将session转换对象取值 Maticsoft.Model.nr_z_yhzh zh = (Maticsoft.Model.nr_z_yhzh)Session["user"]; @@ -432,5 +451,5 @@ public partial class TcOrder_Form : CommonPage Response.Redirect("../Common/error.aspx"); } - } + } } \ No newline at end of file diff --git a/newyt/Module_data/TcOrder_browse.aspx b/newyt/Module_data/TcOrder_browse.aspx index c7f5041..a94c2da 100644 --- a/newyt/Module_data/TcOrder_browse.aspx +++ b/newyt/Module_data/TcOrder_browse.aspx @@ -1,109 +1,183 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeFile="TcOrder_browse.aspx.cs" Inherits="TcOrder_browse" %> - + - - - - - - - - - - - - - - - + + + + + + + + + + + - - - -
-
-
-

合同订单详细页   

回到列表
-
-添加 -▓  打印单据 - - - - - - - - - - -
- -
-
-

合同订单基本信息

- - - - - - - - - - - - - - - - - - - - - - - - -
单据编号：单据名称：订单类型：订单状态：下单日期：制单人：
客户编号：客户名称：联系人：联系方式：业务员： 审核人：
结账日期：审核结果：审核时间：审核意见：订单备注：
-

产品信息

-
-

费用信息

- - - - -
订单总金额：
-
- - - - - - + + + + + + +
+
+
+
+

合同订单详细页   

回到列表 +
+
+ 添加 + ▓  打印单据 + + + + + + + + + + + + +
+ +
+
+ + + + +
+

合同订单基本信息

+
+ + + + + + + + + + + + + + + + + + + + + + + + +
单据编号： + + 单据名称： + + 订单类型： + + 订单状态： + + 下单日期： + + 制单人： + +
客户编号： + + 客户名称： + + 联系人： + + 联系方式： + + 业务员： + + 审核人： + +
结账日期： + + 审核结果： + + 审核时间： + + 审核意见： + + 订单备注： + +
+ + + + +
+

产品信息

+
+
+ + + + +
+

费用信息

+
+ + + + +
订单总金额： + +
+
+ + + + + + + \ No newline at end of file diff --git a/newyt/Module_data/WorkRecord_browse.aspx b/newyt/Module_data/WorkRecord_browse.aspx index 070c5d3..aa2c31c 100644 --- a/newyt/Module_data/WorkRecord_browse.aspx +++ b/newyt/Module_data/WorkRecord_browse.aspx @@ -77,7 +77,7 @@ function qrdjft() { if (confirm("确定要登记吗？")) { - debugger + var jsonStr2 = ""; //获取数据行的行数 var hang = $("#djtb tr").length - 1; diff --git a/newyt/ddselect/Materiel_Form.aspx b/newyt/ddselect/Materiel_Form.aspx index 687c748..27dece9 100644 --- a/newyt/ddselect/Materiel_Form.aspx +++ b/newyt/ddselect/Materiel_Form.aspx @@ -31,7 +31,7 @@ }) function jsgg(){ - debugger; + ; if($("#changdu").val()!=""&&$("#kuandu").val()=="") { $("#guige").val($("#changdu").val()); diff --git a/newyt/ddselect/Materiel_list.aspx b/newyt/ddselect/Materiel_list.aspx index b97a46d..c0c2aee 100644 --- a/newyt/ddselect/Materiel_list.aspx +++ b/newyt/ddselect/Materiel_list.aspx @@ -118,7 +118,7 @@ $("body", parent.document).find('#' + rowval).attr('name', wlzu[0]); $("body", parent.document).find('#' + rowval).val(wlzu[1]); } else if (pagename == "cpkc") { - debugger; + ; if ($("body", parent.document).find('#wlmc' + rowval).length > 0) { $("body", parent.document).find('#wlmc' + rowval).val(wlzu[1]); $("body", parent.document).find('#wlbh' + rowval).val(wlzu[0]); diff --git a/newyt/ddselect/Suite_list.aspx b/newyt/ddselect/Suite_list.aspx index 8099b09..1e634c9 100644 --- a/newyt/ddselect/Suite_list.aspx +++ b/newyt/ddselect/Suite_list.aspx @@ -26,7 +26,7 @@ var rowval = $("body", parent.document).find('#dialogcp').attr("tag"); var pagename = $("body", parent.document).find('#pagename').val(); if (pagename == 'cpbom') { - debugger; + ; $("body", parent.document).find('#cpbh' + rowval).val(xinxizu[0]); $("body", parent.document).find('#cpmc'+ rowval).val(xinxizu[1]); $("body", parent.document).find('#mxlx'+ rowval).val("母件");