diff --git a/BO/Views/cm/cms.cshtml b/BO/Views/cm/cms.cshtml index 714be60..233613b 100644 --- a/BO/Views/cm/cms.cshtml +++ b/BO/Views/cm/cms.cshtml @@ -296,6 +296,13 @@ $("#tyear").on("change", function () { bindtseq(); }); + + if ("@Model.stringval10" == null || "@Model.stringval10" == "" || "@Model.stringval10" == undefined) { + $("#stringval10").val("@DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01")"); + } + if ("@Model.stringval11" == null || "@Model.stringval11" == "" || "@Model.stringval11" == undefined) { + $("#stringval11").val("@DateTime.Now.AddMonths(1).ToString("yyyy-MM-01")"); + } }); function cbgetcm() { if (capResult.obj != null && capResult.obj.length > 0) { diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index ea0b57e..4d7aac5 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1725,7 +1725,7 @@ b.cgno,b.pcgno,b.cgname,b.cgcode,b.isuse,b.iscover,b.isdel,b.cdt,b.cno,b.udt,b.uno,b.uip from cg a left outer join cg b on a.cgno = b.pcgno - where a.isdel=0 + where b.isdel=0 and b.isuse = 1 a.cgcode=#cgcode#