From 3b7b558f158653e5775424d5d262f15d6bd8dc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A3=AE?= <p3ngsam@gmail.com>
Date: Tue, 18 Jun 2024 21:54:54 +0800
Subject: [PATCH] =?UTF-8?q?commit=201.=20=E4=BF=AE=E6=94=B9=E7=89=B9?=
 =?UTF-8?q?=E5=AE=9A=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=BC=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=A8=A1=E5=9E=8B=E5=8F=96=E6=B6=88=E5=A4=96=E9=94=AE?=
 =?UTF-8?q?=202.=20=E4=BF=AE=E5=A4=8Ditems=5Flist=20=E4=B8=AD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8id=E6=8E=A7=E5=88=B6=E7=BC=96=E8=BE=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/hrm_mgnt/models.py                |  39 +-
 application/hrm_mgnt/templates/emp_list.html  | 206 +++++++-
 application/org_mgnt/templates/ce_list.html   | 485 +++++++-----------
 ...�织管理-公司主体信息登记-Excel上传模板.xlsx | Bin 9717 -> 9736 bytes
 templates/items_list.html                     |   8 +-
 5 files changed, 415 insertions(+), 323 deletions(-)

diff --git a/application/hrm_mgnt/models.py b/application/hrm_mgnt/models.py
index 219b049..429afb1 100644
--- a/application/hrm_mgnt/models.py
+++ b/application/hrm_mgnt/models.py
@@ -2,6 +2,8 @@ import datetime
 
 from django.db import models
 
+from application.org_mgnt.models import PrimaryDepartment, SecondaryDepartment
+
 
 # 岗位表
 class Position(models.Model):
@@ -104,15 +106,16 @@ class EmployeeInformation(models.Model):
     ethnicity = models.CharField(max_length=255, verbose_name='民族', blank=True)
     domicile = models.CharField(max_length=255, verbose_name='户籍地', blank=True)
     marital_status = models.CharField(max_length=50, choices=MARITAL_STATUS_CHOICES, verbose_name='婚姻状态')
-    political_affiliation = models.CharField(max_length=50, choices=POLITICAL_AFFILIATION_CHOICES, verbose_name='政治面貌')
+    political_affiliation = models.CharField(max_length=50, choices=POLITICAL_AFFILIATION_CHOICES,
+                                             verbose_name='政治面貌')
     entry_date = models.DateField(verbose_name='入职日期')
     regularization_date = models.DateField(null=True, blank=True, verbose_name='转正日期')
     employment_type = models.CharField(max_length=50, choices=EMPLOYMENT_TYPE_CHOICES, verbose_name='用工性质')
     status = models.CharField(max_length=50, choices=STATUS_CHOICES, verbose_name='状态')
-    primary_department = models.ForeignKey('org_mgnt.PrimaryDepartment', on_delete=models.SET_NULL, null=True, verbose_name='一级部门')
-    secondary_department = models.ForeignKey('org_mgnt.SecondaryDepartment', on_delete=models.SET_NULL, null=True, verbose_name='二级部门', blank=True)
-    position = models.ForeignKey('Position', on_delete=models.SET_NULL, null=True, verbose_name='岗位')
-    rank = models.ForeignKey('Rank', on_delete=models.SET_NULL, null=True, verbose_name='职级', blank=True)
+    primary_department = models.CharField(max_length=255, verbose_name='一级部门', default='星河')
+    secondary_department = models.CharField(max_length=255, verbose_name='二级部门', default='数资团队')
+    position = models.CharField(max_length=255, verbose_name='岗位', default='数据分析师')
+    rank = models.CharField(max_length=255, verbose_name='职级', default='P1')
     contract_end_date = models.DateField(null=True, blank=True, verbose_name='当前合同到期日期')
     mobile_number = models.CharField(max_length=255, verbose_name='手机号')
     email = models.EmailField(verbose_name='邮箱')
@@ -128,11 +131,30 @@ class EmployeeInformation(models.Model):
     base_salary = models.TextField(verbose_name='基础工资（元）', blank=True)
     salary_account_number = models.CharField(max_length=255, verbose_name='工资卡号', blank=True)
     bank_of_salary_account = models.CharField(max_length=255, verbose_name='工资卡开户行', blank=True)
-    resignation_type = models.CharField(max_length=50, choices=RESIGNATION_TYPE_CHOICES, verbose_name='离职类型', blank=True)
+    resignation_type = models.CharField(max_length=50, choices=RESIGNATION_TYPE_CHOICES, verbose_name='离职类型',
+                                        blank=True)
     resignation_reason = models.TextField(verbose_name='离职原因', blank=True)
     resignation_date = models.DateField(null=True, blank=True, verbose_name='离职日期')
 
-    excluded_fields = ['resignation_type', 'resignation_reason', 'resignation_date']
+    def save(self, *args, **kwargs):
+        primary_department_name = PrimaryDepartment.objects.filter(department_name=self.primary_department).first()
+        secondary_department = SecondaryDepartment.objects.filter(secondary_department_name=self.secondary_department).first()
+        position = Position.objects.filter(position_name=self.position).first()
+        rank = Rank.objects.filter(rank_name=self.rank).first()
+
+        if not primary_department_name:
+            raise ValueError("一级部门不存在")
+
+        if not secondary_department:
+            raise ValueError("二级部门不存在")
+
+        if not position:
+            raise ValueError("岗位不存在")
+
+        if not rank:
+            raise ValueError("职位不存在")
+
+        super(EmployeeInformation, self).save(*args, **kwargs)
 
     class Meta:
         verbose_name = '人员基本信息表'
@@ -189,7 +211,8 @@ class OtherLeaveDetails(models.Model):
     ]
 
     record_id = models.AutoField(primary_key=True)
-    attendance_record = models.ForeignKey(EmployeeAttendanceRecord, on_delete=models.CASCADE, related_name='other_leaves', verbose_name='考勤记录')
+    attendance_record = models.ForeignKey(EmployeeAttendanceRecord, on_delete=models.CASCADE,
+                                          related_name='other_leaves', verbose_name='考勤记录')
     leave_type = models.CharField(max_length=255, choices=LEAVE_TYPE_CHOICES, verbose_name='假期类型')
     days = models.IntegerField(verbose_name='天数')
     description = models.TextField(verbose_name='说明')
diff --git a/application/hrm_mgnt/templates/emp_list.html b/application/hrm_mgnt/templates/emp_list.html
index b6251ff..59a7a19 100644
--- a/application/hrm_mgnt/templates/emp_list.html
+++ b/application/hrm_mgnt/templates/emp_list.html
@@ -16,7 +16,7 @@
                                             <div class="row">
                                                 <div class="col-md-8">
                                                     <!-- 筛选表单 开始 -->
-                                                    <form action="{% url form_action_url %}" method="get">
+                                                    <form action="{{ form_action_url }}" method="get">
                                                         {% csrf_token %}
                                                         <div class="row">
                                                             {% for filter in filters %}
@@ -74,11 +74,13 @@
                                                 </div>
                                                 <!-- 按钮组 开始 -->
                                                 <div class="col-md-4 mt-4 text-end">
-                                                    <button id="addItemBtn" class="btn btn-outline-secondary"
-                                                            data-bs-toggle="modal" data-bs-target="#addEditModal">添加
-                                                    </button>
-                                                    <button class="btn btn-outline-primary" data-bs-toggle="modal"
-                                                            data-bs-target="#uploadModal">上传Excel
+                                                    {% 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>
                                                 </div>
                                                 <!-- 按钮组 结束 -->
@@ -171,20 +173,6 @@
     </section>
 
 
-    <div id="addEditModal" class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog"
-         aria-labelledby="formModalCenterTitle" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="formModalTitle">{{ form_title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="modal fade" id="resignationModal" tabindex="-1" role="dialog" aria-labelledby="resignationModalLabel"
          aria-hidden="true">
         <div class="modal-dialog" role="document">
@@ -248,13 +236,81 @@
         </div>
     </div>
 
+    <div id="addEditModal" class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog"
+         aria-labelledby="formModalCenterTitle" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="formModalTitle">{{ form_title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="deleteModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel"
+         aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="deleteModalLabel">提示</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+
+                <div class="modal-body">
+                    <p>此操作会删除当前数据，是否继续？</p>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-danger" id="confirmDeleteBtn">删除</button>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <div id="uploadModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="uploadModalLabel"
+         aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <form id="upload-form" method="post" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="uploadModalLabel">上传Excel文件</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <input id="inputFile" type="file" name="excel_file" class="form-control" hidden accept=".xlsx">
+                        <label class="btn btn-outline-primary" for="inputFile">选择文件</label>
+                        <span id="file-chosen" style="font-size: 12px; margin-left: 10px;">未选择文件</span>
+                    </div>
+                    <div class="modal-footer">
+                        <button id="downloadExcelBtn" type="button" class="btn btn-secondary" onclick="#!">
+                            下载填报模板
+                        </button>
+                        <button id="uploadBtn" type="button" class="btn btn-primary">上传Excel</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
     {% include 'modify_record_modal.html' with modify_records_url=modify_records_url %}
-    {% include 'delete_modal.html' with delete_url=delete_url %}
-    {% include 'upload_excel_modal.html' with excel_upload_config=excel_upload_config %}
+
+    {% block item_list_custom_content %}
+    {% endblock %}
 
     <script>
         const add_url = "{{ add_url }}";
         const modify_url = "{{ modify_url }}";
+        const deleteUrl = "{{ delete_url }}";
+        let targetIdToDelete = null;
+        var templateName = "{{ excel_upload_config.template_name }}";
+        var modelConfig = "{{ model_config }}";
+        var list_url = "{{ form_action_url }}"
 
         function calculateAge(birthday) {
             var birthDate = new Date(birthday);
@@ -267,8 +323,24 @@
             return age;
         }
 
-
         $(document).ready(function () {
+            function getCookie(name) {
+                let cookieValue = null;
+                if (document.cookie && document.cookie !== '') {
+                    const cookies = document.cookie.split(';');
+                    for (let i = 0; i < cookies.length; i++) {
+                        const cookie = cookies[i].trim();
+                        if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                            cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                            break;
+                        }
+                    }
+                }
+                return cookieValue;
+            }
+
+            const csrftoken = getCookie('csrftoken');
+
             // 处理添加按钮点击事件
             $('#addItemBtn').click(function () {
                 $.ajax({
@@ -279,6 +351,8 @@
                         $('#addEditModal .modal-body').html(response.form_html);
                         // 动态设置模态框标题
                         $('#formModalTitle').text('新增');
+                        // 动态设置表单提交URL
+                        $('#addEditForm').attr('action', add_url);
                         // 显示模态框
                         $('#addEditModal').modal('show');
 
@@ -303,6 +377,8 @@
                         // 将表单 HTML 插入到模态框中
                         $('#addEditModal .modal-body').html(response.form_html);
                         $('#formModalTitle').text('编辑');
+                        // 动态设置表单提交URL
+                        $('#addEditForm').attr('action', modify_url);
                         // 显示模态框
                         $('#addEditModal').modal('show');
 
@@ -321,14 +397,13 @@
                 $('#addEditForm').submit(function (e) {
                     e.preventDefault();
                     $.ajax({
-                        url: modify_url,  // 确保URL正确
+                        url: $(this).attr('action'),  // 动态获取URL
                         type: 'post',  // 使用 POST 请求来提交表单
                         data: $(this).serialize(),
                         success: function (response) {
                             // 关闭模态框并显示成功消息
                             $('#addEditModal').modal('hide');
                             showAlert('success', response.message);
-                            // 你可以在这里刷新表格或更新页面内容
                             location.reload();
                         },
                         error: function (xhr) {
@@ -341,6 +416,86 @@
                 });
             }
 
+            // 删除和确认删除
+            $(document).on('click', '#deleteBtn, #confirmDeleteBtn', function (event) {
+                if (event.target.id === 'deleteBtn') {
+                    // 打开删除模态框
+                    targetIdToDelete = $(this).data('id');
+                    $('#deleteModal').modal('show');
+                } else if (event.target.id === 'confirmDeleteBtn') {
+                    // 确认删除
+                    if (targetIdToDelete !== null) {
+                        $.ajax({
+                            type: 'GET',
+                            url: deleteUrl,
+                            data: {
+                                'id': targetIdToDelete
+                            },
+                            success: function (response) {
+                                showAlert('success', "删除成功");
+                                location.reload();
+                            },
+                            error: function (response) {
+                                showAlert('danger', "删除失败");
+                            }
+                        });
+                    }
+                    $('#deleteModal').modal('hide');
+                }
+            });
+
+            // 点击下载Excel模板按钮
+            $('#downloadExcelBtn').on('click', function () {
+                window.location.href = excel_upload_config.template_url;
+            });
+
+            // 当上传模态框显示时，清空文件输入框和文件名显示
+            $('#uploadModal').on('show.bs.modal', function () {
+                $('#inputFile').val('');
+                $('#file-chosen').text('未选择文件');
+            });
+
+            // 当选择文件变化时，更新文件名显示
+            $('#inputFile').on('change', function () {
+                var fileName = $(this).val().split('\\').pop();
+                $('#file-chosen').text(fileName || '未选择文件');
+            });
+
+            // 处理上传按钮的点击事件
+            $('#uploadBtn').on('click', function () {
+                var inputFile = $('#inputFile').get(0).files[0];
+                if (!inputFile) {
+                    showAlert('danger', '未选择文件');
+                    $('#uploadModal').modal('show');
+                    return;
+                }
+
+                var formData = new FormData();
+                formData.append('file', inputFile);  // 将文件添加到 FormData 中
+                formData.append('template_name', templateName);
+                formData.append('excel_valid_model', modelConfig);
+                formData.append('list_url', list_url)
+
+                $.ajax({
+                    url: '{{ excel_upload_config.parse_url }}',
+                    type: 'POST',
+                    data: formData,
+                    headers: {'X-CSRFToken': csrftoken},
+                    contentType: false,
+                    processData: false,
+                    success: function (response) {
+                        window.location.href = response.redirect_url;
+                    },
+                    error: function (xhr, status, error) {
+                        var errorMsg = "解析Excel文件失败。";
+                        if (xhr.responseJSON && xhr.responseJSON.error) {
+                            errorMsg = xhr.responseJSON.error;
+                        }
+                        showAlert('danger', errorMsg);
+                    }
+                });
+            });
+
             $(document).on('change', '#id_birthday', function () {
                 var birthday = $(this).val();
                 if (birthday) {
@@ -352,6 +507,7 @@
             });
         });
 
+
         function showResignationModal(resignation_type, resignation_reason, resignation_date) {
             // 填充模态框内容
             document.getElementById('resignationType').innerText = resignation_type;
diff --git a/application/org_mgnt/templates/ce_list.html b/application/org_mgnt/templates/ce_list.html
index 8b38ee7..cb22949 100644
--- a/application/org_mgnt/templates/ce_list.html
+++ b/application/org_mgnt/templates/ce_list.html
@@ -16,7 +16,7 @@
                                             <div class="row">
                                                 <div class="col-md-8">
                                                     <!-- 筛选表单 开始 -->
-                                                    <form action="{% url form_action_url %}" method="get">
+                                                    <form action="{{ form_action_url }}" method="get">
                                                         {% csrf_token %}
                                                         <div class="row">
                                                             {% for filter in filters %}
@@ -74,11 +74,13 @@
                                                 </div>
                                                 <!-- 按钮组 开始 -->
                                                 <div class="col-md-4 mt-4 text-end">
-                                                    <button id="addItemBtn" class="btn btn-outline-secondary"
-                                                            data-bs-toggle="modal" data-bs-target="#addEditModal">添加
-                                                    </button>
-                                                    <button class="btn btn-outline-primary" data-bs-toggle="modal"
-                                                            data-bs-target="#uploadModal">上传Excel
+                                                    {% 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>
                                                 </div>
                                                 <!-- 按钮组 结束 -->
@@ -135,10 +137,19 @@
                                                                 {% endif %}
                                                             {% endfor %}
                                                             <td class="text-center">
-                                                                <a href="#" class="edit-btn"
+                                                                <a href="#"
+                                                                   id="editBtn"
+                                                                   class="edit-btn"
                                                                    data-id="{{ item|get_pk_value }}"
                                                                    data-bs-toggle="modal"
                                                                    data-bs-target="#addEditModal">编辑</a>
+                                                                <a href="#"
+                                                                   id="deleteBtn"
+                                                                   class="edit-btn"
+                                                                   style="color: red"
+                                                                   data-id="{{ item|get_pk_value }}"
+                                                                   data-bs-toggle="modal"
+                                                                   data-bs-target="#deleteModal">删除</a>
                                                             </td>
                                                         </tr>
                                                     {% empty %}
@@ -165,19 +176,6 @@
     </section>
 
 
-    <div id="addEditModal" class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog"
-         aria-labelledby="formModalCenterTitle" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="formModalTitle">{{ form_title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                </div>
-            </div>
-        </div>
-    </div>
     <div id="shareholdersModal" class="modal fade bd-example-modal-sm" tabindex="-1" role="dialog"
          aria-labelledby="formModalCenterTitle" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-sm" role="document">
@@ -201,9 +199,9 @@
             </div>
         </div>
     </div>
-    <div id="showHistoryModal" class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog"
+    <div id="showHistoryModal" class="modal fade bd-example-modal-xl" tabindex="-1" role="dialog"
          aria-labelledby="formModalCenterTitle" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="formModalTitle">历史沿革</h5>
@@ -310,12 +308,12 @@
             </div>
         </div>
     </div>
-    <div id="deleteModal" class="modal fade" tabindex="-1" role="dialog"
-         aria-labelledby="deleteModalLabel" aria-hidden="true">
+    <div id="deleteBankAModal" class="modal fade" tabindex="-1" role="dialog"
+         aria-labelledby="deleteBankModalLabel" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="deleteModalLabel">提示
+                    <h5 class="modal-title" id="deleteBankModalLabel">提示
                     </h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal"
                             aria-label="Close"></button>
@@ -377,17 +375,103 @@
         </div>
     </div>
 
+
+    <div id="addEditModal" class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog"
+         aria-labelledby="formModalCenterTitle" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="formModalTitle">{{ form_title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="deleteModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel"
+         aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="deleteModalLabel">提示</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+
+                <div class="modal-body">
+                    <p>此操作会删除当前数据，是否继续？</p>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-danger" id="confirmDeleteBtn">删除</button>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <div id="uploadModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="uploadModalLabel"
+         aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <form id="upload-form" method="post" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="uploadModalLabel">上传Excel文件</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <input id="inputFile" type="file" name="excel_file" class="form-control" hidden accept=".xlsx">
+                        <label class="btn btn-outline-primary" for="inputFile">选择文件</label>
+                        <span id="file-chosen" style="font-size: 12px; margin-left: 10px;">未选择文件</span>
+                    </div>
+                    <div class="modal-footer">
+                        <button id="downloadExcelBtn" type="button" class="btn btn-secondary" onclick="#!">
+                            下载填报模板
+                        </button>
+                        <button id="uploadBtn" type="button" class="btn btn-primary">上传Excel</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
     {% include 'modify_record_modal.html' with modify_records_url=modify_records_url %}
-    {% include 'delete_modal.html' with delete_url=delete_url %}
-    {% include 'upload_excel_modal.html' with excel_upload_config=excel_upload_config %}
+
+    {% block item_list_custom_content %}
+    {% endblock %}
 
     <script>
         const add_url = "{{ add_url }}";
         const modify_url = "{{ modify_url }}";
+        const deleteUrl = "{{ delete_url }}";
+        let targetIdToDelete = null;
+        var templateName = "{{ excel_upload_config.template_name }}";
+        var modelConfig = "{{ model_config }}";
+        var list_url = "{{ form_action_url }}"
         let accountIdToDelete;
         let accountIdToEdit;
 
         $(document).ready(function () {
+            function getCookie(name) {
+                let cookieValue = null;
+                if (document.cookie && document.cookie !== '') {
+                    const cookies = document.cookie.split(';');
+                    for (let i = 0; i < cookies.length; i++) {
+                        const cookie = cookies[i].trim();
+                        if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                            cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                            break;
+                        }
+                    }
+                }
+                return cookieValue;
+            }
+
+            const csrftoken = getCookie('csrftoken');
+
             // 处理添加按钮点击事件
             $('#addItemBtn').click(function () {
                 $.ajax({
@@ -398,6 +482,8 @@
                         $('#addEditModal .modal-body').html(response.form_html);
                         // 动态设置模态框标题
                         $('#formModalTitle').text('新增');
+                        // 动态设置表单提交URL
+                        $('#addEditForm').attr('action', add_url);
                         // 显示模态框
                         $('#addEditModal').modal('show');
 
@@ -412,7 +498,7 @@
             });
 
             // 处理编辑按钮点击事件
-            $('.edit-btn').click(function () {
+            $('#editBtn').click(function () {
                 var itemId = $(this).data('id');
                 $.ajax({
                     url: modify_url,
@@ -422,6 +508,8 @@
                         // 将表单 HTML 插入到模态框中
                         $('#addEditModal .modal-body').html(response.form_html);
                         $('#formModalTitle').text('编辑');
+                        // 动态设置表单提交URL
+                        $('#addEditForm').attr('action', modify_url);
                         // 显示模态框
                         $('#addEditModal').modal('show');
 
@@ -440,14 +528,13 @@
                 $('#addEditForm').submit(function (e) {
                     e.preventDefault();
                     $.ajax({
-                        url: modify_url,  // 确保URL正确
+                        url: $(this).attr('action'),  // 动态获取URL
                         type: 'post',  // 使用 POST 请求来提交表单
                         data: $(this).serialize(),
                         success: function (response) {
                             // 关闭模态框并显示成功消息
                             $('#addEditModal').modal('hide');
                             showAlert('success', response.message);
-                            // 你可以在这里刷新表格或更新页面内容
                             location.reload();
                         },
                         error: function (xhr) {
@@ -459,6 +546,86 @@
                     });
                 });
             }
+
+            // 删除和确认删除
+            $(document).on('click', '#deleteBtn, #confirmDeleteBtn', function (event) {
+                if (event.target.id === 'deleteBtn') {
+                    // 打开删除模态框
+                    targetIdToDelete = $(this).data('id');
+                    $('#deleteModal').modal('show');
+                } else if (event.target.id === 'confirmDeleteBtn') {
+                    // 确认删除
+                    if (targetIdToDelete !== null) {
+                        $.ajax({
+                            type: 'GET',
+                            url: deleteUrl,
+                            data: {
+                                'id': targetIdToDelete
+                            },
+                            success: function (response) {
+                                showAlert('success', "删除成功");
+                                location.reload();
+                            },
+                            error: function (response) {
+                                showAlert('danger', "删除失败");
+                            }
+                        });
+                    }
+                    $('#deleteModal').modal('hide');
+                }
+            });
+
+            // 点击下载Excel模板按钮
+            $('#downloadExcelBtn').on('click', function () {
+                window.location.href = excel_upload_config.template_url;
+            });
+
+            // 当上传模态框显示时，清空文件输入框和文件名显示
+            $('#uploadModal').on('show.bs.modal', function () {
+                $('#inputFile').val('');
+                $('#file-chosen').text('未选择文件');
+            });
+
+            // 当选择文件变化时，更新文件名显示
+            $('#inputFile').on('change', function () {
+                var fileName = $(this).val().split('\\').pop();
+                $('#file-chosen').text(fileName || '未选择文件');
+            });
+
+            // 处理上传按钮的点击事件
+            $('#uploadBtn').on('click', function () {
+                var inputFile = $('#inputFile').get(0).files[0];
+                if (!inputFile) {
+                    showAlert('danger', '未选择文件');
+                    $('#uploadModal').modal('show');
+                    return;
+                }
+
+                var formData = new FormData();
+                formData.append('file', inputFile);  // 将文件添加到 FormData 中
+                formData.append('template_name', templateName);
+                formData.append('excel_valid_model', modelConfig);
+                formData.append('list_url', list_url)
+
+                $.ajax({
+                    url: '{{ excel_upload_config.parse_url }}',
+                    type: 'POST',
+                    data: formData,
+                    headers: {'X-CSRFToken': csrftoken},
+                    contentType: false,
+                    processData: false,
+                    success: function (response) {
+                        window.location.href = response.redirect_url;
+                    },
+                    error: function (xhr, status, error) {
+                        var errorMsg = "解析Excel文件失败。";
+                        if (xhr.responseJSON && xhr.responseJSON.error) {
+                            errorMsg = xhr.responseJSON.error;
+                        }
+                        showAlert('danger', errorMsg);
+                    }
+                });
+            });
         });
 
         function showShareholdersModal(data) {
@@ -577,7 +744,7 @@
                         deleteButton.className = 'btn btn-outline-danger btn-sm';
                         deleteButton.onclick = () => {
                             accountIdToDelete = account.account_id;
-                            const deleteModal = new bootstrap.Modal(document.getElementById('deleteModal'));
+                            const deleteModal = new bootstrap.Modal(document.getElementById('deleteBankModal'));
                             deleteModal.show();
                         };
 
@@ -691,7 +858,7 @@
             const bankName = document.getElementById('editBankName').value;
             const accountNumber = document.getElementById('editAccountNumber').value;
             const accountType = document.getElementById('editAccountType').value;
-            const accountStatus= document.getElementById('editAccountStatus').value;
+            const accountStatus = document.getElementById('editAccountStatus').value;
 
             fetch(`/basic_data/om/bank_accounts/${accountIdToEdit}/update/`, {
                 method: 'PUT',
@@ -768,259 +935,5 @@
         }
 
     </script>
-    <script>
-        const add_url = "{{ add_url }}";
-        const modify_url = "{{ modify_url }}";
-        let Commission_id = '';
-        let deleteCommissionId = null;
 
-        $(document).ready(function () {
-            // 处理添加按钮点击事件
-            $('#addItemBtn').click(function () {
-                $.ajax({
-                    url: add_url,
-                    type: 'get',
-                    success: function (response) {
-                        // 将新的表单 HTML 插入到模态框中
-                        $('#addEditModal .modal-body').html(response.form_html);
-                        // 动态设置模态框标题
-                        $('#formModalTitle').text('新增');
-                        // 显示模态框
-                        $('#addEditModal').modal('show');
-
-                        // 绑定表单提交事件
-                        bindFormSubmit();
-                    },
-                    error: function () {
-                        $('#addEditModal').modal('hide');
-                        showAlert('danger', '获取表单请求出错');
-                    }
-                });
-            });
-
-            // 处理编辑按钮点击事件
-            $('.edit-btn').click(function () {
-                var itemId = $(this).data('id');
-                $.ajax({
-                    url: modify_url,
-                    type: 'get',
-                    data: {id: itemId},
-                    success: function (response) {
-                        // 将表单 HTML 插入到模态框中
-                        $('#addEditModal .modal-body').html(response.form_html);
-                        $('#formModalTitle').text('编辑');
-                        // 显示模态框
-                        $('#addEditModal').modal('show');
-
-                        // 绑定表单提交事件
-                        bindFormSubmit();
-                    },
-                    error: function () {
-                        $('#addEditModal').modal('hide');
-                        showAlert('danger', '获取表单请求出错');
-                    }
-                });
-            });
-
-            // 保存
-            function bindFormSubmit() {
-                $('#addEditForm').submit(function (e) {
-                    e.preventDefault();
-                    $.ajax({
-                        url: modify_url,  // 确保URL正确
-                        type: 'post',  // 使用 POST 请求来提交表单
-                        data: $(this).serialize(),
-                        success: function (response) {
-                            // 关闭模态框并显示成功消息
-                            $('#addEditModal').modal('hide');
-                            showAlert('success', response.message);
-                            // 你可以在这里刷新表格或更新页面内容
-                            location.reload();
-                        },
-                        error: function (xhr) {
-                            // 处理表单错误并显示错误消息
-                            var response = xhr.responseJSON;
-                            $('#addEditModal .modal-body').html(response.form_html);
-                            bindFormSubmit();
-                        }
-                    });
-                });
-            }
-        });
-
-        function showCommissionModal(recordId) {
-            Commission_id = recordId;
-            fetch(`/basic_data/fm/get_employee_commission_details/${recordId}/`)
-                .then(response => response.json())
-                .then(data => {
-                    const tableBody = document.getElementById('commissionTableBody');
-                    const noDataMessage = document.getElementById('noCommissionMessage');
-                    tableBody.innerHTML = '';
-
-                    if (data.length === 0) {
-                        noDataMessage.style.display = 'block';
-                    } else {
-                        noDataMessage.style.display = 'none';
-
-                        data.forEach(detail => {
-                            const row = document.createElement('tr');
-
-                            row.innerHTML = `
-                        <td class="text-center">${detail.employee_name}</td>
-                        <td class="text-center">${detail.primary_department}</td>
-                        <td class="text-center">${detail.year}</td>
-                        <td class="text-center">${detail.performance_score}</td>
-                        <td class="text-center">${detail.total_commission}</td>
-                        <td class="text-center">${detail.amount_paid}</td>
-                        <td class="text-center">${detail.accrued_amount}</td>
-                        <td class="text-center">${detail.back_pay_amount}</td>
-                        <td class="text-center">${detail.deduction_amount}</td>
-                        <td class="text-center">
-                            <button class="btn btn-outline-primary btn-sm me-2" onclick="showEditCommissionModal(${detail.record_id})">编辑</button>
-                            <button class="btn btn-outline-danger btn-sm" onclick="showDeleteCommissionModal(${detail.record_id})">删除</button>
-                        </td>
-                        `;
-
-                            tableBody.appendChild(row);
-                        });
-                    }
-
-                    const commissionModal = new bootstrap.Modal(document.getElementById('commissionModal'));
-                    commissionModal.show();
-                })
-                .catch(error => console.error('Error fetching employee commission details:', error));
-        }
-
-        function showAddCommissionModal() {
-            // 关闭员工提成详情模态框
-            const commissionModal = bootstrap.Modal.getInstance(document.getElementById('commissionModal'));
-            if (commissionModal) {
-                commissionModal.hide();
-            }
-            // Fetch employees and years
-            fetch('/basic_data/fm/get_employees/')
-                .then(response => response.json())
-                .then(data => {
-                    const employeeSelect = document.getElementById('employee');
-                    employeeSelect.innerHTML = '<option value="">请选择员工</option>';
-                    data.employees.forEach(employee => {
-                        const option = document.createElement('option');
-                        option.value = employee.id;
-                        option.name = employee.name;
-                        option.textContent = employee.name;
-                        employeeSelect.appendChild(option);
-                    });
-                });
-
-            const yearSelect = document.getElementById('year');
-            yearSelect.innerHTML = '<option value="">请选择年度</option>';
-            const currentYear = new Date().getFullYear();
-            for (let year = currentYear; year >= 2000; year--) {
-                const option = document.createElement('option');
-                option.value = year;
-                option.textContent = year;
-                yearSelect.appendChild(option);
-            }
-
-            const addCommissionModal = new bootstrap.Modal(document.getElementById('addCommissionModal'));
-            addCommissionModal.show();
-        }
-
-        document.getElementById('employee').addEventListener('change', function () {
-            const employeeId = this.value;
-            if (employeeId) {
-                fetch(`/basic_data/fm/get_employee_info/${employeeId}/`)
-                    .then(response => response.json())
-                    .then(data => {
-                        document.getElementById('primary_department').value = data.primary_department;
-                    });
-            }
-        });
-
-        document.getElementById('year').addEventListener('change', function () {
-            const employeeId = document.getElementById('employee').value;
-            const year = this.value;
-            if (employeeId && year) {
-                fetch(`/basic_data/fm/get_performance_score/${employeeId}/${year}/`)
-                    .then(response => response.json())
-                    .then(data => {
-                        document.getElementById('performance_score').value = data.performance_score;
-                    });
-            }
-        });
-
-        function submitAddCommissionForm() {
-            const form = document.getElementById('addCommissionForm');
-            const formData = new FormData(form);
-            formData.append('project_commission', Commission_id); // 添加 project_commission_id
-
-            fetch('/basic_data/fm/add_employee_commission_detail/', {
-                method: 'POST',
-                body: formData,
-                headers: {
-                    'X-CSRFToken': '{{ csrf_token }}'
-                }
-            })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.success) {
-                        // 关闭新增模态框
-                        const addCommissionModal = bootstrap.Modal.getInstance(document.getElementById('addCommissionModal'));
-                        addCommissionModal.hide();
-
-                        showAlert('success', '新建成功');
-                        // 刷新员工提成详情表
-                        showCommissionModal(recordId);
-
-                    } else {
-                        alert('保存失败: ' + data.message);
-                    }
-                })
-                .catch(error => console.error('Error adding employee commission detail:', error));
-        }
-
-
-        function showDeleteCommissionModal(id) {
-            deleteCommissionId = id;
-
-            // 隐藏 ID 为 commissionModal 的模态框
-            const commissionModalElement = document.getElementById('commissionModal');
-            const commissionModalInstance = bootstrap.Modal.getInstance(commissionModalElement);
-            if (commissionModalInstance) {
-                commissionModalInstance.hide();
-            }
-
-            // 显示删除确认模态框
-            const showDeleteModalElement = document.getElementById('deleteCommissionModal');
-            let deleteModal = bootstrap.Modal.getInstance(showDeleteModalElement);
-
-            if (!deleteModal) {
-                deleteModal = new bootstrap.Modal(showDeleteModalElement);
-            }
-
-            deleteModal.show();
-        }
-
-        function deleteCommission() {
-            fetch(`/basic_data/fm/delete_employee_commission/${deleteCommissionId}/`, {
-                method: 'DELETE',
-                headers: {
-                    'X-CSRFToken': '{{ csrf_token }}'
-                }
-            })
-                .then(response => response.json())
-                .then(data => {
-                    if (data.success) {
-                        alert('删除成功');
-                        const deleteModal = bootstrap.Modal.getInstance(document.getElementById('deleteCommissionModal'));
-                        deleteModal.hide();
-                        showCommissionModal(Commission_id);
-                    } else {
-                        alert('删除失败: ' + data.message);
-                    }
-                })
-                .catch(error => console.error('Error deleting employee commission:', error));
-        }
-
-    </script>
 {% endblock %}
diff --git a/static/excels/组织管理-公司主体信息登记-Excel上传模板.xlsx b/static/excels/组织管理-公司主体信息登记-Excel上传模板.xlsx
index 2ce231d686d6c0c1060af41bd1c2732215326274..456a9bc544b68d8fa628d885bd517b96584db3c2 100644
GIT binary patch
delta 4633
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
X@}N%$DA%+9Sy|L`$>JWc|E>5xoQ<tw

delta 4631
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

diff --git a/templates/items_list.html b/templates/items_list.html
index a1e4b9b..5012248 100644
--- a/templates/items_list.html
+++ b/templates/items_list.html
@@ -117,7 +117,7 @@
                                                                    data-bs-target="#addEditModal">编辑</a>
                                                                 <a href="#"
                                                                    id="deleteBtn"
-                                                                   class="edit-btn"
+                                                                   class="delete-btn"
                                                                    style="color: red"
                                                                    data-id="{{ item|get_pk_value }}"
                                                                    data-bs-toggle="modal"
@@ -263,7 +263,7 @@
             });
 
             // 处理编辑按钮点击事件
-            $('#editBtn').click(function () {
+            $('.edit-btn').click(function () {
                 var itemId = $(this).data('id');
                 $.ajax({
                     url: modify_url,
@@ -313,7 +313,7 @@
             }
 
             // 删除和确认删除
-            $(document).on('click', '#deleteBtn, #confirmDeleteBtn', function (event) {
+            $(document).on('click', '.delete-btn, #confirmDeleteBtn', function (event) {
                 if (event.target.id === 'deleteBtn') {
                     // 打开删除模态框
                     targetIdToDelete = $(this).data('id');
@@ -322,7 +322,7 @@
                     // 确认删除
                     if (targetIdToDelete !== null) {
                         $.ajax({
-                            type: 'GET',
+                            type: 'POST',
                             url: deleteUrl,
                             data: {
                                 'id': targetIdToDelete