diff --git a/templates/tasks/group_todolist.html b/templates/tasks/group_todolist.html
index 2eebf60..869c37d 100644
--- a/templates/tasks/group_todolist.html
+++ b/templates/tasks/group_todolist.html
@@ -60,16 +60,16 @@
<tr>
<th style="width: 10px; text-align:center; vertical-align: middle;">#</th>
<th style="width: 280px; text-align:center; vertical-align: middle;">工作事项</th>
- <th style="text-align:center; vertical-align: middle;">完成时间</th>
- <th style="text-align:center; vertical-align: middle;">工作要求及交付物</th>
- <th style="text-align:center; vertical-align: middle; width: 120px">承办单位</th>
+ <th style="width: 100px; text-align:center; vertical-align: middle;">完成时间</th>
+ <th style="width: 160px; text-align:center; vertical-align: middle;">工作要求及交付物</th>
+ <th style="width: 120px; text-align:center; vertical-align: middle;">承办单位</th>
<th style="width: 120px;text-align:center; vertical-align: middle;">承/督办人</th>
<th style="width: 200px;text-align:center; vertical-align: middle;">协办人</th>
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量(pre)</th>
<th style="width: 60px; text-align:center; vertical-align: middle;">折算系数</th>
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">成熟度</th>
- <th style="text-align:center; vertical-align: middle;">完成情况</th>
+ <th style="width: 220px; text-align:center; vertical-align: middle;">完成情况</th>
<th style="width: 120px; text-align:center; vertical-align: middle;">完成质量</th>
{# <th style="width: 40px">Label</th>#}
</tr>
@@ -93,7 +93,7 @@
</div>
<span class="badge bg-gradient-blue">{{ todo.maturity }}</span>
</td>
- <td style="text-align: center"><textarea style="overflow:hidden; width: 300px">{{ todo.complete_note }}</textarea></td>
+ <td style="text-align: center"><textarea style="overflow:hidden;width:100%;">{{ todo.complete_note }}</textarea></td>
<td style="text-align: center">{{ todo.quality_mark|default:'' }}</td>
</tr>
{% endfor %}
diff --git a/templates/tasks/tasklist.html b/templates/tasks/tasklist.html
index 93992ca..5fd791a 100644
--- a/templates/tasks/tasklist.html
+++ b/templates/tasks/tasklist.html
@@ -35,11 +35,11 @@
<table class="table table-striped" style="word-break: break-all; overflow: auto" cellspacing="0">
<thead>
<tr style="background-color: #f2f2f2">
- <th style="width: 100px; vertical-align: middle;">任务属性</th>
- <th style="width: 100px; text-align:center; vertical-align: middle;">任务编号</th>
- <th style="width: 200px; text-align:center; vertical-align: middle;">任务名称</th>
- <th style="text-align:center; vertical-align: middle;">任务来源</th>
- <th style="width: 80px;text-align:center; vertical-align: middle;">目标值</th>
+ <th style="width: 140px; text-align:center; vertical-align: middle;">任务属性</th>
+ <th style="width: 60px; text-align:center; vertical-align: middle;">任务编号</th>
+ <th style="width: 220px; text-align:center; vertical-align: middle;">任务名称</th>
+ <th style="width: 120px; text-align:center; vertical-align: middle;">任务来源</th>
+ <th style="width: 120px;text-align:center; vertical-align: middle;">目标值</th>
<th style="text-align:center; vertical-align: middle; padding: 0" colspan="4">
<table class="table" style="margin: 0;" cellpadding="0">
<tr style="background-color: #f2f2f2"><th colspan="4">任务显性目标及节点</th></tr>
@@ -62,21 +62,21 @@
{# </thead>#}
</table>
</th>
- <th style="width: 100px; text-align:center; vertical-align: middle;">完成日期</th>
+ <th style="width: 80px; text-align:center; vertical-align: middle;">完成日期</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">责任单位</th>
- <th style="width: 80px; text-align:center; vertical-align: middle;">负责人</th>
+ <th style="width: 100px; text-align:center; vertical-align: middle;">负责人</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">主管领导</th>
- <th style="width: 100px; text-align:center; vertical-align: middle;">任务说明</th>
+ <th style="width: 240px; text-align:center; vertical-align: middle;">任务说明</th>
{# <th style="width: 40px">Label</th>#}
</tr>
</thead>
<tbody style="font-size: 0.9rem">
{% for task in tasks %}
<tr style="background-color: white">
- <td>{{ task.task_property }}</td>
+ <td style="text-align:center;">{{ task.task_property }}</td>
<td style="text-align:center;">{{ task.task_id }}</td>
<td>{{ task.task_topic }}</td>
- <td style="width: 160px">{{ task.task_origin }}</td>
+ <td style="text-align:center;">{{ task.task_origin }}</td>
<td>{{ task.aim_value }}</td>
{% load taskfilter %}
<td style="background-color: #BFE7A8; padding: 0">
@@ -91,11 +91,11 @@
<td style="background-color: #83E1E3; padding: 0">
<textarea class="text-none-border" style="background-color: #83E1E3">{% for todo in task.related_task.all %} {{ todo|quarter_cate:'4'|safe }}{% endfor %}</textarea>
</td>
- <td>{{ task.deadline | date:"Y年m月" }}</td>
+ <td style="text-align:center;">{{ task.deadline | date:"Y.m" }}</td>
<td style="text-align:center;">{{ task.duty_group }}</td>
<td style="text-align:center;">{{ task.principal }}</td>
<td style="text-align:center;">{{ task.leader }}</td>
- <td><textarea>{{ task.task_note }}</textarea></td>
+ <td><textarea style="overflow:hidden;width:100%;">{{ task.task_note }}</textarea></td>
</tr>
{% endfor %}
</tbody>
diff --git a/templates/tasks/todolist.html b/templates/tasks/todolist.html
index f364630..4e7c70a 100644
--- a/templates/tasks/todolist.html
+++ b/templates/tasks/todolist.html
@@ -61,18 +61,18 @@
<h3 style="text-align: center; letter-spacing: 30px">我的承办</h3>
<HR width="50%" color=#e2e4e6 SIZE=3>
<tr>
- <th style="width: 80px; text-align:center; vertical-align: middle;">序号</th>
- <th style="width: 280px; text-align:center; vertical-align: middle;">工作事项</th>
- <th style="text-align:center; vertical-align: middle;">完成时间</th>
- <th style="text-align:center; vertical-align: middle;">工作要求及交付物</th>
- <th style="text-align:center; vertical-align: middle; width: 120px">承办单位</th>
- <th style="width: 200px;text-align:center; vertical-align: middle;">协办人</th>
+ <th style="width: 70px; text-align:center; vertical-align: middle;">序号</th>
+ <th style="width: 300px; text-align:center; vertical-align: middle;">工作事项</th>
+ <th style="width: 100px; text-align:center; vertical-align: middle;">完成时间</th>
+ <th style="width: 240px; text-align:center; vertical-align: middle;">工作要求及交付物</th>
+ <th style="width: 140px; text-align:center; vertical-align: middle;">承办单位</th>
+ <th style="width: 200px; text-align:center; vertical-align: middle;">协办人</th>
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量(pre)</th>
<th style="width: 60px; text-align:center; vertical-align: middle;">折算系数</th>
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">成熟度</th>
- <th style="text-align:center; vertical-align: middle;">完成情况</th>
- <th style="width: 110px; text-align:center; vertical-align: middle;">完成质量</th>
+ <th style="width: 320px; text-align:center; vertical-align: middle;">完成情况</th>
+ <th style="width: 120px; text-align:center; vertical-align: middle;">完成质量</th>
<th style="text-align:center; vertical-align: middle;"></th>
{# <th style="width: 40px">Label</th>#}
</tr>
@@ -83,7 +83,7 @@
<td style="text-align: center">{{ forloop.counter }}</td>
<td>{{ todo.todo_topic }}</td>
<td style="text-align: center">{{ todo.deadline | date:"m月d日" }}</td>
- <td style="width: 160px"><textarea style="width:100%;overflow:hidden">{{ todo.todo_note }}</textarea></td>
+ <td><textarea style="width:100%;overflow:hidden">{{ todo.todo_note }}</textarea></td>
<td style="text-align: center">{{ todo.duty_group }}</td>
<td style="text-align: center">{{ todo.sub_executor.all|join:", " }}</td>
<td style="text-align:center;">{{ todo.predict_work }}</td>
@@ -95,7 +95,7 @@
</div>
<span class="badge bg-gradient-blue">{{ todo.maturity }}</span>
</td>
- <td style="text-align: center"><textarea style="overflow:hidden; width: 200px" readonly="readonly">{{ todo.complete_note }}</textarea></td>
+ <td style="text-align: center"><textarea style="overflow:hidden; width: 100%" readonly="readonly">{{ todo.complete_note }}</textarea></td>
<td style="text-align: center">{{ todo.quality_mark|default:'' }}</td>
<td><a href="{% url 'tasks:todo_detail' pk=todo.id %}">填报</a> </td>
</tr>
@@ -112,19 +112,19 @@
<h3 style="text-align: center; letter-spacing: 30px">我的协办</h3>
<HR width="50%" color=#e2e4e6 SIZE=3>
<tr>
- <th style="width: 80px; text-align:center; vertical-align: middle;">序号</th>
- <th style="width: 280px; text-align:center; vertical-align: middle;">工作事项</th>
- <th style="text-align:center; vertical-align: middle;">完成时间</th>
- <th style="text-align:center; vertical-align: middle;">工作要求及交付物</th>
- <th style="text-align:center; vertical-align: middle; width: 120px">承办单位</th>
+ <th style="width: 70px; text-align:center; vertical-align: middle;">序号</th>
+ <th style="width: 300px; text-align:center; vertical-align: middle;">工作事项</th>
+ <th style="width: 100px; text-align:center; vertical-align: middle;">完成时间</th>
+ <th style="width: 240px; text-align:center; vertical-align: middle;">工作要求及交付物</th>
+ <th style="width: 140px; text-align:center; vertical-align: middle;">承办单位</th>
<th style="width: 200px;text-align:center; vertical-align: middle;">承/督办人</th>
{# <th style="width: 200px;text-align:center; vertical-align: middle;">协办人</th>#}
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量(pre)</th>
<th style="width: 60px; text-align:center; vertical-align: middle;">折算系数</th>
<th style="width: 80px; text-align:center; vertical-align: middle;">工作量</th>
<th style="width: 100px; text-align:center; vertical-align: middle;">成熟度</th>
- <th style="text-align:center; vertical-align: middle;">完成情况</th>
- <th style="width: 110px; text-align:center; vertical-align: middle;">完成质量</th>
+ <th style="width: 320px; text-align:center; vertical-align: middle;">完成情况</th>
+ <th style="width: 120px; text-align:center; vertical-align: middle;">完成质量</th>
<th style="text-align:center; vertical-align: middle;"></th>
{# <th style="width: 40px">Label</th>#}
</tr>
@@ -135,7 +135,7 @@
<td style="text-align: center">{{ forloop.counter }}</td>
<td>{{ todo.todo_topic }}</td>
<td style="text-align: center">{{ todo.deadline | date:"m月d日" }}</td>
- <td style="width: 160px"><textarea style="width:100%;overflow:hidden">{{ todo.todo_note }}</textarea></td>
+ <td><textarea style="width:100%;overflow:hidden">{{ todo.todo_note }}</textarea></td>
<td style="text-align: center">{{ todo.duty_group }}</td>
<td style="text-align: center">{{ todo.main_executor }}</td>
{# <td style="text-align: center">{{ todo.sub_executor.all|join:", " }}</td>#}
@@ -148,7 +148,7 @@
</div>
<span class="badge bg-gradient-blue">{{ todo.maturity }}</span>
</td>
- <td style="text-align: center"><textarea style="overflow:hidden; width: 200px" readonly="readonly">{{ todo.complete_note }}</textarea></td>
+ <td style="text-align: center"><textarea style="overflow:hidden; width:100%" readonly="readonly">{{ todo.complete_note }}</textarea></td>
<td style="text-align: center">{{ todo.quality_mark|default:'' }}</td>
<td><a href="{% url 'tasks:todo_detail' pk=todo.id %}">填报</a> </td>
</tr>