Commit c27fdbcdd5e70d8bdcb5238ee6dfd7fffccd2559
1 parent
68f446df
add
Showing
3 changed files
with
15 additions
and
11 deletions
topages/workfill/workfill.css
| @@ -293,7 +293,7 @@ | @@ -293,7 +293,7 @@ | ||
| 293 | font-size: 14px; | 293 | font-size: 14px; |
| 294 | color: #363d5d; | 294 | color: #363d5d; |
| 295 | } | 295 | } |
| 296 | -.workquery-list-main>input{ | 296 | +.workquery-list-main>textarea{ |
| 297 | display: block; | 297 | display: block; |
| 298 | width: 100%; | 298 | width: 100%; |
| 299 | height: 100px; | 299 | height: 100px; |
| @@ -322,3 +322,7 @@ | @@ -322,3 +322,7 @@ | ||
| 322 | border: 1px solid #f0f1f9; | 322 | border: 1px solid #f0f1f9; |
| 323 | overflow-y: auto; | 323 | overflow-y: auto; |
| 324 | } | 324 | } |
| 325 | +textarea{ | ||
| 326 | + outline:none; | ||
| 327 | + resize:none; | ||
| 328 | +} | ||
| 325 | \ No newline at end of file | 329 | \ No newline at end of file |
topages/workfill/workfill.html
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | </div> | 34 | </div> |
| 35 | <button class="float-right workfill-list-btn" id="btn-commit1">提交</button> | 35 | <button class="float-right workfill-list-btn" id="btn-commit1">提交</button> |
| 36 | </li> | 36 | </li> |
| 37 | - <input id="daily-report1" value="请输入内容"> | 37 | + <textarea name="" cols="30" rows="10" id="daily-report1"></textarea> |
| 38 | 38 | ||
| 39 | </ul> | 39 | </ul> |
| 40 | </li> | 40 | </li> |
| @@ -64,7 +64,7 @@ | @@ -64,7 +64,7 @@ | ||
| 64 | </div> | 64 | </div> |
| 65 | <button class="float-right workfill-list-btn" id="btn-commit2">提交</button> | 65 | <button class="float-right workfill-list-btn" id="btn-commit2">提交</button> |
| 66 | </li> | 66 | </li> |
| 67 | - <input id="daily-report2" value="请输入内容"> | 67 | + <textarea name="" cols="30" rows="10" id="daily-report2"></textarea> |
| 68 | 68 | ||
| 69 | </ul> | 69 | </ul> |
| 70 | </li> | 70 | </li> |
| @@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
| 94 | </div> | 94 | </div> |
| 95 | <button class="float-right workfill-list-btn" id="btn-commit3">提交</button> | 95 | <button class="float-right workfill-list-btn" id="btn-commit3">提交</button> |
| 96 | </li> | 96 | </li> |
| 97 | - <input id="daily-report3" value="请输入内容"> | 97 | + <textarea name="" cols="30" rows="10" id="daily-report3"></textarea> |
| 98 | 98 | ||
| 99 | </ul> | 99 | </ul> |
| 100 | </li> | 100 | </li> |
| @@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
| 124 | </div> | 124 | </div> |
| 125 | <button class="float-right workfill-list-btn" id="btn-commit4">提交</button> | 125 | <button class="float-right workfill-list-btn" id="btn-commit4">提交</button> |
| 126 | </li> | 126 | </li> |
| 127 | - <input id="daily-report4" value="请输入内容"> | 127 | + <textarea name="" cols="30" rows="10" id="daily-report4"></textarea> |
| 128 | </ul> | 128 | </ul> |
| 129 | </li> | 129 | </li> |
| 130 | 130 | ||
| @@ -153,7 +153,7 @@ | @@ -153,7 +153,7 @@ | ||
| 153 | </div> | 153 | </div> |
| 154 | <button class="float-right workfill-list-btn" id="btn-commit5">提交</button> | 154 | <button class="float-right workfill-list-btn" id="btn-commit5">提交</button> |
| 155 | </li> | 155 | </li> |
| 156 | - <input id="daily-report5" value="请输入内容"> | 156 | + <textarea name="" cols="30" rows="10" id="daily-report5"></textarea> |
| 157 | </ul> | 157 | </ul> |
| 158 | </li> | 158 | </li> |
| 159 | 159 | ||
| @@ -182,7 +182,7 @@ | @@ -182,7 +182,7 @@ | ||
| 182 | </div> | 182 | </div> |
| 183 | <button class="float-right workfill-list-btn" id="btn-commit6">提交</button> | 183 | <button class="float-right workfill-list-btn" id="btn-commit6">提交</button> |
| 184 | </li> | 184 | </li> |
| 185 | - <input id="daily-report6" value="请输入内容"> | 185 | + <textarea name="" cols="30" rows="10" id="daily-report6"></textarea> |
| 186 | </ul> | 186 | </ul> |
| 187 | </li> | 187 | </li> |
| 188 | 188 | ||
| @@ -211,7 +211,7 @@ | @@ -211,7 +211,7 @@ | ||
| 211 | </div> | 211 | </div> |
| 212 | <button class="float-right workfill-list-btn" id="btn-commit7">提交</button> | 212 | <button class="float-right workfill-list-btn" id="btn-commit7">提交</button> |
| 213 | </li> | 213 | </li> |
| 214 | - <input id="daily-report7" value="请输入内容"> | 214 | + <textarea name="" cols="30" rows="10" id="daily-report7"></textarea> |
| 215 | </ul> | 215 | </ul> |
| 216 | </li> | 216 | </li> |
| 217 | 217 |
topages/workfill/workfill.js
| @@ -133,7 +133,7 @@ var fun = { | @@ -133,7 +133,7 @@ var fun = { | ||
| 133 | $("#btn-commit"+i).html('提交'); | 133 | $("#btn-commit"+i).html('提交'); |
| 134 | $("#work-projectName"+i).selectpicker('val',''); | 134 | $("#work-projectName"+i).selectpicker('val',''); |
| 135 | $("#work-projectName"+i).selectpicker('refresh'); | 135 | $("#work-projectName"+i).selectpicker('refresh'); |
| 136 | - $("#daily-report"+i).val(""); | 136 | + $("#daily-report"+i).text(""); |
| 137 | //如果不是本周则隐藏按钮 | 137 | //如果不是本周则隐藏按钮 |
| 138 | if(clicknum >= 1) { | 138 | if(clicknum >= 1) { |
| 139 | $("#btn-commit" + i).attr("style", "display:none;"); | 139 | $("#btn-commit" + i).attr("style", "display:none;"); |
| @@ -182,7 +182,7 @@ var fun = { | @@ -182,7 +182,7 @@ var fun = { | ||
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | $("#weekday"+row.weeksNum).attr("data-id",row.id); | 184 | $("#weekday"+row.weeksNum).attr("data-id",row.id); |
| 185 | - $("#daily-report"+row.weeksNum).val(row.dailyContent); | 185 | + $("#daily-report"+row.weeksNum).text(row.dailyContent); |
| 186 | $("#work-projectName"+row.weeksNum).selectpicker('val',row.projectId); | 186 | $("#work-projectName"+row.weeksNum).selectpicker('val',row.projectId); |
| 187 | $("#work-projectName"+row.weeksNum).selectpicker('refresh'); | 187 | $("#work-projectName"+row.weeksNum).selectpicker('refresh'); |
| 188 | 188 | ||
| @@ -201,7 +201,7 @@ var fun = { | @@ -201,7 +201,7 @@ var fun = { | ||
| 201 | var arsaId = $("#weekday"+id).attr("data-id"); | 201 | var arsaId = $("#weekday"+id).attr("data-id"); |
| 202 | var projectId = $("#work-projectName"+id).find("option:selected").val(); | 202 | var projectId = $("#work-projectName"+id).find("option:selected").val(); |
| 203 | var dailyDate = $("#weekday"+id).attr("data-date"); | 203 | var dailyDate = $("#weekday"+id).attr("data-date"); |
| 204 | - var dailyContent = $("#daily-report"+id).val(); | 204 | + var dailyContent = $("#daily-report"+id).text(); |
| 205 | if(dailyContent==''){ | 205 | if(dailyContent==''){ |
| 206 | $('.ITD-alertmodel-contentmsg').text('工作内容不能为空!'); | 206 | $('.ITD-alertmodel-contentmsg').text('工作内容不能为空!'); |
| 207 | $('#ITD-tipsmodel').modal('show'); | 207 | $('#ITD-tipsmodel').modal('show'); |