From 418327044cddd363f956d58adc32ebf4a1bec872 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 9 Apr 2024 10:39:48 +0800
Subject: [PATCH 1/2] update

---
 src/views/organization/organization/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/organization/organization/index.vue b/src/views/organization/organization/index.vue
index 3a3540f..003a4d9 100644
--- a/src/views/organization/organization/index.vue
+++ b/src/views/organization/organization/index.vue
@@ -35,8 +35,13 @@
 
                 <el-table-column label="组织名称" prop="name" min-width="100" />
                 <el-table-column label="组织负责人" prop="master" min-width="100" />
-                <el-table-column label="状态" prop="status" min-width="100" show-overflow-tooltip />
-
+                <el-table-column label="状态" prop="status" min-width="100">
+                    <template #default="{ row }">
+                        <el-tag class="ml-2" :type="row.status ? '' : 'danger'">
+                            {{ row.status == 1 ? "正常" : "禁用" }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
                         <el-button v-perms="['dept.jobs/edit']" type="primary" link @click="handleEdit(row)">

From dcd279a26329ae39cc721cf677eb91d59451c6aa Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 9 Apr 2024 10:53:09 +0800
Subject: [PATCH 2/2] update

---
 src/views/project_attendance_record/edit.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/project_attendance_record/edit.vue b/src/views/project_attendance_record/edit.vue
index cb3db6b..7027734 100644
--- a/src/views/project_attendance_record/edit.vue
+++ b/src/views/project_attendance_record/edit.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="85vw" @confirm="handleSubmit"
+            @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="80px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -15,8 +16,8 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="考勤日期" prop="attendance_date">
-                            <el-date-picker class="flex-1 !flex" clearable v-model="formData.attendance_date" type="date"
-                                value-format="YYYY-MM-DD" placeholder="选择考勤日期">
+                            <el-date-picker class="flex-1 !flex" clearable v-model="formData.attendance_date"
+                                type="date" value-format="YYYY-MM-DD" placeholder="选择考勤日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -130,7 +131,7 @@
                 </el-dialog>
                 <div v-if="showDialog1">
                     <el-dialog v-model="showDialog1" title="选择项目人员" width="70%">
-                        <projectPersonnel @customEvent="customEvent1" :project_id="formData.project_id">
+                        <projectPersonnel @customEvent="customEvent1" :project_id="formData.project_id || 0">
                         </projectPersonnel>
                     </el-dialog>
                 </div>
@@ -157,7 +158,7 @@ let props = defineProps({
 // 表单数据
 const formData = reactive({
     id: '',
-    project_id: '',
+    project_id: 0,
     attendance_date: '',
     remark: '',
     annex: '',