Commit 78bbf1c422ecc1e61a24d8b627b20cb5c87b47b3

Authored by 王富生
2 parents d4d2901c 8b1b6d70

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

resource/img/nocommited-icon-1.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-2.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-3.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-4.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-5.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-6.png 0 → 100644

14.3 KB

resource/img/nocommited-icon-7.png 0 → 100644

14.2 KB

topages/hourscount/hourscount.js
... ... @@ -11,7 +11,7 @@ var fun= {
11 11 },
12 12 dateInit: function () {
13 13 //时间初始化
14   - $('#hourscount-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD'));
  14 + $('#hourscount-daterange-btnsta').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
15 15 $('#hourscount-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
16 16 //开始日期
17 17 $("#hourscount-daterange-btnsta").datetimepicker({
... ...
topages/workfill/workfill.css
... ... @@ -66,31 +66,31 @@
66 66 .workfill-list-btn:focus{
67 67 outline: none;
68 68 }
69   -.workfill-list-wrap li:nth-of-type(1) .workfill-list-btn{
  69 +.workquery-list-wrap>li:nth-of-type(1) .workfill-list-btn{
70 70 background-color: #fedee5;
71 71 color: #f94c6e;
72 72 }
73   -.workfill-list-wrap li:nth-of-type(2) .workfill-list-btn{
  73 +.workquery-list-wrap>li:nth-of-type(2) .workfill-list-btn{
74 74 background-color: #fef0db;
75 75 color: #fead39;
76 76 }
77   -.workfill-list-wrap li:nth-of-type(3) .workfill-list-btn{
  77 +.workquery-list-wrap>li:nth-of-type(3) .workfill-list-btn{
78 78 background-color: #dbe7fe;
79 79 color: #4886ff;
80 80 }
81   -.workfill-list-wrap li:nth-of-type(4) .workfill-list-btn{
  81 +.workquery-list-wrap>li:nth-of-type(4) .workfill-list-btn{
82 82 background-color: #98c74b;
83 83 color: #f1fae2;
84 84 }
85   -.workfill-list-wrap li:nth-of-type(5) .workfill-list-btn{
  85 +.workquery-list-wrap>li:nth-of-type(5) .workfill-list-btn{
86 86 background-color: #f5f2fe;
87 87 color: #714cf9;
88 88 }
89   -.workfill-list-wrap li:nth-of-type(6) .workfill-list-btn{
  89 +.workquery-list-wrap>li:nth-of-type(6) .workfill-list-btn{
90 90 background-color: #fbf8e0;
91 91 color: #f7e124;
92 92 }
93   -.workfill-list-wrap li:nth-of-type(7) .workfill-list-btn{
  93 +.workquery-list-wrap>li:nth-of-type(7) .workfill-list-btn{
94 94 background-color: #bde7fe;
95 95 color: #6297fe;
96 96 }
... ... @@ -102,15 +102,14 @@
102 102 padding: 20px 20px;
103 103 }
104 104 .workfill-list-projectnamewrap{
105   - border: 1px solid #f0f1f9;
106   - height: 64px;
107   - padding: 24px 20px 0;
108   - margin: 20px 0 19px;
  105 + /* height: 64px; */
  106 + min-width: 120px;
  107 + /* padding: 24px 20px 0; */
  108 + /* margin: 20px 0 19px; */
109 109 font-size: 16px;
110 110 color: #363d5d;
111   - position: relative;
112 111 }
113   -.workfill-list-projectnamewrap:before{
  112 +/*.workfill-list-projectnamewrap:before{
114 113 content: '';
115 114 position: absolute;
116 115 width: 30px;
... ... @@ -142,10 +141,10 @@
142 141 .workfill-list-projectname{
143 142  
144 143  
145   -}
  144 +}*/
146 145 .workfill-projectCon{
147   - top: 22px;
148   - left: 19px;
  146 + /*top: 22px;*/
  147 + /*left: 19px;*/
149 148 width: 205px;
150 149 height: 34px;
151 150 }
... ... @@ -159,4 +158,164 @@
159 158 left:180px !important;;
160 159 margin-top: -2px;
161 160 vertical-align: middle;
162   -}
163 161 \ No newline at end of file
  162 +}
  163 +
  164 +/*----------------------------------------列表*/
  165 +.workquery-list-wrap>li{
  166 + margin-bottom: 15px;
  167 +}
  168 +.workquery-list-wrap>li:nth-of-type(7n+1) .workquery-list-title{
  169 + border-left: 2px solid #f94c6e;
  170 +}
  171 +.workquery-list-wrap>li:nth-of-type(7n+2) .workquery-list-title{
  172 + border-left: 2px solid #fead39;
  173 +}
  174 +.workquery-list-wrap>li:nth-of-type(7n+3) .workquery-list-title{
  175 + border-left: 2px solid #4886ff;
  176 +}
  177 +.workquery-list-wrap>li:nth-of-type(7n+4) .workquery-list-title{
  178 + border-left: 2px solid #98c74b;
  179 +}
  180 +.workquery-list-wrap>li:nth-of-type(7n+5) .workquery-list-title{
  181 + border-left: 2px solid #714cf9;
  182 +}
  183 +.workquery-list-wrap>li:nth-of-type(7n+6) .workquery-list-title{
  184 + border-left: 2px solid #f7e124;
  185 +}
  186 +.workquery-list-wrap>li:nth-of-type(7n+7) .workquery-list-title{
  187 + border-left: 2px solid #6297fe;
  188 +}
  189 +
  190 +.workquery-list-wrap>li:nth-of-type(7n+1) .commited-icon{
  191 + background: url("../../resource/img/commited-icon-1.png") no-repeat 0 center;
  192 +}
  193 +.workquery-list-wrap>li:nth-of-type(7n+2) .commited-icon{
  194 + background: url("../../resource/img/commited-icon-2.png") no-repeat 0 center;
  195 +}
  196 +.workquery-list-wrap>li:nth-of-type(7n+3) .commited-icon{
  197 + background: url("../../resource/img/commited-icon-3.png") no-repeat 0 center;
  198 +}
  199 +.workquery-list-wrap>li:nth-of-type(7n+4) .commited-icon{
  200 + background: url("../../resource/img/commited-icon-4.png") no-repeat 0 center;
  201 +}
  202 +.workquery-list-wrap>li:nth-of-type(7n+5) .commited-icon{
  203 + background: url("../../resource/img/commited-icon-5.png") no-repeat 0 center;
  204 +}
  205 +.workquery-list-wrap>li:nth-of-type(7n+6) .commited-icon{
  206 + background: url("../../resource/img/commited-icon-6.png") no-repeat 0 center;
  207 +}
  208 +.workquery-list-wrap>li:nth-of-type(7n+7) .commited-icon{
  209 + background: url("../../resource/img/commited-icon-7.png") no-repeat 0 center;
  210 +}
  211 +
  212 +
  213 +
  214 +.workquery-list-wrap>li:nth-of-type(7n+1) .nocommited-icon{
  215 + background: url("../../resource/img/nocommited-icon-1.png") no-repeat 0 center;
  216 +}
  217 +.workquery-list-wrap>li:nth-of-type(7n+2) .nocommited-icon{
  218 + background: url("../../resource/img/nocommited-icon-2.png") no-repeat 0 center;
  219 +}
  220 +.workquery-list-wrap>li:nth-of-type(7n+3) .nocommited-icon{
  221 + background: url("../../resource/img/nocommited-icon-3.png") no-repeat 0 center;
  222 +}
  223 +.workquery-list-wrap>li:nth-of-type(7n+4) .nocommited-icon{
  224 + background: url("../../resource/img/nocommited-icon-4.png") no-repeat 0 center;
  225 +}
  226 +.workquery-list-wrap>li:nth-of-type(7n+5) .nocommited-icon{
  227 + background: url("../../resource/img/nocommited-icon-5.png") no-repeat 0 center;
  228 +}
  229 +.workquery-list-wrap>li:nth-of-type(7n+6) .nocommited-icon{
  230 + background: url("../../resource/img/nocommited-icon-6.png") no-repeat 0 center;
  231 +}
  232 +.workquery-list-wrap>li:nth-of-type(7n+7) .nocommited-icon{
  233 + background: url("../../resource/img/nocommited-icon-7.png") no-repeat 0 center;
  234 +}
  235 +
  236 +.workquery-list-title{
  237 + cursor: pointer;
  238 + height: 64px;
  239 + line-height: 64px;
  240 + background-color: #fff;
  241 + border-radius: 4px;
  242 + overflow: hidden;
  243 +}
  244 +.workquery-list-title>li{
  245 + float: left;
  246 +}
  247 +.workquery-list-title li:nth-of-type(1){
  248 + width: 300px;
  249 + font-size: 18px;
  250 + color: #363d5d;
  251 + padding-left: 80px;
  252 + background: url("../../resource/img/circle-icon.png") no-repeat 60px center;
  253 +}
  254 +.workquery-list-title li:nth-of-type(2){
  255 + width: 700px;
  256 + padding-left: 40px;
  257 + font-size: 18px;
  258 + color: #363d5d;
  259 +}
  260 +.workquery-list-title li:nth-of-type(3){
  261 + width: 150px;
  262 + text-align: right;
  263 + font-size: 14px;
  264 + color: rgba(0,0,0,.5);
  265 +}
  266 +.slide-icon{
  267 + width: 25px;
  268 + text-align: right;
  269 + background: url("../../resource/img/arrow-up.png") no-repeat center center;
  270 +}
  271 +.slide-icon-active{
  272 + background: url("../../resource/img/arrow-down.png") no-repeat center center;
  273 +}
  274 +.workquery-list-container{
  275 + margin-top: 5px;
  276 +}
  277 +.workquery-list-container>li{
  278 + height: 200px;
  279 + border-bottom: 1px solid #f0f1f9;
  280 + background-color: #fff;
  281 +}
  282 +.workquery-list-main{
  283 + height: 200px;
  284 + padding: 20px 50px 20px 80px;
  285 +}
  286 +.workquery-list-main>li{
  287 + float: left;
  288 +}
  289 +.workquery-list-main>li:nth-of-type(1){
  290 + width: 100%;
  291 + height: 50px;
  292 + font-size: 14px;
  293 + color: #363d5d;
  294 +}
  295 +.workquery-list-main>li:nth-of-type(2){
  296 + width: 100%;
  297 + height: 100px;
  298 + font-size: 14px;
  299 + color: rgba(0,0,0,.45);
  300 + border: 1px solid #f0f1f9;
  301 + padding: 15px 15px;
  302 + overflow-y: auto;
  303 + line-height: 26px;
  304 +}
  305 +.workquery-list-main>li:nth-of-type(3){
  306 + width: 150px;
  307 + height: 142px;
  308 + line-height: 142px;
  309 + font-size: 14px;
  310 + color: #363d5d;
  311 +}
  312 +.workquery-list-main>li:nth-of-type(4){
  313 + width: 730px;
  314 + height: 90px;
  315 + line-height: 24px;
  316 + padding: 10px 15px;
  317 + margin-top: 26px;
  318 + font-size: 12px;
  319 + color: rgba(0,0,0,.5);
  320 + border: 1px solid #f0f1f9;
  321 + overflow-y: auto;
  322 +}
... ...
topages/workfill/workfill.html
... ... @@ -9,129 +9,354 @@
9 9 </div>
10 10 <div class="float-right time-opr-show text-center boxshadow" id="time-opr-show"> </div>
11 11 </div>
12   -<ul class="workfill-list-wrap clearfix">
13   - <li class="workfill-list-li boxshadow">
14   - <div class="workfill-list-weekday-wrap clearfix">
15   - <span class="float-left workfill-list-weekday" id="weekday1" data-id="" data-date="">周一</span>
16   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</button>
17   - </div>
18   - <div class="workfill-list-projectnamewrap">
19   - <div class="pos-abs workfill-projectCon">
20   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName1">
21 12  
22   - </select>
23   - </div>
24   - <div class="workfill-list-projectname display-none">项目名称</div>
25   - </div>
26   - <div class="workfill-list-container" contenteditable="true" id="daily-report1">
27 13  
28   - </div>
  14 +<ul class="workquery-list-wrap" id="workquery-list-wrap">
  15 + <!--<div class="nodata-icon" ></div>-->
  16 +
  17 + <li>
  18 + <ul class="workquery-list-title clearfix boxshadow">
  19 + <li>星期一</li>
  20 + <li class="nocommited-icon">未填写</li>
  21 + <li class="slide-text">全部展开</li>
  22 + <li class="slide-icon"> &nbsp;</li>
  23 + </ul>
  24 + <ul class="workquery-list-container clearfix display-none">
  25 + <li class="workquery-list-box">
  26 + <ul class="workquery-list-main">
  27 + <li class="clearfix">
  28 + <div class="float-left workfill-list-projectnamewrap">
  29 + <div class="pos-abs workfill-projectCon display-none">
  30 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName1">
  31 + </select>
  32 + </div>
  33 + <div class="workfill-list-projectname ">项目名称</div>
  34 + </div>
  35 + <button class="float-right workfill-list-btn">提交</button>
  36 + </li>
  37 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
  38 +
  39 + </ul>
  40 + </li>
  41 +
  42 +
  43 +
  44 +
  45 + </ul>
29 46 </li>
  47 + <li>
  48 + <ul class="workquery-list-title clearfix boxshadow">
  49 + <li>星期二</li>
  50 + <li class="commited-icon">已填写</li>
  51 + <li class="slide-text">全部展开</li>
  52 + <li class="slide-icon"> &nbsp;</li>
  53 + </ul>
  54 + <ul class="workquery-list-container clearfix display-none">
  55 + <li class="workquery-list-box">
  56 + <ul class="workquery-list-main">
  57 + <li class="clearfix">
  58 + <div class="float-left workfill-list-projectnamewrap">
  59 + <div class="pos-abs workfill-projectCon">
  60 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName2">
  61 + </select>
  62 + </div>
  63 + <div class="workfill-list-projectname display-none">项目名称</div>
  64 + </div>
  65 + <button class="float-right workfill-list-btn">提交</button>
  66 + </li>
  67 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
30 68  
31   - <li class="workfill-list-li boxshadow">
32   - <div class="workfill-list-weekday-wrap clearfix">
33   - <span class="float-left workfill-list-weekday" id="weekday2" data-id="" data-date="">周二</span>
34   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit2">提交</button>
35   - </div>
36   - <div class="workfill-list-projectnamewrap">
37   - <div class="pos-abs workfill-projectCon">
38   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName2">
  69 + </ul>
  70 + </li>
39 71  
40   - </select>
41   - </div>
42   - <div class="workfill-list-projectname display-none">项目名称</div>
43   - </div>
44   - <div class="workfill-list-container" contenteditable="true" id="daily-report2">
45 72  
46   - </div>
  73 +
  74 +
  75 + </ul>
47 76 </li>
48   - <li class="workfill-list-li boxshadow">
49   - <div class="workfill-list-weekday-wrap clearfix">
50   - <span class="float-left workfill-list-weekday" id="weekday3" data-id="" data-date="">周三</span>
51   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</button>
52   - </div>
53   - <div class="workfill-list-projectnamewrap">
54   - <div class="pos-abs workfill-projectCon">
55   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName3">
  77 + <li>
  78 + <ul class="workquery-list-title clearfix boxshadow">
  79 + <li>星期三</li>
  80 + <li class="nocommited-icon">未填写</li>
  81 + <li class="slide-text">全部展开</li>
  82 + <li class="slide-icon"> &nbsp;</li>
  83 + </ul>
  84 + <ul class="workquery-list-container clearfix display-none">
  85 + <li class="workquery-list-box">
  86 + <ul class="workquery-list-main">
  87 + <li class="clearfix">
  88 + <div class="float-left workfill-list-projectnamewrap">
  89 + <div class="pos-abs workfill-projectCon">
  90 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName3">
  91 + </select>
  92 + </div>
  93 + <div class="workfill-list-projectname display-none">项目名称</div>
  94 + </div>
  95 + <button class="float-right workfill-list-btn">提交</button>
  96 + </li>
  97 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
56 98  
57   - </select>
58   - </div>
59   - <div class="workfill-list-projectname display-none">项目名称</div>
60   - </div>
61   - <div class="workfill-list-container" contenteditable="true" id="daily-report3">
  99 + </ul>
  100 + </li>
62 101  
63   - </div>
  102 +
  103 +
  104 +
  105 + </ul>
64 106 </li>
65   - <li class="workfill-list-li boxshadow">
66   - <div class="workfill-list-weekday-wrap clearfix">
67   - <span class="float-left workfill-list-weekday" id="weekday4" data-id="" data-date="">周四</span>
68   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit4">提交</button>
69   - </div>
70   - <div class="workfill-list-projectnamewrap">
71   - <div class="pos-abs workfill-projectCon">
72   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName4">
  107 + <li>
  108 + <ul class="workquery-list-title clearfix boxshadow">
  109 + <li>星期四</li>
  110 + <li class="nocommited-icon">未填写</li>
  111 + <li class="slide-text">全部展开</li>
  112 + <li class="slide-icon"> &nbsp;</li>
  113 + </ul>
  114 + <ul class="workquery-list-container clearfix display-none">
  115 + <li class="workquery-list-box">
  116 + <ul class="workquery-list-main">
  117 + <li class="clearfix">
  118 + <div class="float-left workfill-list-projectnamewrap">
  119 + <div class="pos-abs workfill-projectCon">
  120 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName4">
  121 + </select>
  122 + </div>
  123 + <div class="workfill-list-projectname display-none">项目名称</div>
  124 + </div>
  125 + <button class="float-right workfill-list-btn">提交</button>
  126 + </li>
  127 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
73 128  
74   - </select>
75   - </div>
76   - <div class="workfill-list-projectname display-none">项目名称</div>
77   - </div>
78   - <div class="workfill-list-container" contenteditable="true" id="daily-report4">
  129 + </ul>
  130 + </li>
79 131  
80   - </div>
  132 +
  133 +
  134 +
  135 + </ul>
81 136 </li>
82   - <li class="workfill-list-li boxshadow">
83   - <div class="workfill-list-weekday-wrap clearfix">
84   - <span class="float-left workfill-list-weekday" id="weekday5" data-id="" data-date="">周五</span>
85   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit5">提交</button>
86   - </div>
87   - <div class="workfill-list-projectnamewrap">
88   - <div class="pos-abs workfill-projectCon">
89   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName5">
  137 + <li>
  138 + <ul class="workquery-list-title clearfix boxshadow">
  139 + <li>星期五</li>
  140 + <li class="nocommited-icon">未填写</li>
  141 + <li class="slide-text">全部展开</li>
  142 + <li class="slide-icon"> &nbsp;</li>
  143 + </ul>
  144 + <ul class="workquery-list-container clearfix display-none">
  145 + <li class="workquery-list-box">
  146 + <ul class="workquery-list-main">
  147 + <li class="clearfix">
  148 + <div class="float-left workfill-list-projectnamewrap">
  149 + <div class="pos-abs workfill-projectCon">
  150 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName5">
  151 + </select>
  152 + </div>
  153 + <div class="workfill-list-projectname display-none">项目名称</div>
  154 + </div>
  155 + <button class="float-right workfill-list-btn">提交</button>
  156 + </li>
  157 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
90 158  
91   - </select>
92   - </div>
93   - <div class="workfill-list-projectname display-none">项目名称</div>
94   - </div>
95   - <div class="workfill-list-container" contenteditable="true" id="daily-report5">
  159 + </ul>
  160 + </li>
96 161  
97   - </div>
  162 +
  163 +
  164 +
  165 + </ul>
98 166 </li>
99   - <li class="workfill-list-li boxshadow">
100   - <div class="workfill-list-weekday-wrap clearfix">
101   - <span class="float-left workfill-list-weekday" id="weekday6" data-id="" data-date="">周六</span>
102   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit6">提交</button>
103   - </div>
104   - <div class="workfill-list-projectnamewrap">
105   - <div class="pos-abs workfill-projectCon">
106   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName6">
  167 + <li>
  168 + <ul class="workquery-list-title clearfix boxshadow">
  169 + <li>星期六</li>
  170 + <li class="nocommited-icon">未填写</li>
  171 + <li class="slide-text">全部展开</li>
  172 + <li class="slide-icon"> &nbsp;</li>
  173 + </ul>
  174 + <ul class="workquery-list-container clearfix display-none">
  175 + <li class="workquery-list-box">
  176 + <ul class="workquery-list-main">
  177 + <li class="clearfix">
  178 + <div class="float-left workfill-list-projectnamewrap">
  179 + <div class="pos-abs workfill-projectCon">
  180 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName6">
  181 + </select>
  182 + </div>
  183 + <div class="workfill-list-projectname display-none">项目名称</div>
  184 + </div>
  185 + <button class="float-right workfill-list-btn">提交</button>
  186 + </li>
  187 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
107 188  
108   - </select>
109   - </div>
110   - <div class="workfill-list-projectname display-none">项目名称</div>
111   - </div>
112   - <div class="workfill-list-container" contenteditable="true" id="daily-report6">
  189 + </ul>
  190 + </li>
113 191  
114   - </div>
  192 +
  193 +
  194 +
  195 + </ul>
115 196 </li>
116   - <li class="workfill-list-li boxshadow">
117   - <div class="workfill-list-weekday-wrap clearfix">
118   - <span class="float-left workfill-list-weekday" id="weekday7" data-id="" data-date="">周日</span>
119   - <button class="float-right workfill-list-btn cursor-pointer" id="btn-commit7">提交</button>
120   - </div>
121   - <div class="workfill-list-projectnamewrap">
122   - <div class="pos-abs workfill-projectCon">
123   - <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName7">
  197 + <li>
  198 + <ul class="workquery-list-title clearfix boxshadow">
  199 + <li>星期天</li>
  200 + <li class="nocommited-icon">未填写</li>
  201 + <li class="slide-text">全部展开</li>
  202 + <li class="slide-icon"> &nbsp;</li>
  203 + </ul>
  204 + <ul class="workquery-list-container clearfix ">
  205 + <li class="workquery-list-box">
  206 + <ul class="workquery-list-main">
  207 + <li class="clearfix">
  208 + <div class="float-left workfill-list-projectnamewrap">
  209 + <div class="pos-abs workfill-projectCon">
  210 + <select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName7">
  211 + </select>
  212 + </div>
  213 + <div class="workfill-list-projectname display-none">项目名称</div>
  214 + </div>
  215 + <button class="float-right workfill-list-btn">提交</button>
  216 + </li>
  217 + <li contenteditable="true">取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此取政策,收紧了异地购房、离婚购房提取公积金等操作,但多地也都强调,支持提取公积金用于购买首套住房或二套改善型住房。此外,由于房价</li>
124 218  
125   - </select>
126   - </div>
127   - <div class="workfill-list-projectname display-none">项目名称</div>
128   - </div>
129   - <div class="workfill-list-container" contenteditable="true" id="daily-report7">
  219 + </ul>
  220 + </li>
130 221  
131   - </div>
  222 +
  223 +
  224 +
  225 + </ul>
132 226 </li>
133 227  
  228 +
  229 +
  230 +
  231 +
  232 +
  233 +
  234 +
134 235 </ul>
  236 +
  237 +<!--<ul class="workfill-list-wrap clearfix">-->
  238 + <!--<li class="workfill-list-li boxshadow">-->
  239 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  240 + <!--<span class="float-left workfill-list-weekday" id="weekday1" data-id="" data-date="">周一</span>-->
  241 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</button>-->
  242 + <!--</div>-->
  243 + <!--<div class="workfill-list-projectnamewrap">-->
  244 + <!--<div class="pos-abs workfill-projectCon">-->
  245 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName1">-->
  246 +
  247 + <!--</select>-->
  248 + <!--</div>-->
  249 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  250 + <!--</div>-->
  251 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report1">-->
  252 +
  253 + <!--</div>-->
  254 + <!--</li>-->
  255 +
  256 + <!--<li class="workfill-list-li boxshadow">-->
  257 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  258 + <!--<span class="float-left workfill-list-weekday" id="weekday2" data-id="" data-date="">周二</span>-->
  259 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit2">提交</button>-->
  260 + <!--</div>-->
  261 + <!--<div class="workfill-list-projectnamewrap">-->
  262 + <!--<div class="pos-abs workfill-projectCon">-->
  263 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName2">-->
  264 +
  265 + <!--</select>-->
  266 + <!--</div>-->
  267 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  268 + <!--</div>-->
  269 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report2">-->
  270 +
  271 + <!--</div>-->
  272 + <!--</li>-->
  273 + <!--<li class="workfill-list-li boxshadow">-->
  274 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  275 + <!--<span class="float-left workfill-list-weekday" id="weekday3" data-id="" data-date="">周三</span>-->
  276 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</button>-->
  277 + <!--</div>-->
  278 + <!--<div class="workfill-list-projectnamewrap">-->
  279 + <!--<div class="pos-abs workfill-projectCon">-->
  280 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName3">-->
  281 +
  282 + <!--</select>-->
  283 + <!--</div>-->
  284 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  285 + <!--</div>-->
  286 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report3">-->
  287 +
  288 + <!--</div>-->
  289 + <!--</li>-->
  290 + <!--<li class="workfill-list-li boxshadow">-->
  291 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  292 + <!--<span class="float-left workfill-list-weekday" id="weekday4" data-id="" data-date="">周四</span>-->
  293 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit4">提交</button>-->
  294 + <!--</div>-->
  295 + <!--<div class="workfill-list-projectnamewrap">-->
  296 + <!--<div class="pos-abs workfill-projectCon">-->
  297 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName4">-->
  298 +
  299 + <!--</select>-->
  300 + <!--</div>-->
  301 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  302 + <!--</div>-->
  303 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report4">-->
  304 +
  305 + <!--</div>-->
  306 + <!--</li>-->
  307 + <!--<li class="workfill-list-li boxshadow">-->
  308 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  309 + <!--<span class="float-left workfill-list-weekday" id="weekday5" data-id="" data-date="">周五</span>-->
  310 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit5">提交</button>-->
  311 + <!--</div>-->
  312 + <!--<div class="workfill-list-projectnamewrap">-->
  313 + <!--<div class="pos-abs workfill-projectCon">-->
  314 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName5">-->
  315 +
  316 + <!--</select>-->
  317 + <!--</div>-->
  318 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  319 + <!--</div>-->
  320 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report5">-->
  321 +
  322 + <!--</div>-->
  323 + <!--</li>-->
  324 + <!--<li class="workfill-list-li boxshadow">-->
  325 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  326 + <!--<span class="float-left workfill-list-weekday" id="weekday6" data-id="" data-date="">周六</span>-->
  327 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit6">提交</button>-->
  328 + <!--</div>-->
  329 + <!--<div class="workfill-list-projectnamewrap">-->
  330 + <!--<div class="pos-abs workfill-projectCon">-->
  331 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName6">-->
  332 +
  333 + <!--</select>-->
  334 + <!--</div>-->
  335 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  336 + <!--</div>-->
  337 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report6">-->
  338 +
  339 + <!--</div>-->
  340 + <!--</li>-->
  341 + <!--<li class="workfill-list-li boxshadow">-->
  342 + <!--<div class="workfill-list-weekday-wrap clearfix">-->
  343 + <!--<span class="float-left workfill-list-weekday" id="weekday7" data-id="" data-date="">周日</span>-->
  344 + <!--<button class="float-right workfill-list-btn cursor-pointer" id="btn-commit7">提交</button>-->
  345 + <!--</div>-->
  346 + <!--<div class="workfill-list-projectnamewrap">-->
  347 + <!--<div class="pos-abs workfill-projectCon">-->
  348 + <!--<select class="work-projectName" class="selectpicker" data-width="100%" data-size="5" data-live-search="true" id="work-projectName7">-->
  349 +
  350 + <!--</select>-->
  351 + <!--</div>-->
  352 + <!--<div class="workfill-list-projectname display-none">项目名称</div>-->
  353 + <!--</div>-->
  354 + <!--<div class="workfill-list-container" contenteditable="true" id="daily-report7">-->
  355 +
  356 + <!--</div>-->
  357 + <!--</li>-->
  358 +
  359 +<!--</ul>-->
135 360 <!--提示弹窗 sta-->
136 361 <div class="modal fade " id="ITD-tipsmodel" style="display: none" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
137 362 <div class="ITD-modal-dialog blue-modal">
... ...
topages/workfill/workfill.js
... ... @@ -21,6 +21,21 @@ var fun = {
21 21 fun.getAsraProject();
22 22 fun.getAsraDailyListMsg();
23 23 },
  24 + listToggle:function (ele) {
  25 + var text = ele.find('.slide-text').text();
  26 + ele.parent().siblings().find('.slide-text').text('全部展开');
  27 + if(text == '全部展开'){
  28 + ele.find('.slide-text').text('全部折叠')
  29 + }else{
  30 + ele.find('.slide-text').text('全部展开')
  31 + };
  32 + ele.parent().siblings().find('.slide-icon').removeClass('slide-icon-active');
  33 + ele.find('.slide-icon').toggleClass('slide-icon-active');
  34 +
  35 +
  36 + ele.parent().siblings().find('.workquery-list-container').slideUp();
  37 + ele.parent().find('.workquery-list-container').slideToggle();
  38 + },
24 39 timeoprprevbtn:function () {
25 40 $('#time-opr-nextbtn').removeClass('display-none');
26 41 clicknum ++;
... ... @@ -249,3 +264,8 @@ documentBindFunc.on(&#39;click&#39;,&#39;.workfill-list-btn&#39;,function () {
249 264  
250 265  
251 266 });
  267 +
  268 +$('#workquery-list-wrap').delegate('.workquery-list-title','click',function () {
  269 + var ele = $(this);
  270 + fun.listToggle(ele);
  271 +});
... ...