diff --git a/application/hrm_mgnt/templates/emp_list_inherit.html b/application/hrm_mgnt/templates/emp_list_inherit.html index 0dd6b7e..9eaaa4e 100644 --- a/application/hrm_mgnt/templates/emp_list_inherit.html +++ b/application/hrm_mgnt/templates/emp_list_inherit.html @@ -24,7 +24,7 @@ {% for field in item|get_fields:table_exclude_field_name %} {% if '(元)' in field.verbose_name %} - {{ field.value|thousands_separator }} + {{ field.value|default_if_none:'-'|thousands_separator }} {% else %} {{ field.value }} {% endif %} diff --git a/common/urls.py b/common/urls.py index eb42967..dedbe80 100644 --- a/common/urls.py +++ b/common/urls.py @@ -4,13 +4,5 @@ from common.views import * urlpatterns = [ path('error_page/', error_page, name='error_page'), path('save_excel_data/', save_excel_table_data, name='save_excel_table_data'), - path('load_secondary_departments/', load_secondary_departments, name='load_secondary_departments'), - - path('save_excel_table_data_fac_inv/', save_excel_table_data_fac_inv, name='save_excel_table_data_fac_inv'), - path('save_excel_table_data_fac_rep/', save_excel_table_data_fac_rep, name='save_excel_table_data_fac_rep'), - path('save_excel_table_data_inventory/', save_excel_table_data_inventory, name='save_excel_table_data_inventory'), - path('save_excel_table_data_svc/', save_excel_table_data_svc, name='save_excel_table_data_svc'), - path('save_excel_table_data_ctt/', save_excel_table_data_ctt, name='save_excel_table_data_ctt'), - path('save_excel_table_data_fix/', save_excel_table_data_fix, name='save_excel_table_data_fix'), - + path('load_secondary_departments/', load_secondary_departments, name='load_secondary_departments') ] diff --git a/templates/items_list.html b/templates/items_list.html index 2d8105b..03e6f64 100644 --- a/templates/items_list.html +++ b/templates/items_list.html @@ -75,14 +75,14 @@ {% render_button 'modify_records_button' %} {% render_button 'add_button' %} {% render_button 'report_excel_button' %} -{# {% render_button 'import_excel_button' %}#} - + {% render_button 'import_excel_button' %} + {% block fields_list_content %}
@@ -138,6 +138,7 @@
+ {% endblock %} {% include 'pagination_ps.html' with page_obj=items query_params=query_params %}