From 4711582eb7ec2ac637057d25544317b41c62cc52 Mon Sep 17 00:00:00 2001
From: sichan <sichanwong0527@gmail.com>
Date: Wed, 19 Jun 2024 11:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/hrm_mgnt/templates/emp_list_inherit.html |  2 +-
 common/urls.py                                       | 10 +---------
 templates/items_list.html                            |  5 +++--
 3 files changed, 5 insertions(+), 12 deletions(-)

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 @@
                                 <tr>
                                     {% for field in item|get_fields:table_exclude_field_name %}
                                         {% if '（元）' in field.verbose_name %}
-                                            <td class="text-center">{{ field.value|thousands_separator }}</td>
+                                            <td class="text-center">{{ field.value|default_if_none:'-'|thousands_separator }}</td>
                                         {% else %}
                                             <td class="text-center">{{ field.value }}</td>
                                         {% 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' %}#}
-                                                    <button id="importExcelBtnTest" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#uploadModal">上传Excel(测试)</button>
+                                                    {% render_button 'import_excel_button' %}
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
+                            {% block fields_list_content %}
                             <div class="row mb-3">
                                 <div class="col-sm-12">
                                     <div class="card">
@@ -138,6 +138,7 @@
                                     </div>
                                 </div>
                             </div>
+                            {% endblock %}
                             {% include 'pagination_ps.html' with page_obj=items query_params=query_params %}
                         </div>
                     </div>