mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.lihaink.cn/mkm/engineering_admin

Browse Source
This commit is contained in:
zmj 2024-04-09 11:18:56 +08:00
commit a45ed7521e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/organization/organization/index.vue
View File

@ -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)">

11
src/views/project_attendance_record/edit.vue
View File

@ -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: '',