提交

王富生
2 parents cff6a689 0bc75c53
Showing 8 changed files with 46 additions and 21 deletions
login/login.html
resource/js/unit.js
topages/hourscount/hourscount.js
topages/staffmanage/staffmanage.js
topages/workfill/workfill.css
topages/workfill/workfill.html
topages/workfill/workfill.js
topages/workquery/workquery.js
@@ -17,7 +17,7 @@
         <div class="login-main">
             <div class="login-name">中兴智能工时系统</div>
             <div class="login-hint">轻松工作每一天</div>
-            <input type="text" autocomplete=”off” class="login-username" id="login-username" placeholder="邮箱或者账户名">
+            <input type="text" autocomplete=”off” class="login-username" id="login-username" placeholder="邮箱或者用户名">
             <input type="password" autocomplete=”off” class="login-password" id="login-password" placeholder="密码">
             <div class="login-errorifo" id="login-errorifo"></div>
             <div class="login-btn" id="login-btn">登录</div>
@@ -566,5 +566,22 @@ var commonClass = {
         }
     }
 }
+/**
+ * jquery 解绑绑定函数.<br/>
+ * wangfs 2018-01-11.<br/>
+ */
+var documentBindFunc ={
+    /**
+     * @param event  事件名称如：click
+     * @param element 元素 如：id,class 元素等
+     * @param func 函数
+     * 例子：documentBindFunc.on('click','#berthmanage-addBtn',function () {});
+     */
+    on: function (event, element, func) {
+        $(document).off(event, element);
+        $(document).on(event, element, func);
+    }
+
+};
 $("#loginShowName").text(fn.getUserName());
@@ -100,7 +100,7 @@ var fun= {
     },
     //查询announce
     queryBtn:function(){
-        $(document).on('click','#queryBtn',function(){
+        documentBindFunc.on('click','#queryBtn',function(){
             fun.queryAsraDailyAllForList();
         });
     },
@@ -88,7 +88,7 @@ var fun = {
         return req;
     },
     queryBtn:function () {
-        $("#queryBtn").on('click',function () {
+        documentBindFunc.on('click','#queryBtn',function () {
             fun.createTableData();
         })
     }
@@ -61,6 +61,10 @@
 .workfill-list-btn{
     padding: 3px 20px;
     border-radius: 15px;
+    border: 0;
+}
+.workfill-list-btn:focus{
+    outline: none;
 }
 .workfill-list-wrap li:nth-of-type(1) .workfill-list-btn{
     background-color: #fedee5;
@@ -13,7 +13,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -31,7 +31,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer"  id="btn-commit2">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -48,7 +48,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -65,7 +65,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer"  id="btn-commit4">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -82,7 +82,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer"  id="btn-commit5">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -99,7 +99,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer"  id="btn-commit6">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -116,7 +116,7 @@
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
             <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>
+            <button class="float-right workfill-list-btn cursor-pointer"  id="btn-commit7">提交</button>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -49,7 +49,7 @@ var fun = {
     },
     //退出
     logout:function(){
-       $(document).on('click','#logoutId',function(){
+        documentBindFunc.on('click','#logoutId',function(){
            fn.loginOut();
        });
     },
@@ -146,7 +146,7 @@ var fun = {
                 $("#work-projectName"+row.weeksNum).selectpicker('val',row.projectId);
                 $("#work-projectName"+row.weeksNum).selectpicker('refresh');
-                $("#btn-commit"+row.weeksNum).text('编辑');
+                $("#btn-commit"+row.weeksNum).html('编辑');
                 $("#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();
@@ -169,6 +169,7 @@ var fun = {
                 $('.ITD-alertmodel-contentmsg').text('');
                 $('#ITD-tipsmodel').modal('hide');
             },3000);
+            _this.removeAttr("disabled");
             return false;
         }else{
             var req= {
@@ -188,12 +189,13 @@ var fun = {
                     if(res.success == true){
                         var asraId = res.data;
                         $("#weekday"+id).attr("data-id",asraId);
-                        _this.text('编辑');
+                        _this.html('编辑');
                         _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
-                        _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
+                        _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').addClass('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').removeClass('display-none');
                         _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+                        _this.removeAttr("disabled");
                     }else{
                         $('.ITD-alertmodel-contentmsg').text('提交失败!');
@@ -202,6 +204,7 @@ var fun = {
                             $('.ITD-alertmodel-contentmsg').text('');
                             $('#ITD-tipsmodel').modal('hide');
                         },3000);
+                        _this.removeAttr("disabled");
                         return false;
                     }
                 }
@@ -215,21 +218,21 @@ var fun = {
 };
 fun.init();
 // 上一周点击time-opr-prevbtn
-$('#time-opr-prevbtn').on('click',function () {
+documentBindFunc.on('click','#time-opr-prevbtn',function () {
     fun.timeoprprevbtn();
     fun.getAsraDailyListMsg();
 });
 // 下一周点击time-opr-nextbtn
-$('#time-opr-nextbtn').on('click',function () {
+documentBindFunc.on('click','#time-opr-nextbtn',function () {
     fun.timeoprnextbtn();
     fun.getAsraDailyListMsg();
 });
 //提交事件
-$(document).on('click','.workfill-list-btn',function () {
+documentBindFunc.on('click','.workfill-list-btn',function () {
     var _this=$(this);
     if(_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')){
-        _this.text('提交');
+        _this.html('提交');
         _this.parent().parent().find(".workfill-list-container").attr("contenteditable","true");
         _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();
@@ -237,6 +240,7 @@ $(document).on(&#39;click&#39;,&#39;.workfill-list-btn&#39;,function () {
         _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
     }else {
+        _this.attr("disabled","disabled");
         var commitId = _this.attr("id");
         var id = commitId.substring(10,11);
         fun.dailyReportCommit(id,_this);
@@ -14,7 +14,7 @@ var fun={
     },
     dateInit:function () {
         //时间初始化
-        $('#workquery-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD'));
+        $('#workquery-daterange-btnsta').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
         $('#workquery-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
         //开始日期
         $("#workquery-daterange-btnsta").datetimepicker({
@@ -146,7 +146,7 @@ var fun={
     },
     //查询announce
     queryBtn:function(){
-        $(document).on('click','#queryBtn',function(){
+        documentBindFunc.on('click','#queryBtn',function(){
             fun.queryAsraDailyAllForList();
         });
     },