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

update

Browse Source
This commit is contained in:
weiz 2024-03-18 17:46:31 +08:00
parent 3417b6f1d6
commit 5a44510905
16 changed files with 133 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/api/supervision_material_entry.ts
View File

@ -1,36 +1,63 @@
import request from '@/utils/request'
import request from "@/utils/request";
// 工程监理--材料进场列表
export function apiSupervisionMaterialEntryLists(params: any) {
return request.get({ url: '/supervision_work.supervision_material_entry/lists', params })
return request.get({
url: "/supervision_work.supervision_material_entry/lists",
params,
});
}
// 添加工程监理--材料进场
export function apiSupervisionMaterialEntryAdd(params: any) {
return request.post({ url: '/supervision_work.supervision_material_entry/add', params })
return request.post({
url: "/supervision_work.supervision_material_entry/add",
params,
});
}
// 编辑工程监理--材料进场
export function apiSupervisionMaterialEntryEdit(params: any) {
return request.post({ url: '/supervision_work.supervision_material_entry/edit', params })
return request.post({
url: "/supervision_work.supervision_material_entry/edit",
params,
});
}
// 删除工程监理--材料进场
export function apiSupervisionMaterialEntryDelete(params: any) {
return request.post({ url: '/supervision_work.supervision_material_entry/delete', params })
return request.post({
url: "/supervision_work.supervision_material_entry/delete",
params,
});
}
// 工程监理--材料进场详情
export function apiSupervisionMaterialEntryDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_material_entry/detail', params })
return request.get({
url: "/supervision_work.supervision_material_entry/detail",
params,
});
}
// 工程监理--材料进场详情
export function apisupervision_material_entry_detail(params: any) {
return request.get({ url: '/supervision_work.supervision_material_entry_detail/lists', params })
return request.get({
url: "/supervision_work.supervision_material_entry_detail/lists",
params,
});
}
export function apisupervision_material_entry_detail_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_material_entry_detail/delete', params })
return request.post({
url: "/supervision_work.supervision_material_entry_detail/delete",
params,
});
}
export function apiSupervisionMaterialEntrySearch(params: any) {
return request.post({
url: "/supervision_work.supervision_material_entry/datas",
params,
});
}

5
src/views/supervision_accept/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="验收编号" prop="accept_code">
<el-input class="w-[280px]" v-model="queryParams.accept_code" clearable placeholder="请输入验收编号" />
</el-form-item>
@ -103,7 +106,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

5
src/views/supervision_check_item/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="节点名称" prop="node_name">
<el-input class="w-[280px]" v-model="queryParams.node_name" clearable placeholder="请输入节点名称" />
</el-form-item>
@ -79,7 +82,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionCheckItemLists, apiSupervisionCheckItemDelete, apiSupervisionCheckItemDetail } from '@/api/supervision_check_item'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

5
src/views/supervision_device_entry/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
</el-form-item>
@ -64,7 +67,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete, apiSupervisionDeviceEntryDetail } from '@/api/supervision_device_entry'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

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

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="监理人员" prop="user">
<el-input class="w-[280px]" v-model="queryParams.user" clearable placeholder="请输入监理人员" />
</el-form-item>
@ -65,7 +68,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

5
src/views/supervision_entity_parallel_testing/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="检验主题" prop="theme">
<el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入检验主题" />
</el-form-item>
@ -73,7 +76,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionEntityParallelTestingLists, apiSupervisionEntityParallelTestingDelete } from '@/api/supervision_entity_parallel_testing'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

7
src/views/supervision_inspection/index.vue
View File

@ -2,7 +2,10 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="编号" prop="inspection_code">
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="巡视编号" prop="inspection_code">
<el-input class="w-[280px]" v-model="queryParams.inspection_code" clearable placeholder="请输入编号" />
</el-form-item>
<el-form-item label="巡视类型" prop="inspection_type">
@ -73,7 +76,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

19
src/views/supervision_material_entry/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="进场主题" prop="theme">
<el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入进场主题" />
</el-form-item>
@ -31,24 +34,18 @@
<el-table-column label="项目" prop="project_name" show-overflow-tooltip />
<el-table-column label="采购单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
<!-- <el-table-column label="材料名称" prop="name" show-overflow-tooltip />
<el-table-column label="型号" prop="model" show-overflow-tooltip />
<el-table-column label="数量" prop="entry_number" show-overflow-tooltip />
<el-table-column label="合同约定品牌" prop="contract_brand_text" 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="code" show-overflow-tooltip />
<el-table-column label="进场时间" prop="enter_time" show-overflow-tooltip />
<el-table-column label="进场结果" prop="enter_result_text" show-overflow-tooltip />
<el-table-column label="是否平行检验" prop="parallel_test_text" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_material_entry/edit']" type="primary" link
@click="handleEdit(row)">
<el-button v-perms="['supervision_work.supervision_material_entry/edit']" type="primary"
link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_work.supervision_material_entry/delete']" type="danger" link
@click="handleDelete(row.id)">
<el-button v-perms="['supervision_work.supervision_material_entry/delete']" type="danger"
link @click="handleDelete(row.id)">
删除
</el-button>
</template>
@ -67,7 +64,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete, apiSupervisionMaterialEntryDetail } from '@/api/supervision_material_entry'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

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

@ -3,6 +3,12 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" label-width="120px">
<el-row>
<el-col :span="6">
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id"
:api="apiSupervisionProjectSearch" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="材料/设备名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入材料/设备名称" />
@ -94,7 +100,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete } from '@/api/supervision_material_equipment_info'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -105,6 +111,7 @@ const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
project_id: '',
name: '',
brand: '',
model: '',

21
src/views/supervision_material_parallel_testing/index.vue
View File

@ -2,8 +2,15 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="来源单据">
<select-remote :formData="queryParams" model="material_entry_id"
:api="apiSupervisionMaterialEntrySearch" />
</el-form-item>
<el-form-item label="检验编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入检验编号" />
</el-form-item>
<el-form-item label="送检人" prop="check_user">
<el-input class="w-[280px]" v-model="queryParams.inspector" clearable placeholder="请输入操作人" />
@ -30,13 +37,13 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="来源单据" prop="theme" show-overflow-tooltip />
<el-table-column label="编号" prop="code" show-overflow-tooltip />
<el-table-column label="来源单据" prop="material_entry_code" show-overflow-tooltip />
<el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
<el-table-column label="检验编号" prop="code" show-overflow-tooltip />
<el-table-column label="送检人" prop="inspector" show-overflow-tooltip />
<el-table-column label="送检日期" prop="inspection_date" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/edit']"
type="primary" link @click="handleEdit(row)">
@ -69,6 +76,8 @@
<script lang="ts" setup name="supervisionMaterialParallelTestingLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
import { apiSupervisionMaterialParallelTestingLists, apiSupervisionMaterialParallelTestingDelete, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -80,6 +89,8 @@ const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
project_id: '',
material_entry_id: '',
code: "",
inspector: "",
})

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

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="会议主题" prop="theme">
<el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入会议主题" />
</el-form-item>
@ -45,12 +48,12 @@
<el-table-column label="会议内容" prop="content" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary" link
@click="handleEdit(row)">
<el-button v-perms="['supervision_work.supervision_meeting_minutes/edit']" type="primary"
link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" type="danger" link
@click="handleDelete(row.id)">
<el-button v-perms="['supervision_work.supervision_meeting_minutes/delete']" type="danger"
link @click="handleDelete(row.id)">
删除
</el-button>
</template>
@ -69,7 +72,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionMeetingMinutesLists, apiSupervisionMeetingMinutesDelete } from '@/api/supervision_meeting_minutes'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -128,4 +131,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>

5
src/views/supervision_notice/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="项目通知编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入项目通知编号" />
</el-form-item>
@ -66,7 +69,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionNoticeLists, apiSupervisionNoticeDelete } from '@/api/supervision_notice'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import replyForm from './replyForm.vue'

5
src/views/supervision_side_station/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="旁站编号" prop="side_station_code">
<el-input class="w-[280px]" v-model="queryParams.side_station_code" clearable
placeholder="请输入旁站编号" />
@ -72,7 +75,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

8
src/views/supervision_test_blocks_specimens/index.vue
View File

@ -3,6 +3,12 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
<el-row>
<el-col :span="6">
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id"
:api="apiSupervisionProjectSearch" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="试验类型" prop="test_type">
<el-input v-model="queryParams.test_type" clearable placeholder="请输入试验类型" />
@ -92,7 +98,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'

23
src/views/supervision_witness_sampling/index.vue
View File

@ -4,14 +4,19 @@
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-row>
<el-col :span="6">
<el-form-item label="来源单据">
<!-- <el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable
placeholder="请输入来源单据" /> -->
<select-remote :formData="queryParams" model="material_entry_id"></select-remote>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id"
:api="apiSupervisionProjectSearch" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="编号" prop="code">
<el-form-item label="来源单据">
<select-remote :formData="queryParams" model="material_entry_id"
:api="apiSupervisionMaterialEntrySearch" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="取样编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
</el-form-item>
</el-col>
@ -50,10 +55,9 @@
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="来源单据" prop="project_name" show-overflow-tooltip />
<el-table-column label="来源编码" prop="material_entry_code" show-overflow-tooltip />
<el-table-column label="进场主题" prop="theme" show-overflow-tooltip />
<el-table-column label="来源编码" prop="code" show-overflow-tooltip />
<el-table-column label="编号" prop="material_entry_code" show-overflow-tooltip />
<el-table-column label="取样编号" prop="code" show-overflow-tooltip />
<el-table-column label="取样日期" prop="sampling_date" show-overflow-tooltip />
<el-table-column label="见证人" prop="witness" show-overflow-tooltip />
<el-table-column label="取样人" prop="sampler" show-overflow-tooltip />
@ -93,7 +97,8 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import { useRouter } from 'vue-router'

6
src/views/supervision_work_contact/index.vue
View File

@ -2,6 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="所属项目" prop="project_id">
<selectRemote :formData="queryParams" model="project_id" :api="apiSupervisionProjectSearch" />
</el-form-item>
<el-form-item label="联系编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入联系编号" />
</el-form-item>
@ -66,7 +69,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete, apiSupervisionWorkContactDetail } from '@/api/supervision_work_contact'
import { timeFormat } from '@/utils/util'
import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -126,4 +129,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>