From c3e72356b6e9c291c8e9078de7bcec4695cd15da Mon Sep 17 00:00:00 2001
From: xiejianpeng <xiejp@zte-its.com>
Date: Wed, 1 Aug 2018 17:54:00 +0800
Subject: [PATCH] 工时填报

---
 resource/js/unit.js            |  6 +++++-
 topages/workfill/workfill.html | 14 +++++++-------
 topages/workfill/workfill.js   | 44 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/resource/js/unit.js b/resource/js/unit.js
index f6661b0..3c20796 100644
--- a/resource/js/unit.js
+++ b/resource/js/unit.js
@@ -44,10 +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';
diff --git a/topages/workfill/workfill.html b/topages/workfill/workfill.html
index 03184ff..d511d4b 100644
--- a/topages/workfill/workfill.html
+++ b/topages/workfill/workfill.html
@@ -12,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">
@@ -30,7 +30,7 @@
 
     <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">
@@ -47,7 +47,7 @@
     </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">
@@ -64,7 +64,7 @@
     </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">
@@ -81,7 +81,7 @@
     </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">
@@ -98,7 +98,7 @@
     </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">
@@ -115,7 +115,7 @@
     </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">
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index 82116b1..4f40047 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -120,6 +120,10 @@ var fun = {
                     $("#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')) {
@@ -128,10 +132,10 @@ var fun = {
                         $("#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');
@@ -145,6 +149,41 @@ var fun = {
             });
         });
     },
+    //工时信息提交
+    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
@@ -165,6 +204,9 @@ $(document).on('click','.workfill-list-btn',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");
     }
--
libgit2 0.21.4