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

---
 topages/staffmanage/staffmanage.js | 41 ++++++++++++++++++++++++++++++++++++-----
 topages/workfill/workfill.js       | 11 ++++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/topages/staffmanage/staffmanage.js b/topages/staffmanage/staffmanage.js
index 46fe020..05b67eb 100644
--- a/topages/staffmanage/staffmanage.js
+++ b/topages/staffmanage/staffmanage.js
@@ -7,6 +7,7 @@ var fun = {
         debugger;
         console.log(1)
         fun.createTableData();
+        fun.queryBtn();
     },
     //生成表格数据
     createTableData: function () {
@@ -25,20 +26,33 @@ var fun = {
             // uniqueId:'id',
             columns: [
                 {
-                    field: 'id',
-                    title: '<span class="type-icon"></span>类型',
+                    field: 'loginCode',
+                    title: '<span class="type-icon"></span>账号',
                     width: '15%',
                     align: "left",
                     formatter: fun.formattfer
                 },
                 {
                     field: 'opName',
-                    title: '<span class="state-icon"></span>状态',
+                    title: '<span class="state-icon"></span>员工名称',
+                    width: '15%',
+                    align: "left",
+                    formatter: fun.formattfer
+                },
+                {
+                    field: 'roleId',
+                    title: '<span class="state-icon"></span>员工名称',
+                    width: '15%',
+                    align: "left",
+                    formatter: fun.roleNameFormattfer
+                },
+                {
+                    field: 'cityName',
+                    title: '<span class="type-icon"></span>城市',
                     width: '15%',
                     align: "left",
                     formatter: fun.formattfer
                 }
-
             ]
         });
 
@@ -51,10 +65,22 @@ var fun = {
             return value;
         }
     },
+    roleNameFormattfer: function (value, row, index) {
+        if (value == null) {
+            return "-";
+
+        } else {
+            if(value == 1){
+                return "领导";
+            }else if (value == 2){
+                return "员工";
+            }
+        }
+    },
     /*获取查询参数*/
     getQueryParam: function () {
         /**员工名字*/
-        var opName = "";
+        var opName = $("#perName").val();
 
         var req = {
             opName: opName
@@ -62,6 +88,11 @@ var fun = {
 
         return req;
     },
+    queryBtn:function () {
+        $("#queryBtn").on('click',function () {
+            fun.createTableData();
+        })
+    }
 
 };
 
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index 4f40047..0c0cc78 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -123,8 +123,12 @@ var fun = {
                     //日期回填
                     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;");
+                    }else {
+                        $("#btn-commit"+i).attr("style","display:block;");
+                    }
                     //展示变更
-                    $("#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');
@@ -157,6 +161,7 @@ var fun = {
         var dailyDate  = $("#weekday"+id).attr("data-date");
         var dailyContent = $("#daily-report"+id).text();
 
+
         var req= {
             id:arsaId,
             projectId:projectId,
@@ -172,9 +177,9 @@ var fun = {
             dataType:'json',
             success: function(res){
                 if(res.success == true){
-                    console.log(aaa);
+                    // console.log("aaa");
                 }else{
-                    $("#areamanage_areaaddmodel-errormsg").text("新增失败,请新重试保存!");
+                    $("#areamanage_areaaddmodel-errormsg").text("保存失败,请新重试保存!");
                     $("#areamanage_areaaddmodel-errormsg").show();
                     return false;
 
--
libgit2 0.21.4