Commit 3bf46d55 authored by 赵杰's avatar 赵杰

删除月度回报表格中 累积/月均

parent 89ba4f54
...@@ -296,7 +296,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor): ...@@ -296,7 +296,7 @@ class UserCustomerResultAdaptor(UserCustomerDataAdaptor):
now_year = datetime.datetime.now().year now_year = datetime.datetime.now().year
month_return_data_dict = {} month_return_data_dict = {}
for i in range(now_year-start_year+1): for i in range(now_year-start_year+1):
month_return_data_dict[start_year+i] = {j+1: {"profit": 0, "net_amount": 0} for j in range(13)} month_return_data_dict[start_year+i] = {j+1: {"profit": 0, "net_amount": 0} for j in range(12)}
for d_index, d_row in month_sum.items(): for d_index, d_row in month_sum.items():
cur_year = int(d_index[:4]) cur_year = int(d_index[:4])
cur_month = int(d_index[5:]) cur_month = int(d_index[5:])
......
...@@ -1119,9 +1119,9 @@ ...@@ -1119,9 +1119,9 @@
<th> <th>
12月 12月
</th> </th>
<th> <!-- <th>-->
累计/月均 <!-- 累计/月均-->
</th> <!-- </th>-->
</tr> </tr>
{%for key, value in monthly_table_return.items() %} {%for key, value in monthly_table_return.items() %}
<tr class="yellow"> <tr class="yellow">
...@@ -1167,9 +1167,9 @@ ...@@ -1167,9 +1167,9 @@
<td> <td>
{{value[12]["profit"]}} {{value[12]["profit"]}}
</td> </td>
<td> <!-- <td>-->
{{value[13]["profit"]}} <!-- {{value[13]["profit"]}}-->
</td> <!-- </td>-->
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -1211,9 +1211,11 @@ ...@@ -1211,9 +1211,11 @@
<td> <td>
{{value[12]["net_amount"]}} {{value[12]["net_amount"]}}
</td> </td>
<td> <!-- <td>-->
{{value[13]["net_amount"]}} <!-- {{value[13]["net_amount"]}}-->
</td> <!-- </td> <td>-->
<!-- {{value[13]["net_amount"]}}-->
<!-- </td>-->
</tr> </tr>
{%endfor%} {%endfor%}
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment