Merge remote-tracking branch 'origin/ps' into ps1

application/asset_mgnt/views.py

@@ -38,7 +38,7 @@ def fixed_assets_list_view(request):
     query_params = '&asset_id={}&brand={}'.format(asset_id, brand)
 
     # Excel上传模板
-    template_name = "资产管理-固定资产清单表-Excel上传模板.xlsx"
+    template_name = "资产管理-固定资产清单-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {
@@ -180,7 +180,7 @@ def intangible_assets_list_view(request):
     query_params = '&asset_id={}&brand={}'.format(asset_id, brand)
 
     # Excel上传模板
-    template_name = "资产管理-无形资产清单表-Excel上传模板.xlsx"
+    template_name = "资产管理-无形资产清单-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {

application/cpc_mgnt/views.py

@@ -20,7 +20,7 @@ def seal_reg_list_view(request):
 
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&applicant={}'.format(applicant)
-    template_name = "合规管理-用印登记表-Excel上传模板.xlsx"
+    template_name = "合规管理-用印登记-Excel上传模板.xlsx"
 
     context = {
         "model_config": 'cpc_mgnt.SealUsageRegistry',
@@ -132,7 +132,7 @@ def seal_doc_borrow_list_view(request):
 
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&entity_name={}'.format(entity_name)
-    template_name = "合规管理-印章证件借用登记表-Excel上传模板.xlsx"
+    template_name = "合规管理-印章证件借用登记-Excel上传模板.xlsx"
 
     context = {
         "model_config": 'cpc_mgnt.SealAndDocumentBorrowingRegistry',
@@ -403,7 +403,7 @@ def policies_list_view(request):
     query_params = '&policy_name={}'.format(policy_name)
 
     # Excel上传模板
-    template_name = "合规管理-公司制度表-Excel上传模板.xlsx"
+    template_name = "合规管理-公司制度-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {

application/fac_mgnt/views.py

@@ -607,7 +607,7 @@ def bns_cat_list_view(request):
         query_set = query_set.filter(category_name__icontains=category_name)
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&category_name={}'.format(category_name)
-    template_name = "财会管理-奖金类别表-Excel上传模板.xlsx"
+    template_name = "财会管理-奖金类别-Excel上传模板.xlsx"
     context = {
         "model_config": 'fac_mgnt.BonusCategory',
         "items": items,
@@ -715,7 +715,7 @@ def bns_alloc_list_view(request):
         query_set = query_set.filter(primary_department__icontains=department)
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&name={}&year_month={}&department={}'.format(name, year_month, department)
-    template_name = "财会管理-奖金分配表-Excel上传模板.xlsx"
+    template_name = "财会管理-奖金分配-Excel上传模板.xlsx"
     context = {
         "model_config": 'fac_mgnt.BonusAllocation',
         "items": items,
@@ -1213,7 +1213,7 @@ def rep_rec_list_view(request):
         query_set = query_set.filter(project_name__icontains=project_name)
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&project_name={}'.format(project_name)
-    template_name = "财会管理-回款记录表-Excel上传模板.xlsx"
+    template_name = "财会管理-回款记录-Excel上传模板.xlsx"
     context = {
         "model_config": 'fac_mgnt.RepaymentRecord',
         "items": items,
@@ -1362,7 +1362,7 @@ def emp_comm_list_view(request):
 
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&project_name={}&name={}&primary_department={}'.format(project_name, name, primary_department)
-    template_name = "财会管理-员工提成情况表-Excel上传模板.xlsx"
+    template_name = "财会管理-员工提成情况-Excel上传模板.xlsx"
 
     context = {
         "model_config": 'fac_mgnt.EmployeeCommission',

application/mkt_mgnt/views.py

@@ -46,7 +46,7 @@ def proj_res_list_view(request):
     query_params = '&name={}&unit={}&resource_manager={}'.format(name, unit, resource_manager)
 
     # Excel上传模板
-    template_name = "营销管理-项目资源表-Excel上传模板.xlsx"
+    template_name = "营销管理-项目资源-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {

application/org_mgnt/views.py

@@ -55,7 +55,7 @@ def eir_list_view(request):
     )
 
     # Excel上传模板
-    template_name = "组织管理-公司主体信息登记表-Excel上传模板.xlsx"
+    template_name = "组织管理-公司主体信息登记-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {
@@ -274,7 +274,7 @@ def pd_list_view(request):
     query_params = '&department_name={}'.format(department_name)
 
     # Excel上传模板
-    template_name = "组织管理-一级部门表-Excel上传模板.xlsx"
+    template_name = "组织管理-一级部门-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {
@@ -396,7 +396,7 @@ def sd_list_view(request):
     query_params = '&secondary_department_name={}'.format(secondary_department_name)
 
     # Excel上传模板
-    template_name = "组织管理-二级部门表-Excel上传模板.xlsx"
+    template_name = "组织管理-二级部门-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {

application/pjt_mgnt/views.py

@@ -189,7 +189,7 @@ def emp_proj_income_list_view(request):
     query_params = '&project_name={}&year_month={}'.format(project_name, year_month)
 
     # Excel上传模板
-    template_name = "项目管理-项目组员收入结算表-Excel上传模板.xlsx"
+    template_name = "项目管理-项目组员收入结算-Excel上传模板.xlsx"
 
     # 构建上下文
     context = {

application/rsc_mgnt/views.py

@@ -609,7 +609,7 @@ def svc_reg_list_view(request):
 
     items = paginate_query_and_assign_numbers(request=request, queryset=query_set, per_page=10)
     query_params = '&merchant_name={}'.format(merchant_name)
-    template_name = "资源管理-储值卡登记表-Excel上传模板.xlsx"
+    template_name = "资源管理-储值卡登记-Excel上传模板.xlsx"
 
     context = {
         "model_config": 'rsc_mgnt.StoredValueCardRegistration',