diff --git a/resource/js/unit.js b/resource/js/unit.js index b2e3bf2..a9d78e1 100644 --- a/resource/js/unit.js +++ b/resource/js/unit.js @@ -10,8 +10,9 @@ sysComm = { //阿里云测试环境，别删 -//var parkcloudbaseUrl = 'http://localhost:8101/';// url公用地址 -var parkcloudbaseUrl = 'http://192.168.1.196:8101/';// url公用地址 +// var parkcloudbaseUrl = 'http://192.168.1.196:8101/';// url公用地址 + +var parkcloudbaseUrl = 'http://127.0.0.1:8101/';// url公用地址 diff --git a/topages/workfill/workfill.html b/topages/workfill/workfill.html index 276fdeb..1299722 100644 --- a/topages/workfill/workfill.html +++ b/topages/workfill/workfill.html @@ -14,9 +14,9 @@ -
  • +
  • @@ -62,9 +62,9 @@ - +
    • -
  • 取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价
    • +
  • 取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价
    • @@ -74,9 +74,9 @@ -
  • +
    • @@ -104,9 +104,9 @@ -
  • +
    • @@ -134,9 +134,9 @@ -
  • +
    • @@ -164,9 +164,9 @@ -
  • +
    • @@ -194,9 +194,9 @@ -
  • +
    • diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js index be53107..95e824a 100644 --- a/topages/workfill/workfill.js +++ b/topages/workfill/workfill.js @@ -70,7 +70,7 @@ var fun = { }, /***获取项目下拉框.*/ getAsraProject:function(){ - //debugger; + // debugger; fn.getAsraProject("",function(data){ var html=""; $.each(data,function(index,row){ @@ -98,7 +98,7 @@ var fun = { return req; }, queryAsraDailyList:function(callBack){ - // debugger; + debugger; var req = fun.getQueryParam(); //设置请求参数 req.sysCode = sysComm.sysCode; @@ -119,30 +119,47 @@ var fun = { }, /***获取日报信息.*/ getAsraDailyListMsg:function(){ - // debugger; + debugger; fun.queryAsraDailyList(function(data){ + /**先进性初始化*/ for(var i=1;i<8;i++){ - $("#btn-commit"+i).parent().parent().attr("style","display:block;"); + if($("#weekday" + i).next().hasClass("commited-icon")) { + $("#weekday" + i).next().removeClass("commited-icon"); + $("#weekday" + i).next().addClass("nocommited-icon"); + $("#weekday" + i).next().html("未填写"); + } + $("#weekday"+i).parent().parent().show(); + $("#btn-commit"+i).html('提交'); $("#work-projectName"+i).selectpicker('val',''); $("#work-projectName"+i).selectpicker('refresh'); $("#daily-report"+i).html(""); //如果不是本周则隐藏按钮 - if(clicknum == 1){ - $("#btn-commit"+i).attr("style","display:none;"); - $("#btn-commit"+i).parent().parent().find(".workfill-list-container").attr("contenteditable","false"); - $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').addClass('display-none'); - var projectName=$("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text(); - $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').removeClass('display-none'); - $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName); + if(clicknum >= 1) { + $("#btn-commit" + i).attr("style", "display:none;"); + $("#btn-commit" + i).parent().parent().find(".workfill-list-container").attr("contenteditable", "false"); + $("#btn-commit" + i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').addClass('display-none'); + var projectName = $("#btn-commit" + i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text(); + $("#btn-commit" + i).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').removeClass('display-none'); + $("#btn-commit" + i).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName); + var ele = $("#weekday" + i).parent(); + ele.find('.slide-text').text('全部展开') + ele.parent().siblings().find('.slide-icon').removeClass('slide-icon-active'); + ele.find('.slide-icon').addClass('slide-icon-active'); + ele.parent().siblings().find('.workquery-list-container').slideUp(); + ele.parent().find('.workquery-list-container').slideUp(); }else if(clicknum == 0){ //日期回填 var date = moment().subtract('days', weekOfday-i).format('YYYY-MM-DD 01:00:00'); $("#weekday"+i).attr("data-date",date); if(weekOfday-i < 0){ $("#btn-commit"+i).attr("style","display:none;"); - $("#btn-commit"+i).parent().parent().attr("style","display:none;"); - }else { + $("#weekday"+i).parent().parent().hide(); + }else if(weekOfday-i == 0){ + if(weekOfday-i == 0){ + var ele = $("#weekday"+i).parent(); + fun.listToggle(ele); + } $("#btn-commit"+i).attr("style","display:block;"); } //展示变更 @@ -155,7 +172,14 @@ var fun = { } } } + /**回填数据*/ $.each(data,function(index,row){ + if($("#weekday" + row.weeksNum).next().hasClass("nocommited-icon")) { + $("#weekday" + row.weeksNum).next().removeClass("nocommited-icon"); + $("#weekday" + row.weeksNum).next().addClass("commited-icon"); + $("#weekday" + row.weeksNum).next().html("已填写"); + } + $("#weekday"+row.weeksNum).attr("data-id",row.id); $("#daily-report"+row.weeksNum).html(row.dailyContent); $("#work-projectName"+row.weeksNum).selectpicker('val',row.projectId); @@ -212,6 +236,13 @@ var fun = { _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName); _this.removeAttr("disabled"); + if($("#weekday" + id).next().hasClass("nocommited-icon")) { + $("#weekday" + id).next().removeClass("nocommited-icon"); + $("#weekday" + id).next().addClass("commited-icon"); + $("#weekday" + id).next().html("已填写"); + } + + }else{ $('.ITD-alertmodel-contentmsg').text('提交失败!'); $('#ITD-tipsmodel').modal('show');