Skip to content

F
fund_report
Commit ee172161 authored by 赵杰's avatar 赵杰
Browse files
Options

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

parents 7c1787a7 0118d965
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 35 deletions
app/templates/v2/monthReportV2.html
View file @ ee172161
...@@ -930,7 +930,7 @@ ...@@ -930,7 +930,7 @@
{{customer_name}} {{customer_name}}
</span> </span>
<span class="cover_sir"> <span class="cover_sir">
先生 客户
</span> </span>
</div> </div>
<img src={{cover_back}} alt="" class="cover_back"> <img src={{cover_back}} alt="" class="cover_back">
...@@ -999,8 +999,7 @@ ...@@ -999,8 +999,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1240,8 +1239,7 @@ ...@@ -1240,8 +1239,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1466,8 +1464,7 @@ ...@@ -1466,8 +1464,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1602,8 +1599,7 @@ ...@@ -1602,8 +1599,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1637,8 +1633,7 @@ ...@@ -1637,8 +1633,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1660,8 +1655,7 @@ ...@@ -1660,8 +1655,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1720,8 +1714,7 @@ ...@@ -1720,8 +1714,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1764,8 +1757,7 @@ ...@@ -1764,8 +1757,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -1861,8 +1853,7 @@ ...@@ -1861,8 +1853,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -2006,8 +1997,7 @@ ...@@ -2006,8 +1997,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -2030,8 +2020,7 @@ ...@@ -2030,8 +2020,7 @@
</div> </div>
<div class="dcell"> <div class="dcell">
<div class="page_text"> <div class="page_text">
小飞象<br> {{brand_name}}
工作室
</div> </div>
</div> </div>
</div> </div>
...@@ -2096,17 +2085,20 @@ ...@@ -2096,17 +2085,20 @@
<!-- 结尾 --> <!-- 结尾 -->
<div class="box8"> <div class="box8">
<div class="cover_head dtable"> <div class="page dtable">
<div class="dcell"> <div class="page_title dcell">
<img src={{logo}} alt="" class="cover_logo">
</div>
<div class="dcell">
<div class="cover_line"></div>
</div> </div>
<div class="dcell"> <div class="page_head dcell">
<div class="cover_text"> <div class="dcell">
小飞象<br> <img src={{logo}} alt="" class="page_logo">
工作室 </div>
<div class="dcell">
<div class="page_line"></div>
</div>
<div class="dcell">
<div class="page_text">
{{brand_name}}
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -2170,6 +2162,8 @@ ...@@ -2170,6 +2162,8 @@
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</body> </body>
......
app/utils/jinjia2html.py
View file @ ee172161
...@@ -181,7 +181,8 @@ class DataIntegrate: ...@@ -181,7 +181,8 @@ class DataIntegrate:
'year_month': self.user_customer.month_start_date.strftime("%Y-%m"), 'year_month': self.user_customer.month_start_date.strftime("%Y-%m"),
'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"), 'start_date': self.user_customer.start_date.strftime("%Y-%m-%d"),
'ifa_company': '飞度工作室', 'ifa_company': '飞度工作室',
'title': '10月综述', 'brand_name': '飞度工作室', 'title': '10月综述',
'brand_name': '小飞象<br>工作室',
'customer_old': 42, 'customer_level': '平衡型', 'customer_old': 42, 'customer_level': '平衡型',
# 'new_evaluation': self.new_evaluation, # 'new_evaluation': self.new_evaluation,
'position_years': '5年', 'planned_allocation_amount': 2000.00, 'position_years': '5年', 'planned_allocation_amount': 2000.00,
...@@ -209,7 +210,7 @@ class DataIntegrate: ...@@ -209,7 +210,7 @@ class DataIntegrate:
'group_hoding_info_total': self.group_hoding_info_total, 'group_hoding_info_total': self.group_hoding_info_total,
'old_evaluation': self.old_evaluation, 'old_evaluation': self.old_evaluation,
'contribution_decomposition': self.contribution_decomposition, 'contribution_decomposition': self.contribution_decomposition,
'single_fund_data_list': [*self.single_fund_data_list, *self.single_fund_data_list, *self.single_fund_data_list], 'single_fund_data_list': self.single_fund_data_list,
'old_correlation': self.old_correlation, 'old_correlation': self.old_correlation,
'new_correlation': self.new_correlation, 'new_correlation': self.new_correlation,
'propose_fund_data_list': self.propose_fund_data_list, 'propose_fund_data_list': self.propose_fund_data_list,
......
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