Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

王富生
2 parents 5c517955 c3e72356
Showing 3 changed files with 140 additions and 49 deletions
resource/js/unit.js
topages/workfill/workfill.html
topages/workfill/workfill.js
@@ -44,6 +44,14 @@ dataUrl.util = {
     queryAsraOpPage: function () {
         return parkcloudbaseUrl + 'asraOp/queryAsraOpPage';
     },
+    //日报系统-工时填报查询
+    queryAsraDailyList: function () {
+        return parkcloudbaseUrl + 'asraDaily/queryAsraDailyList';
+    },
+    //日报系统-工时填报
+    saveOrUpdateAsraDaily: function () {
+        return parkcloudbaseUrl + 'asraDaily/saveOrUpdateAsraDaily';
+    },
     //查询项目列表
     queryAsraProjectForList:function(){
         return parkcloudbaseUrl + 'asraProject/queryAsraProjectForList';
 <div class="time-opr-wrap clearfix">
     <div class="float-left time-opr-area">
         <div class="time-opr-nowtime" id="time-opr-nowtime"></div>
+        <div class="time-opr-nowtime" id="querytime" style="display:none"></div>
         <div class="time-opr-btnwrap clearfix">
             <div class="time-opr-btn time-opr-prevbtn cursorpointer float-left" id="time-opr-prevbtn">上一周</div>
             <div class="time-opr-btn time-opr-nextbtn cursorpointer float-left display-none" id="time-opr-nextbtn">下一周</div>
@@ -11,7 +12,7 @@
 <ul class="workfill-list-wrap clearfix">
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday1">周一</span>
+            <span class="float-left workfill-list-weekday" id="weekday1" data-id="" data-date="">周一</span>
             <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -23,18 +24,13 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report1">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
+
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday2">周二</span>
+            <span class="float-left workfill-list-weekday" id="weekday2" data-id="" data-date="">周二</span>
             <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit2">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -46,18 +42,12 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report2">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday3">周三</span>
+            <span class="float-left workfill-list-weekday" id="weekday3" data-id="" data-date="">周三</span>
             <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -69,18 +59,12 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report3">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday4">周四</span>
+            <span class="float-left workfill-list-weekday" id="weekday4" data-id="" data-date="">周四</span>
             <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit4">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -92,18 +76,12 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report4">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday5">周五</span>
+            <span class="float-left workfill-list-weekday" id="weekday5" data-id="" data-date="">周五</span>
             <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit5">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -115,18 +93,12 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true"  id="daily-report5">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday6">周六</span>
+            <span class="float-left workfill-list-weekday" id="weekday6" data-id="" data-date="">周六</span>
             <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit6">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -138,18 +110,12 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report6">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday" id="weekday7">周日</span>
+            <span class="float-left workfill-list-weekday" id="weekday7" data-id="" data-date="">周日</span>
             <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit7">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
@@ -161,13 +127,7 @@
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
         <div class="workfill-list-container"  contenteditable="true" id="daily-report7">
-            相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-
-            异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
-
-            此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
-            异地购房、离婚购房提取公积金受限
         </div>
     </li>
@@ -14,10 +14,12 @@ var fun = {
         // 获取今天时间
         var todaytime  = moment().subtract('days', 0).format('YYYY/MM/DD');
         $('#time-opr-nowtime').text(todaytime);
+        $('#querytime').text(moment().subtract('days', weekOfday-1).format('YYYY-MM-DD'));
         //
         fun.logout();
         //获取项目
         fun.getAsraProject();
+        fun.getAsraDailyListMsg();
     },
     timeoprprevbtn:function () {
         $('#time-opr-nextbtn').removeClass('display-none');
@@ -26,6 +28,7 @@ var fun = {
         var start = weekOfday+7*clicknum-1;
         var end = weekOfday+ clicknum*7-7;
         $('#time-opr-show').text(moment().subtract('days', start).format('YYYY/MM/DD')+' - '+moment().subtract('days',end).format('YYYY/MM/DD'));
+        $('#querytime').text(moment().subtract('days', start).format('YYYY-MM-DD'));
     },
     timeoprnextbtn:function () {
@@ -33,11 +36,13 @@ var fun = {
         console.log(clicknum)
         if(clicknum == 0){
             $('#time-opr-show').text(moment().subtract('days', weekOfday-1).format('YYYY/MM/DD')+' - '+moment().subtract('days', 0).format('YYYY/MM/DD'));
+            $('#querytime').text(moment().subtract('days', weekOfday-1).format('YYYY-MM-DD'));
             $('#time-opr-nextbtn').addClass('display-none');
         }else{
             var start = weekOfday+7*clicknum-1;
             var end = weekOfday+ clicknum*7-7;
             $('#time-opr-show').text(moment().subtract('days', start).format('YYYY/MM/DD')+' - '+moment().subtract('days',end).format('YYYY/MM/DD'));
+            $('#querytime').text(moment().subtract('days', start).format('YYYY-MM-DD'));
         }
@@ -65,16 +70,131 @@ var fun = {
                 }
             }
         });
+    },
+    /*获取查询参数*/
+    getQueryParam: function () {
+        /**员工名字*/
+        var dailyDate = $("#querytime").text()+" 00:00:00";
+
+        var req = {
+            dailyDate: dailyDate
+        };
+
+        return req;
+    },
+    queryAsraDailyList:function(callBack){
+        // debugger;
+        var req = fun.getQueryParam();
+        //设置请求参数
+        req.sysCode = sysComm.sysCode;
+        var opt = {
+            method: 'post',
+            url: dataUrl.util.queryAsraDailyList(),
+            data: JSON.stringify(req),
+            contentType: 'application/json; charset=utf-8',
+            dataType: 'json',
+            success: function (res) {
+                if (res.success == true) {
+                    console.log(res.data);
+                    callBack(res.data);
+                }
+            }
+        };
+        sysAjax(opt);
+    },
+    /***获取日报信息.*/
+    getAsraDailyListMsg:function(){
+        debugger;
+        fun.queryAsraDailyList(function(data){
+            for(var i=1;i<8;i++){
+                $("#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);
+
+                }else if(clicknum == 0){
+                    //日期回填
+                    var date = moment().subtract('days', weekOfday-i).format('YYYY-MM-DD 01:00:00');
+                    $("#weekday"+i).attr("data-date",date);
+                    //展示变更
+                    $("#btn-commit"+i).attr("style","display:block;");
+                    $("#btn-commit"+i).parent().parent().find(".workfill-list-container").attr("contenteditable","true");
+                    if($("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')) {
+                        $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').removeClass('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').addClass('display-none');
+                        $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+                    }
+                }
+            }
+            $.each(data,function(index,row){
+                $("#weekday"+row.weeksNum).attr("data-id",row.id);
+                $("#daily-report"+row.weeksNum).html(row.dailyContent);
+                $("#work-projectName"+row.weeksNum).selectpicker('val',row.projectId);
+                $("#work-projectName"+row.weeksNum).selectpicker('refresh');
+
+                $("#btn-commit"+row.weeksNum).text('编辑');
+                $("#btn-commit"+row.weeksNum).parent().parent().find(".workfill-list-container").attr("contenteditable","false");
+                $("#btn-commit"+row.weeksNum).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').addClass('display-none');
+                var projectName=$("#btn-commit"+row.weeksNum).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text();
+                $("#btn-commit"+row.weeksNum).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').removeClass('display-none');
+                $("#btn-commit"+row.weeksNum).parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+            });
+        });
+    },
+    //工时信息提交
+    dailyReportCommit:function (id) {
+        console.log(id);
+        var arsaId  = $("#weekday"+id).attr("data-id");
+        var projectId = $("#work-projectName"+id).find("option:selected").val();
+        var dailyDate  = $("#weekday"+id).attr("data-date");
+        var dailyContent = $("#daily-report"+id).text();
+
+        var req= {
+            id:arsaId,
+            projectId:projectId,
+            dailyDate:dailyDate,
+            dailyContent:dailyContent,
+            sysCode:sysComm.sysCode
+        };
+        var editAreaBlok= {
+            method: "post",
+            url: dataUrl.util.saveOrUpdateAsraDaily(),
+            data: JSON.stringify(req),
+            contentType: 'application/json; charset=utf-8',
+            dataType:'json',
+            success: function(res){
+                if(res.success == true){
+                    console.log(aaa);
+                }else{
+                    $("#areamanage_areaaddmodel-errormsg").text("新增失败,请新重试保存!");
+                    $("#areamanage_areaaddmodel-errormsg").show();
+                    return false;
+
+                }
+            }
+        };
+        sysAjax(editAreaBlok);
+
     }
 };
 fun.init();
 // 上一周点击time-opr-prevbtn
 $('#time-opr-prevbtn').on('click',function () {
     fun.timeoprprevbtn();
+    fun.getAsraDailyListMsg();
 });
 // 下一周点击time-opr-nextbtn
 $('#time-opr-nextbtn').on('click',function () {
     fun.timeoprnextbtn();
+    fun.getAsraDailyListMsg();
 });
 //提交事件
@@ -84,6 +204,9 @@ $(document).on(&#39;click&#39;,&#39;.workfill-list-btn&#39;,function () {
         _this.text('提交');
         _this.parent().parent().find(".workfill-list-container").attr("contenteditable","true");
     }else {
+        var commitId = _this.attr("id");
+        var id = commitId.substring(10,11);
+        fun.dailyReportCommit(id);
         _this.text('编辑');
         _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
     }