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

# Conflicts: # resource/js/unit.js

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
# Conflicts: # resource/js/unit.js
王富生
2 parents 33e7e44f f7f5bf9e
Showing 5 changed files with 52 additions and 38 deletions
index/index.html
topages/login/login.css
topages/staffmanage/staffmanage.js
topages/topagesTmp.js
topages/workfill/workfill.js
@@ -26,11 +26,11 @@
         </div>
         <nav class="float-right">
-            <ul class="nav-bar-container">
-                <li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>
-                <li id="button-workquery"><a href="#/workquery" >工时查询</a></li>
-                <li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>
-                <li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>
+            <ul class="nav-bar-container" id="nav-bar-container">
+                <!--<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>-->
+                <!--<li id="button-workquery"><a href="#/workquery" >工时查询</a></li>-->
+                <!--<li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>-->
+                <!--<li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>-->
             </ul>
         </nav>
     </div>
@@ -2,6 +2,7 @@ html,body{
     width: 100%;
     height: 100%;
     overflow: hidden;
+    background-color: #fff;
 }
 .login-wrap{
     width:calc(100% - 800px);
@@ -48,7 +49,7 @@ html,body{
     height: 48px;
     line-height: 48px;
     padding-left: 20px;
-    background-color: #f2f3f4;
+    background-color: #f2f3f4!important;
     font-size: 14px;
     color: rgba(0,0,0,.4);
     border: 0;
@@ -56,7 +57,8 @@ html,body{
 }
 input:focus {outline: none;}
 input:-webkit-autofill {
-    -webkit-box-shadow: 0 0 0px 1000px white inset !important;
+    background-color: #f2f3f4!important;
+    -webkit-box-shadow: 0 0 0px 1000px #f2f3f4 inset !important;
 }
 .login-username{
     margin: 64px 0 40px;
@@ -4,7 +4,6 @@
 var fun = {
     /**初始化*/
     init:function(){
-        debugger;
         console.log(1)
         fun.createTableData();
         fun.queryBtn();
 /**
  * Created by mac on 18/7/24.
  */
+
+if(fn.getRoleId == 3){
+    $('#nav-bar-container').append(' <li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li> <li id="button-workquery"><a href="#/workquery" >工时查询</a></li> <li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li> <li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>')
+}else{
+    $('#nav-bar-container').append('<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li> <li id="button-workquery"><a href="#/workquery" >工时查询</a></li> <li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>')
+}
 function Router(){
     this.routes = {};
     this.curUrl = '';
@@ -104,9 +104,10 @@ 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;");
                 $("#work-projectName"+i).selectpicker('val','');
                 $("#work-projectName"+i).selectpicker('refresh');
                 $("#daily-report"+i).html("");
@@ -125,6 +126,7 @@ var fun = {
                     $("#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 {
                         $("#btn-commit"+i).attr("style","display:block;");
                     }
@@ -160,37 +162,42 @@ var fun = {
         var projectId = $("#work-projectName"+id).find("option:selected").val();
         var dailyDate  = $("#weekday"+id).attr("data-date");
         var dailyContent = $("#daily-report"+id).text();
+        if(dailyContent==''){
+            alert('')
+        }else{
+            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){
+                        _this.text('编辑');
+                        _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
+                        _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
+                        var projectName=_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text();
+                        _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').toggleClass('display-none');
+                        _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+
+                    }else{
+                        alert("失败");
+                        return false;
+                    }
+                }
+            };
+            sysAjax(editAreaBlok);
+        }
+
-        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){
-                    _this.text('编辑');
-                    _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
-                    _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
-                    var projectName=_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text();
-                    _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').toggleClass('display-none');
-                    _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
-
-                }else{
-                    alert("失败");
-                    return false;
-                }
-            }
-        };
-        sysAjax(editAreaBlok);
     }
 };
 fun.init();