Commit 7f0bfeefa946cd2356191944424604e6bf865bf5
1 parent
6828b345
工时填报
Showing
2 changed files
with
44 additions
and
8 deletions
topages/staffmanage/staffmanage.js
| @@ -7,6 +7,7 @@ var fun = { | @@ -7,6 +7,7 @@ var fun = { | ||
| 7 | debugger; | 7 | debugger; |
| 8 | console.log(1) | 8 | console.log(1) |
| 9 | fun.createTableData(); | 9 | fun.createTableData(); |
| 10 | + fun.queryBtn(); | ||
| 10 | }, | 11 | }, |
| 11 | //生成表格数据 | 12 | //生成表格数据 |
| 12 | createTableData: function () { | 13 | createTableData: function () { |
| @@ -25,20 +26,33 @@ var fun = { | @@ -25,20 +26,33 @@ var fun = { | ||
| 25 | // uniqueId:'id', | 26 | // uniqueId:'id', |
| 26 | columns: [ | 27 | columns: [ |
| 27 | { | 28 | { |
| 28 | - field: 'id', | ||
| 29 | - title: '<span class="type-icon"></span>类型', | 29 | + field: 'loginCode', |
| 30 | + title: '<span class="type-icon"></span>账号', | ||
| 30 | width: '15%', | 31 | width: '15%', |
| 31 | align: "left", | 32 | align: "left", |
| 32 | formatter: fun.formattfer | 33 | formatter: fun.formattfer |
| 33 | }, | 34 | }, |
| 34 | { | 35 | { |
| 35 | field: 'opName', | 36 | field: 'opName', |
| 36 | - title: '<span class="state-icon"></span>状态', | 37 | + title: '<span class="state-icon"></span>员工名称', |
| 38 | + width: '15%', | ||
| 39 | + align: "left", | ||
| 40 | + formatter: fun.formattfer | ||
| 41 | + }, | ||
| 42 | + { | ||
| 43 | + field: 'roleId', | ||
| 44 | + title: '<span class="state-icon"></span>员工名称', | ||
| 45 | + width: '15%', | ||
| 46 | + align: "left", | ||
| 47 | + formatter: fun.roleNameFormattfer | ||
| 48 | + }, | ||
| 49 | + { | ||
| 50 | + field: 'cityName', | ||
| 51 | + title: '<span class="type-icon"></span>城市', | ||
| 37 | width: '15%', | 52 | width: '15%', |
| 38 | align: "left", | 53 | align: "left", |
| 39 | formatter: fun.formattfer | 54 | formatter: fun.formattfer |
| 40 | } | 55 | } |
| 41 | - | ||
| 42 | ] | 56 | ] |
| 43 | }); | 57 | }); |
| 44 | 58 | ||
| @@ -51,10 +65,22 @@ var fun = { | @@ -51,10 +65,22 @@ var fun = { | ||
| 51 | return value; | 65 | return value; |
| 52 | } | 66 | } |
| 53 | }, | 67 | }, |
| 68 | + roleNameFormattfer: function (value, row, index) { | ||
| 69 | + if (value == null) { | ||
| 70 | + return "-"; | ||
| 71 | + | ||
| 72 | + } else { | ||
| 73 | + if(value == 1){ | ||
| 74 | + return "领导"; | ||
| 75 | + }else if (value == 2){ | ||
| 76 | + return "员工"; | ||
| 77 | + } | ||
| 78 | + } | ||
| 79 | + }, | ||
| 54 | /*获取查询参数*/ | 80 | /*获取查询参数*/ |
| 55 | getQueryParam: function () { | 81 | getQueryParam: function () { |
| 56 | /**员工名字*/ | 82 | /**员工名字*/ |
| 57 | - var opName = ""; | 83 | + var opName = $("#perName").val(); |
| 58 | 84 | ||
| 59 | var req = { | 85 | var req = { |
| 60 | opName: opName | 86 | opName: opName |
| @@ -62,6 +88,11 @@ var fun = { | @@ -62,6 +88,11 @@ var fun = { | ||
| 62 | 88 | ||
| 63 | return req; | 89 | return req; |
| 64 | }, | 90 | }, |
| 91 | + queryBtn:function () { | ||
| 92 | + $("#queryBtn").on('click',function () { | ||
| 93 | + fun.createTableData(); | ||
| 94 | + }) | ||
| 95 | + } | ||
| 65 | 96 | ||
| 66 | }; | 97 | }; |
| 67 | 98 |
topages/workfill/workfill.js
| @@ -123,8 +123,12 @@ var fun = { | @@ -123,8 +123,12 @@ var fun = { | ||
| 123 | //日期回填 | 123 | //日期回填 |
| 124 | var date = moment().subtract('days', weekOfday-i).format('YYYY-MM-DD 01:00:00'); | 124 | var date = moment().subtract('days', weekOfday-i).format('YYYY-MM-DD 01:00:00'); |
| 125 | $("#weekday"+i).attr("data-date",date); | 125 | $("#weekday"+i).attr("data-date",date); |
| 126 | + if(weekOfday-i < 0){ | ||
| 127 | + $("#btn-commit"+i).attr("style","display:none;"); | ||
| 128 | + }else { | ||
| 129 | + $("#btn-commit"+i).attr("style","display:block;"); | ||
| 130 | + } | ||
| 126 | //展示变更 | 131 | //展示变更 |
| 127 | - $("#btn-commit"+i).attr("style","display:block;"); | ||
| 128 | $("#btn-commit"+i).parent().parent().find(".workfill-list-container").attr("contenteditable","true"); | 132 | $("#btn-commit"+i).parent().parent().find(".workfill-list-container").attr("contenteditable","true"); |
| 129 | if($("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')) { | 133 | if($("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')) { |
| 130 | $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').removeClass('display-none'); | 134 | $("#btn-commit"+i).parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').removeClass('display-none'); |
| @@ -157,6 +161,7 @@ var fun = { | @@ -157,6 +161,7 @@ var fun = { | ||
| 157 | var dailyDate = $("#weekday"+id).attr("data-date"); | 161 | var dailyDate = $("#weekday"+id).attr("data-date"); |
| 158 | var dailyContent = $("#daily-report"+id).text(); | 162 | var dailyContent = $("#daily-report"+id).text(); |
| 159 | 163 | ||
| 164 | + | ||
| 160 | var req= { | 165 | var req= { |
| 161 | id:arsaId, | 166 | id:arsaId, |
| 162 | projectId:projectId, | 167 | projectId:projectId, |
| @@ -172,9 +177,9 @@ var fun = { | @@ -172,9 +177,9 @@ var fun = { | ||
| 172 | dataType:'json', | 177 | dataType:'json', |
| 173 | success: function(res){ | 178 | success: function(res){ |
| 174 | if(res.success == true){ | 179 | if(res.success == true){ |
| 175 | - console.log(aaa); | 180 | + // console.log("aaa"); |
| 176 | }else{ | 181 | }else{ |
| 177 | - $("#areamanage_areaaddmodel-errormsg").text("新增失败,请新重试保存!"); | 182 | + $("#areamanage_areaaddmodel-errormsg").text("保存失败,请新重试保存!"); |
| 178 | $("#areamanage_areaaddmodel-errormsg").show(); | 183 | $("#areamanage_areaaddmodel-errormsg").show(); |
| 179 | return false; | 184 | return false; |
| 180 | 185 |