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

add

Browse Source
This commit is contained in:
zmj 2024-03-03 20:43:18 +08:00
parent 1b98d911dd
commit a905195ce9
4 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/views/supervision_diary/edit.vue
View File

@ -1,19 +1,15 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="项目id" prop="project_id"> <el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_id" clearable placeholder="请输入项目id" /> <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item> </el-form-item>
<el-form-item label="日期" prop="date"> <el-form-item label="日期" prop="date">
<el-input v-model="formData.date" clearable placeholder="请输入日期" /> <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="星期" prop="week"> <el-form-item label="星期" prop="week">
<el-input v-model="formData.week" clearable placeholder="请输入星期" /> <el-input v-model="formData.week" clearable placeholder="请输入星期" />
@ -31,21 +27,26 @@
<el-input v-model="formData.director" clearable placeholder="请输入监理总监" /> <el-input v-model="formData.director" clearable placeholder="请输入监理总监" />
</el-form-item> </el-form-item>
<el-form-item label="工程动态" prop="engineering_dynamics"> <el-form-item label="工程动态" prop="engineering_dynamics">
<el-input v-model="formData.engineering_dynamics" clearable placeholder="请输入工程动态" /> <el-input v-model="formData.engineering_dynamics" clearable placeholder="请输入工程动态" type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="监理工作" prop="supervision_work"> <el-form-item label="监理工作" prop="supervision_work">
<el-input v-model="formData.supervision_work" clearable placeholder="请输入监理工作" /> <el-input v-model="formData.supervision_work" clearable placeholder="请输入监理工作" type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="安全文明施工情况" prop="construction_situation"> <el-form-item label="安全文明施工情况" prop="construction_situation">
<el-input v-model="formData.construction_situation" clearable placeholder="请输入安全文明施工情况" /> <el-input v-model="formData.construction_situation" clearable placeholder="请输入安全文明施工情况"
type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="其他事项" prop="other_matters"> <el-form-item label="其他事项" prop="other_matters">
<el-input v-model="formData.other_matters" clearable placeholder="请输入其他事项" /> <el-input v-model="formData.other_matters" clearable placeholder="请输入其他事项" type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="annex"> <el-form-item label="附件" prop="annex">
<el-input v-model="formData.annex" clearable placeholder="请输入附件" /> <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
</popup> </popup>
</div> </div>
</template> </template>
@ -66,6 +67,7 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add') const mode = ref('add')
const showDialog = ref(false)
// 弹窗标题 // 弹窗标题
@ -77,6 +79,7 @@ const popupTitle = computed(() => {
const formData = reactive({ const formData = reactive({
id: '', id: '',
project_id: '', project_id: '',
project_name: "",
date: '', date: '',
week: '', week: '',
air_temperature: '', air_temperature: '',
@ -87,9 +90,22 @@ const formData = reactive({
supervision_work: '', supervision_work: '',
construction_situation: '', construction_situation: '',
other_matters: '', other_matters: '',
annex: '', annex: [],
}) })
const handleAvatarSuccess_four = (response: any) => {
Array.isArray(formData.annex) ? '' : formData.annex = []
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
// 删除上传的文件
const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
// 表单验证 // 表单验证
const formRules = reactive<any>({ const formRules = reactive<any>({
@ -159,8 +175,8 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key] formData[key] = data[key]
} }
} }
} }
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
@ -174,9 +190,9 @@ const getDetail = async (row: Record<string, any>) => {
// 提交按钮 // 提交按钮
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate()
const data = { ...formData, } const data = { ...formData, }
mode.value == 'edit' mode.value == 'edit'
? await apiSupervisionDiaryEdit(data) ? await apiSupervisionDiaryEdit(data)
: await apiSupervisionDiaryAdd(data) : await apiSupervisionDiaryAdd(data)
popupRef.value?.close() popupRef.value?.close()
emit('success') emit('success')

44
src/views/supervision_diary/index.vue
View File

@ -1,16 +1,11 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="项目id" prop="project_id">
<el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="日期" prop="date"> <el-form-item label="日期" prop="date">
<el-input class="w-[280px]" v-model="queryParams.date" clearable placeholder="请输入日期" /> <el-date-picker class="flex-1 !flex" v-model="queryParams.date" clearable value-format="YYYY-MM-DD"
placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="监理人员" prop="user"> <el-form-item label="监理人员" prop="user">
<el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入监理人员" /> <el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入监理人员" />
@ -31,17 +26,14 @@
</template> </template>
新增 新增
</el-button> </el-button>
<el-button <el-button v-perms="['supervision_work.supervision_diary/delete']" :disabled="!selectData.length"
v-perms="['supervision_work.supervision_diary/delete']" @click="handleDelete(selectData)">
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除 删除
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="项目id" prop="project_id" show-overflow-tooltip /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="日期" prop="date" show-overflow-tooltip /> <el-table-column label="日期" prop="date" show-overflow-tooltip />
<el-table-column label="星期" prop="week" show-overflow-tooltip /> <el-table-column label="星期" prop="week" show-overflow-tooltip />
<el-table-column label="气温" prop="air_temperature" show-overflow-tooltip /> <el-table-column label="气温" prop="air_temperature" show-overflow-tooltip />
@ -52,23 +44,14 @@
<el-table-column label="监理工作" prop="supervision_work" show-overflow-tooltip /> <el-table-column label="监理工作" prop="supervision_work" show-overflow-tooltip />
<el-table-column label="安全文明施工情况" prop="construction_situation" show-overflow-tooltip /> <el-table-column label="安全文明施工情况" prop="construction_situation" show-overflow-tooltip />
<el-table-column label="其他事项" prop="other_matters" show-overflow-tooltip /> <el-table-column label="其他事项" prop="other_matters" show-overflow-tooltip />
<el-table-column label="附件" prop="annex" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button v-perms="['supervision_work.supervision_diary/edit']" type="primary" link
v-perms="['supervision_work.supervision_diary/edit']" @click="handleEdit(row)">
type="primary"
link
@click="handleEdit(row)"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button v-perms="['supervision_work.supervision_diary/delete']" type="danger" link
v-perms="['supervision_work.supervision_diary/delete']" @click="handleDelete(row.id)">
type="danger"
link
@click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
</template> </template>
@ -86,7 +69,7 @@
<script lang="ts" setup name="supervisionDiaryLists"> <script lang="ts" setup name="supervisionDiaryLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete } from '@/api/supervision_diary' import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import EditPopup from './edit.vue' import EditPopup from './edit.vue'
@ -130,10 +113,11 @@ const handleAdd = async () => {
// 编辑 // 编辑
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
let res = await apiSupervisionDiaryDetail({ id: data.id })
showEdit.value = true showEdit.value = true
await nextTick() await nextTick()
editRef.value?.open('edit') editRef.value?.open('edit')
editRef.value?.setFormData(data) editRef.value?.setFormData(res)
} }
// 删除 // 删除

34
src/views/supervision_meeting_minutes/edit.vue
View File

@ -2,8 +2,9 @@
<div class="edit-popup"> <div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose"> <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="项目id" prop="project_id"> <el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_id" clearable placeholder="请输入项目id" /> <el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item> </el-form-item>
<el-form-item label="会议主题" prop="theme"> <el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" clearable placeholder="请输入会议主题" /> <el-input v-model="formData.theme" clearable placeholder="请输入会议主题" />
@ -12,7 +13,9 @@
<el-input v-model="formData.type" clearable placeholder="请输入会议类型" /> <el-input v-model="formData.type" clearable placeholder="请输入会议类型" />
</el-form-item> </el-form-item>
<el-form-item label="会议时间" prop="time"> <el-form-item label="会议时间" prop="time">
<el-input v-model="formData.time" clearable placeholder="请输入会议时间" /> <el-date-picker class="flex-1 !flex" v-model="formData.time" clearable value-format="YYYY-MM-DD"
placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="主持人" prop="emcee"> <el-form-item label="主持人" prop="emcee">
<el-input v-model="formData.emcee" clearable placeholder="请输入主持人" /> <el-input v-model="formData.emcee" clearable placeholder="请输入主持人" />
@ -30,12 +33,13 @@
<el-input v-model="formData.content" clearable placeholder="请输入会议内容" /> <el-input v-model="formData.content" clearable placeholder="请输入会议内容" />
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="annex"> <el-form-item label="附件" prop="annex">
<el-input v-model="formData.annex" clearable placeholder="请输入附件" /> <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
</el-form-item> @delFile="delFileFn" />
<el-form-item label="" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
</popup> </popup>
</div> </div>
</template> </template>
@ -56,6 +60,7 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>() const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add') const mode = ref('add')
const showDialog = ref(false)
// 弹窗标题 // 弹窗标题
@ -67,6 +72,7 @@ const popupTitle = computed(() => {
const formData = reactive({ const formData = reactive({
id: '', id: '',
project_id: '', project_id: '',
project_name: "",
theme: '', theme: '',
type: '', type: '',
time: '', time: '',
@ -78,6 +84,20 @@ const formData = reactive({
annex: '', annex: '',
create_user: '', create_user: '',
}) })
const handleAvatarSuccess_four = (response: any) => {
Array.isArray(formData.annex) ? '' : formData.annex = []
// @ts-ignore
response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
// 删除上传的文件
const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
// 表单验证 // 表单验证

36
src/views/supervision_meeting_minutes/index.vue
View File

@ -1,14 +1,7 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="项目id" prop="project_id">
<el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="会议主题" prop="theme"> <el-form-item label="会议主题" prop="theme">
<el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入会议主题" /> <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入会议主题" />
</el-form-item> </el-form-item>
@ -34,17 +27,14 @@
</template> </template>
新增 新增
</el-button> </el-button>
<el-button <el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" :disabled="!selectData.length"
v-perms="['supervision_work.supervision_meeting_minutes/delete']" @click="handleDelete(selectData)">
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除 删除
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="项目id" prop="project_id" show-overflow-tooltip /> <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="会议主题" prop="theme" show-overflow-tooltip /> <el-table-column label="会议主题" prop="theme" show-overflow-tooltip />
<el-table-column label="会议类型" prop="type" show-overflow-tooltip /> <el-table-column label="会议类型" prop="type" show-overflow-tooltip />
<el-table-column label="会议时间" prop="time" show-overflow-tooltip /> <el-table-column label="会议时间" prop="time" show-overflow-tooltip />
@ -53,24 +43,14 @@
<el-table-column label="会议地点" prop="location" show-overflow-tooltip /> <el-table-column label="会议地点" prop="location" show-overflow-tooltip />
<el-table-column label="与会人员" prop="attendees" show-overflow-tooltip /> <el-table-column label="与会人员" prop="attendees" show-overflow-tooltip />
<el-table-column label="会议内容" prop="content" show-overflow-tooltip /> <el-table-column label="会议内容" prop="content" show-overflow-tooltip />
<el-table-column label="附件" prop="annex" show-overflow-tooltip />
<el-table-column label="" prop="create_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary" link
v-perms="['supervision_work.supervision_meeting_minutes/edit']" @click="handleEdit(row)">
type="primary"
link
@click="handleEdit(row)"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" type="danger" link
v-perms="['supervision_work.supervision_meeting_minutes/delete']" @click="handleDelete(row.id)">
type="danger"
link
@click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
</template> </template>