BJ_web_developers / workreport

Commit 46270f5b636368a24f26ed728faca9a363ea9750

Authored by 王富生
2 parents 830c458c 6cd51ae8

Merge remote-tracking branch 'origin/test' into test

Inline Side-by-side
Showing 3 changed files with 36 additions and 27 deletions
topages/staffmanage/staffmanage.html
  View file @46270f5
... ... @@ -11,5 +11,5 @@
11 11 <table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped">
12 12 </table>
13 13  
14   -<script src="../../topages/staffmanage/staffmanage.js"></script>
  14 +<script src="../topages/staffmanage/staffmanage.js"></script>
15 15  
... ...
topages/staffmanage/staffmanage.js
  View file @46270f5
... ... @@ -28,20 +28,29 @@ var fun = {
28 28 field: 'id',
29 29 title: '<span class="type-icon"></span>类型',
30 30 width: '15%',
31   - align: "left"
  31 + align: "left",
  32 + formatter: fun.formattfer
32 33 },
33 34 {
34 35 field: 'opName',
35 36 title: '<span class="state-icon"></span>状态',
36 37 width: '15%',
37   - align: "left"
38   - },
  38 + align: "left",
  39 + formatter: fun.formattfer
  40 + }
39 41  
40 42 ]
41 43 });
42 44  
43 45 },
  46 + formattfer: function (value, row, index) {
  47 + if (value == null) {
  48 + return "-";
44 49  
  50 + } else {
  51 + return value;
  52 + }
  53 + },
45 54 /*获取查询参数*/
46 55 getQueryParam: function () {
47 56 /**员工名字*/
... ... @@ -79,8 +88,8 @@ function tableLoadRequest(params) {
79 88 contentType: 'application/json; charset=utf-8',
80 89 dataType: 'json',
81 90 success: function (res) {
82   - if (res.code == '8888') {
83   - //console.log(res.data);
  91 + if (res.success == true) {
  92 + console.log(res.data);
84 93 params.success(res.data);
85 94 }
86 95 }
... ...
topages/workfill/workfill.html
  View file @46270f5
... ... @@ -11,8 +11,8 @@
11 11 <ul class="workfill-list-wrap clearfix">
12 12 <li class="workfill-list-li boxshadow">
13 13 <div class="workfill-list-weekday-wrap clearfix">
14   - <span class="float-left workfill-list-weekday">周一</span>
15   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  14 + <span class="float-left workfill-list-weekday" id="weekday1">周一</span>
  15 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</span>
16 16 </div>
17 17 <div class="workfill-list-projectnamewrap">
18 18 <div class="pos-abs workfill-projectCon">
... ... @@ -22,7 +22,7 @@
22 22 </div>
23 23 <div class="workfill-list-projectname display-none">项目名称</div>
24 24 </div>
25   - <div class="workfill-list-container" contenteditable="true">
  25 + <div class="workfill-list-container" contenteditable="true" id="daily-report1">
26 26 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
27 27  
28 28 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -34,8 +34,8 @@
34 34 </li>
35 35 <li class="workfill-list-li boxshadow">
36 36 <div class="workfill-list-weekday-wrap clearfix">
37   - <span class="float-left workfill-list-weekday">周二</span>
38   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  37 + <span class="float-left workfill-list-weekday" id="weekday2">周二</span>
  38 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit2">提交</span>
39 39 </div>
40 40 <div class="workfill-list-projectnamewrap">
41 41 <div class="pos-abs workfill-projectCon">
... ... @@ -45,7 +45,7 @@
45 45 </div>
46 46 <div class="workfill-list-projectname display-none">项目名称</div>
47 47 </div>
48   - <div class="workfill-list-container" contenteditable="true">
  48 + <div class="workfill-list-container" contenteditable="true" id="daily-report2">
49 49 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
50 50  
51 51 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -57,8 +57,8 @@
57 57 </li>
58 58 <li class="workfill-list-li boxshadow">
59 59 <div class="workfill-list-weekday-wrap clearfix">
60   - <span class="float-left workfill-list-weekday">周三</span>
61   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  60 + <span class="float-left workfill-list-weekday" id="weekday3">周三</span>
  61 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</span>
62 62 </div>
63 63 <div class="workfill-list-projectnamewrap">
64 64 <div class="pos-abs workfill-projectCon">
... ... @@ -68,7 +68,7 @@
68 68 </div>
69 69 <div class="workfill-list-projectname display-none">项目名称</div>
70 70 </div>
71   - <div class="workfill-list-container" contenteditable="true">
  71 + <div class="workfill-list-container" contenteditable="true" id="daily-report3">
72 72 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
73 73  
74 74 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -80,8 +80,8 @@
80 80 </li>
81 81 <li class="workfill-list-li boxshadow">
82 82 <div class="workfill-list-weekday-wrap clearfix">
83   - <span class="float-left workfill-list-weekday">周四</span>
84   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  83 + <span class="float-left workfill-list-weekday" id="weekday4">周四</span>
  84 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit4">提交</span>
85 85 </div>
86 86 <div class="workfill-list-projectnamewrap">
87 87 <div class="pos-abs workfill-projectCon">
... ... @@ -91,7 +91,7 @@
91 91 </div>
92 92 <div class="workfill-list-projectname display-none">项目名称</div>
93 93 </div>
94   - <div class="workfill-list-container" contenteditable="true">
  94 + <div class="workfill-list-container" contenteditable="true" id="daily-report4">
95 95 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
96 96  
97 97 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -103,8 +103,8 @@
103 103 </li>
104 104 <li class="workfill-list-li boxshadow">
105 105 <div class="workfill-list-weekday-wrap clearfix">
106   - <span class="float-left workfill-list-weekday">周五</span>
107   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  106 + <span class="float-left workfill-list-weekday" id="weekday5">周五</span>
  107 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit5">提交</span>
108 108 </div>
109 109 <div class="workfill-list-projectnamewrap">
110 110 <div class="pos-abs workfill-projectCon">
... ... @@ -114,7 +114,7 @@
114 114 </div>
115 115 <div class="workfill-list-projectname display-none">项目名称</div>
116 116 </div>
117   - <div class="workfill-list-container" contenteditable="true">
  117 + <div class="workfill-list-container" contenteditable="true" id="daily-report5">
118 118 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
119 119  
120 120 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -126,8 +126,8 @@
126 126 </li>
127 127 <li class="workfill-list-li boxshadow">
128 128 <div class="workfill-list-weekday-wrap clearfix">
129   - <span class="float-left workfill-list-weekday">周六</span>
130   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  129 + <span class="float-left workfill-list-weekday" id="weekday6">周六</span>
  130 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit6">提交</span>
131 131 </div>
132 132 <div class="workfill-list-projectnamewrap">
133 133 <div class="pos-abs workfill-projectCon">
... ... @@ -137,7 +137,7 @@
137 137 </div>
138 138 <div class="workfill-list-projectname display-none">项目名称</div>
139 139 </div>
140   - <div class="workfill-list-container" contenteditable="true">
  140 + <div class="workfill-list-container" contenteditable="true" id="daily-report6">
141 141 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
142 142  
143 143 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ... @@ -149,8 +149,8 @@
149 149 </li>
150 150 <li class="workfill-list-li boxshadow">
151 151 <div class="workfill-list-weekday-wrap clearfix">
152   - <span class="float-left workfill-list-weekday">周日</span>
153   - <span class="float-right workfill-list-btn cursor-pointer">提交</span>
  152 + <span class="float-left workfill-list-weekday" id="weekday7">周日</span>
  153 + <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit7">提交</span>
154 154 </div>
155 155 <div class="workfill-list-projectnamewrap">
156 156 <div class="pos-abs workfill-projectCon">
... ... @@ -160,7 +160,7 @@
160 160 </div>
161 161 <div class="workfill-list-projectname display-none">项目名称</div>
162 162 </div>
163   - <div class="workfill-list-container" contenteditable="true">
  163 + <div class="workfill-list-container" contenteditable="true" id="daily-report7">
164 164 相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
165 165  
166 166 异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
... ...