This commit is contained in:
zmj 2024-03-01 18:10:04 +08:00
parent e8d830872a
commit c7f36796e1
15 changed files with 1458 additions and 179 deletions

View File

@ -23,4 +23,15 @@ export function apiSupervisionAcceptDelete(params: any) {
// 工程监理--验收登记详情
export function apiSupervisionAcceptDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_accept/detail', params })
}
}
// 工程监理--验收登记详情
export function apisupervision_accept_result(params: any) {
return request.get({ url: '/supervision_work.supervision_accept_result/lists', params })
}
export function apisupervision_accept_result_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_accept_result/delete', params })
}

View File

@ -23,4 +23,12 @@ export function apiSupervisionCheckItemDelete(params: any) {
// 工程监理--新增检查项详情
export function apiSupervisionCheckItemDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_check_item/detail', params })
}
export function apisupervision_check_item_detailLists(params: any) {
return request.get({ url: '/supervision_work.supervision_check_item_detail/lists', params })
}
export function apisupervision_check_item_detail_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_check_item_detail/delete', params })
}

View File

@ -23,4 +23,24 @@ export function apiSupervisionInspectionDelete(params: any) {
// 工程监理--巡视登记详情
export function apiSupervisionInspectionDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_inspection/detail', params })
}
}
// 工程监理--巡视登记详情
export function apisupervision_inspection_result(params: any) {
return request.get({ url: '/supervision_work.supervision_inspection_result/lists', params })
}
// 工程监理--巡视登记详情
export function apisupervision_problem(params: any) {
return request.get({ url: '/supervision_work.supervision_problem/lists', params })
}
export function apisupervision_problem_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_problem/delete', params })
}
export function apisupervision_inspection_result_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_inspection_result/delete', params })
}

View File

@ -23,4 +23,13 @@ export function apiSupervisionSideStationDelete(params: any) {
// 工程监理--旁站登记详情
export function apiSupervisionSideStationDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_side_station/detail', params })
}
}
// 工程监理--旁站登记详情
export function apisupervision_side_station_result(params: any) {
return request.get({ url: '/supervision_work.supervision_side_station_result/lists', params })
}
export function apisupervision_side_station_resultDelete(params: any) {
return request.post({ url: '/supervision_work.supervision_side_station_result/delete', params })
}

View File

@ -0,0 +1,85 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="节点名称" prop="node_name">
<el-input class="w-[280px]" v-model="queryParams.node_name" clearable placeholder="请输入节点名称" />
</el-form-item>
<el-form-item label="节点类型" prop="node_type">
<el-select class="flex-1" v-model="queryParams.node_type" clearable placeholder="请选择节点类型">
<el-option v-for="(item, index) in dictData.check_item_node_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
<div class="mt-4">
<el-table :data="pager.lists" @cell-click="handleCurrentChange" row-key="id"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" v-if="!node_type" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="节点名称" prop="node_name" show-overflow-tooltip />
<el-table-column label="节点类型" prop="node_type_text" show-overflow-tooltip />
<el-table-column label="节点编号" prop="node_code" show-overflow-tooltip />
<el-table-column label="检查依据" prop="inspection_basis" show-overflow-tooltip />
<el-table-column label="参考法规" prop="reference_law" show-overflow-tooltip />
</el-table>
</div>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
<div class="flex justify-end mt-4" v-if="!node_type">
<el-button type="primary" @click="confirm">确定</el-button>
</div>
</el-card>
</div>
</template>
<script lang="ts" setup>
import { usePaging } from "@/hooks/usePaging"
import { apiSupervisionCheckItemLists } from '@/api/supervision_check_item'
import { defineEmits } from "vue"
import { useDictData } from '@/hooks/useDictOptions'
const props = defineProps({
project_id: Number,
node_type: Number
})
//
//
const queryParams = reactive({
node_name: '',
node_type: '',
project_id: props.project_id || "",
node_type: props.node_type || ""
})
const { dictData } = useDictData('check_item_node_type')
const multipleSelection = ref([])
//
const emits = defineEmits(["customEvent"]);
//
const handleCurrentChange = (value: any) => {
if (!props.node_type) return
emits("customEvent", value);
};
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
const confirm = () => {
emits("customEvent", multipleSelection.value);
}
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionCheckItemLists,
params: queryParams,
});
getLists();
</script>

View File

@ -0,0 +1,77 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<!-- <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="node_type">
<el-select class="flex-1" v-model="queryParams.node_type" clearable placeholder="请选择节点类型">
<el-option v-for="(item, index) in dictData.check_item_node_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item> -->
<!-- <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item> -->
</el-form>
<div class="mt-4">
<el-table :data="pager.lists" @cell-click="handleCurrentChange" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="检查类别" prop="check_type" show-overflow-tooltip />
<el-table-column label="检查类容" prop="check_content" show-overflow-tooltip />
<el-table-column label="是否必填" prop="must_check_text" show-overflow-tooltip />
</el-table>
</div>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
<div class="flex justify-end mt-4">
<el-button type="primary" @click="confirm">确定</el-button>
</div>
</el-card>
</div>
</template>
<script lang="ts" setup>
import { usePaging } from "@/hooks/usePaging"
import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item'
import { defineEmits } from "vue"
import { useDictData } from '@/hooks/useDictOptions'
const props = defineProps({
node_id: Number | String
})
//
//
const queryParams = reactive({
node_id: props.node_id
})
const { dictData } = useDictData('check_item_node_type')
const multipleSelection = ref([])
//
const emits = defineEmits(["customEvent"]);
//
const handleCurrentChange = (value: any) => {
emits("customEvent", [value]);
};
const handleSelectionChange = (val) => {
multipleSelection.value = val
}
const confirm = () => {
console.log(1)
emits("customEvent", multipleSelection.value);
}
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apisupervision_check_item_detailLists,
params: queryParams,
});
getLists();
</script>

View File

@ -40,13 +40,15 @@ import { apiSupervisionParticipatingUnitsLists, } from '@/api/supervision_partic
import { defineEmits } from "vue"
const props = defineProps({
project_id: Number
project_id: Number,
unit_type: Number
})
//
const queryParams = reactive({
unit_name: '',
qualification_grade: "",
project_id: props.project_id || ''
project_id: props.project_id || '',
unit_type: props.unit_type || ''
});

View File

@ -1,4 +1,4 @@
<template>
<!-- <template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
@ -192,9 +192,475 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
getDetail
})
</script> -->
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编号">
<el-input v-model="formData.accept_code" disabled clearable placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收类型" prop="accept_type">
<el-select class="flex-1" v-model="formData.accept_type" clearable placeholder="请输入巡视类型">
<el-option v-for="(item, index) in dictData.accept_type" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单位工程" prop="check_item_id">
<el-input v-model="formData.check_item_name" clearable placeholder="点击选择单位工程" readonly
@click="showDialog1 = true, flag = false" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收内容" prop="accept_content">
<el-input v-model="formData.accept_content" clearable placeholder="请输入巡视部位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="验收位置" prop="accept_position">
<el-input v-model="formData.accept_position" clearable placeholder="请输入施工人数" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="验收时间" prop="accept_time" label-width="120px">
<el-date-picker class="flex-1 !flex" v-model="formData.accept_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择验收时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="施工单位" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="点击选择施工单位" readonly
@click="showDialog2 = true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="验收结果" prop="accept_result">
<el-select v-model="formData.accept_result" clearable placeholder="请选择" class="flex-1">
<el-option label="合格" value="0" />
<el-option label="不合格" value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查表单选择" prop="check_item_detail_ids">
<el-input v-model="formData.check_item_detail_name" clearable placeholder="点击选择"
@click="showDialog1 = true, flag = true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入创建人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-col>
</el-row>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位工程" width="70%" :title="flag ? '检查表单' : '选择施工单位'">
<supervision_check_item @customEvent="customEvents" :project_id="formData.project_id"
:node_type="flag ? '' : 2">
</supervision_check_item>
</el-dialog>
</div>
<div v-if="showDialog2">
<el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
<supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
:unit_type="6">
</supervision_participating_units>
</el-dialog>
</div>
</el-form>
<div style="margin-bottom: 30px;">巡视结果</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.accept_check_result">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="检查类别" prop="check_type">
<template #default="scope">
<el-input v-model="scope.row.check_type" />
</template>
</el-table-column>
<el-table-column label="问题" prop="check_problem">
<template #default="scope">
<el-input v-model="scope.row.check_problem" />
</template>
</el-table-column>
<el-table-column label="检查类容" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.check_content" />
</template>
</el-table-column>
<el-table-column label="是否必检" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.must_check" clearable placeholder="请选择">
<el-option label="否" :value="parseInt(0)" />
<el-option label="是" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
<el-table-column label="检查结果" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.check_result" clearable placeholder="请选择">
<el-option label="合格" :value="parseInt(0)" />
<el-option label="不合格" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
</el-table>
</div>
<div style="margin-bottom: 30px;">巡视问题</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.accept_check_problem">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd1()">+</el-button>
<el-button @click="handleDelete1(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="问题分类" prop="problem_cate">
<template #default="scope">
<el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
<el-option v-for="( item, index ) in dictData.problem_cate" :key="index"
:label="item.name" :value="item.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="问题说明" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.problem_description" />
</template>
</el-table-column>
<el-table-column label="问题名称" prop="must_check">
<template #default="{ row }">
<el-input v-model="row.problem_name" />
</template>
</el-table-column>
</el-table>
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionInspectionEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apisupervision_inspection_result_delete, apisupervision_problem_delete, apiSupervisionInspectionDetail, apisupervision_inspection_result, apisupervision_problem } from '@/api/supervision_inspection'
import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item'
import { apiSupervisionAcceptAdd, apiSupervisionAcceptEdit, apiSupervisionAcceptDetail, apisupervision_accept_result, apisupervision_accept_result_delete } from '@/api/supervision_accept'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
const showDialog2 = ref(false)
const showDialog3 = ref(false)
const flag = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--巡视登记' : '新增工程监理--巡视登记'
})
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 handleAdd = () => {
formData.accept_check_result.push({
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
})
}
const handleDelete = async (row: any) => {
if (formData.accept_check_result.length == 1) return
if (row.id) {
await apisupervision_accept_result_delete({ id: row.id })
const index = formData.accept_check_result.indexOf(row);
formData.accept_check_result.splice(index, 1);
} else {
const index = formData.accept_check_result.indexOf(row);
formData.accept_check_result.splice(index, 1);
}
}
const handleAdd1 = () => {
formData.accept_check_result.push({
"problem_cate": "",
"problem_description": "",
"problem_name": ""
})
}
const handleDelete1 = async (row: any) => {
if (formData.accept_check_problem.length == 1) return
if (row.id) {
await apisupervision_problem_delete({ id: row.id })
const index = formData.accept_check_problem.indexOf(row);
formData.accept_check_problem.splice(index, 1);
} else {
const index = formData.accept_check_problem.indexOf(row);
formData.accept_check_problem.splice(index, 1);
}
}
//
const formData = reactive({
project_id: '',
accept_code: '',
accept_type: '',
check_item_id: '',
accept_content: '',
accept_position: '',
accept_time: '',
company_id: '',
accept_result: '',
check_item_detail_ids: '',
remark: '',
annex: '',
create_user: '',
check_item_name: "",
company_name: '',
check_item_detail_name: '',
id: '',
project_name: '',
inspection_position: '',
inspection_content: '',
annex: [],
accept_check_result: [{
"check_type": "",
"check_content": "",
check_problem: "",
"must_check": 0,
"check_result": 0
},],
accept_check_problem: [{
"problem_cate": "",
"problem_description": "",
"problem_name": ""
}]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
formData.company_name = ''
formData.company_id = ''
formData.check_item_detail_ids = []
formData.check_item_detail_name = ''
formData.accept_check_result = [{
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
},]
}
const customEvents = (e) => {
if (flag.value) {
formData.check_item_detail_ids = e.map(item => item.id)
formData.check_item_detail_name = e.map(item => item.project_name)
apisupervision_check_item_detailLists({ node_ids: formData.check_item_detail_ids.join(',') }).then(res => {
let lists = res.lists.map(item => ({
check_type: item.check_type,
check_content: item.check_content,
check_problem: item.check_problem,
must_check: item.must_check,
check_result: item.check_result
}))
formData.accept_check_result = lists
})
} else {
formData.check_item_id = e.id
formData.check_item_name = e.project_name
}
showDialog1.value = false
}
const customEvent1 = (e) => {
formData.company_id = e.id
formData.company_name = e.project_name
showDialog2.value = false
}
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请选择项目',
trigger: ['blur']
}],
accept_code: [{
required: true,
message: '请输入验收编号',
trigger: ['blur']
}],
accept_type: [{
required: true,
message: '请输入验收类型',
trigger: ['blur']
}],
check_item_id: [{
required: true,
message: '请输入单位工程',
trigger: ['blur']
}],
accept_content: [{
required: true,
message: '请输入验收内容',
trigger: ['blur']
}],
accept_position: [{
required: true,
message: '请输入验收位置',
trigger: ['blur']
}],
accept_time: [{
required: true,
message: '请输入验收时间',
trigger: ['blur']
}],
company_id: [{
required: true,
message: '请输入施工单位',
trigger: ['blur']
}],
accept_result: [{
required: true,
message: '请输入验收结果 0-合格 1-不合格',
trigger: ['blur']
}],
remark: [{
required: true,
message: '请输入备注',
trigger: ['blur']
}],
create_user: [{
required: true,
message: '请输入创建人',
trigger: ['blur']
}]
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
formData.accept_result = String(formData.accept_result)
formData.accept_type = String(formData.accept_type)
formData.company_id == 0 ? formData.company_id = '' : ""
apisupervision_accept_result({ accept_id: formData.id }).then(res => {
formData.accept_check_result = res.lists
})
apisupervision_problem({ data_id: formData.id }).then(res => {
formData.accept_check_problem = res.lists
})
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionInspectionDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionAcceptEdit(data)
: await apiSupervisionAcceptAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -31,19 +31,17 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<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="accept_code" show-overflow-tooltip />
<el-table-column label="验收类型" prop="accept_type" show-overflow-tooltip />
<el-table-column label="单位工程" prop="check_item_id" show-overflow-tooltip />
<el-table-column label="验收类型" prop="accept_type_text" show-overflow-tooltip />
<el-table-column label="单位工程" prop="check_item_name" show-overflow-tooltip />
<el-table-column label="验收内容" prop="accept_content" show-overflow-tooltip />
<el-table-column label="验收位置" prop="accept_position" show-overflow-tooltip />
<el-table-column label="验收时间" prop="accept_time" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_id" show-overflow-tooltip />
<el-table-column label="验收结果 0-合格 1-不合格" prop="accept_result" show-overflow-tooltip />
<el-table-column label="检查项选择" prop="check_item_detail_ids" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="验收结果" prop="accept_result_text" show-overflow-tooltip />
<el-table-column label="检查项选择" prop="check_item_detail_name" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" 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">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_accept/edit']" type="primary" link
@ -58,7 +56,7 @@
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
@ -69,7 +67,7 @@
<script lang="ts" setup name="supervisionAcceptLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete } from '@/api/supervision_accept'
import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail } from '@/api/supervision_accept'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -95,7 +93,7 @@ const handleSelectionChange = (val: any[]) => {
}
//
const { dictData } = useDictData('')
const { dictData } = useDictData('accept_type,problem_cate')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
@ -112,10 +110,11 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionAcceptDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
editRef.value?.setFormData(res)
}
//

View File

@ -31,19 +31,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="父节点">
<el-input v-model="formData.pid" clearable placeholder="如果创建的节点为初始节点,可不选择" />
<el-input v-model="formData.p_node_name" clearable placeholder="如果创建的节点为初始节点,可不选择" readonly
@click="showDialog1 = true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="检查依据" prop="inspection_basis">
<el-form-item label="检查依据">
<editor v-model="formData.inspection_basis" :height="200" width="80vw" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="参考法规" prop="reference_law">
<el-form-item label="参考法规">
<editor v-model="formData.reference_law" :height="200" width="80vw" />
</el-form-item>
</el-col>
@ -51,7 +52,7 @@
<div style="margin-bottom: 30px;">检查项</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.check_item_detail">
<el-table-column label="序号" v-if="mode == 'add'" width="150px">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
@ -59,19 +60,18 @@
</el-table-column>
<el-table-column label="检查类别" prop="check_type">
<template #default="scope">
<el-input v-model="scope.row.check_type" :disabled="mode != 'add'" />
<el-input v-model="scope.row.check_type" />
</template>
</el-table-column>
<el-table-column label="检查类容" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.check_content" :disabled="mode != 'add'" />
<el-input v-model="row.check_content" />
</template>
</el-table-column>
<el-table-column label="是否必检" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.must_check" clearable placeholder="请选择"
:disabled="mode != 'add'">
<el-select class="flex-1" v-model="row.must_check" clearable placeholder="请选择">
<el-option label="否" :value="parseInt(0)" />
<el-option label="是" :value="parseInt(1)" />
</el-select>
@ -83,6 +83,9 @@
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
<el-dialog v-model="showDialog1" title="选择父节点" width="70%">
<supervision_check_item @customEvent="customEvent1"></supervision_check_item>
</el-dialog>
</el-form>
</popup>
</div>
@ -91,7 +94,7 @@
<script lang="ts" setup name="supervisionCheckItemEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionCheckItemAdd, apiSupervisionCheckItemEdit, apiSupervisionCheckItemDetail } from '@/api/supervision_check_item'
import { apiSupervisionCheckItemAdd, apiSupervisionCheckItemEdit, apiSupervisionCheckItemDetail, apisupervision_check_item_detailLists, apisupervision_check_item_detail_delete } from '@/api/supervision_check_item'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
@ -105,6 +108,7 @@ const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
//
@ -121,6 +125,7 @@ const formData = reactive({
node_type: '',
node_code: '',
pid: '',
p_node_name: "",
inspection_basis: '',
reference_law: '',
check_item_detail: [{
@ -135,6 +140,13 @@ const customEvent = (e) => {
showDialog.value = false
}
const customEvent1 = (e: any) => {
formData.pid = e.id
formData.p_node_name = e.node_name
showDialog1.value = false
}
const handleAdd = () => {
formData.check_item_detail.push({
"check_type": "",
@ -144,8 +156,11 @@ const handleAdd = () => {
}
const handleDelete = (row: any) => {
const handleDelete = async (row: any) => {
if (formData.check_item_detail.length == 1) return
if (row.id) {
await apisupervision_check_item_detail_delete({ id: row.id })
}
const index = formData.check_item_detail.indexOf(row);
formData.check_item_detail.splice(index, 1);
}
@ -192,6 +207,9 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
apisupervision_check_item_detailLists({ node_id: formData.id }).then(res => {
formData.check_item_detail = res.lists
})
}

View File

@ -2,14 +2,14 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form 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="请选择项目" />
</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>
<el-form-item label="节点类型" prop="node_type">
<el-input class="w-[280px]" v-model="queryParams.node_type" clearable placeholder="请输入节点类型" />
<el-select class="flex-1" v-model="queryParams.node_type" clearable placeholder="请选择节点类型">
<el-option v-for="(item, index) in dictData.check_item_node_type" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
@ -29,15 +29,24 @@
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id">
<el-table-column type="selection" width="55" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="节点名称" prop="node_name" show-overflow-tooltip />
<el-table-column label="节点类型" prop="node_type" show-overflow-tooltip />
<el-table-column label="节点类型" prop="node_type_text" show-overflow-tooltip />
<el-table-column label="节点编号" prop="node_code" show-overflow-tooltip />
<el-table-column label="父节点id" prop="pid" show-overflow-tooltip />
<el-table-column label="检查依据" prop="inspection_basis" show-overflow-tooltip />
<el-table-column label="参考法规" prop="reference_law" show-overflow-tooltip />
<el-table-column label="检查依据" prop="inspection_basis" show-overflow-tooltip>
<template #default="{ row }">
<el-link type="primary"
@click="htmlContent = row.inspection_basis, dialogTableVisible = true, tit = '检查依据'">查看</el-link>
</template>
</el-table-column>
<el-table-column label="参考法规" prop="reference_law" show-overflow-tooltip>
<template #default="{ row }">
<el-link type="primary"
@click="htmlContent = row.reference_law, dialogTableVisible = true, tit = '参考法规'">查看</el-link>
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_check_item/edit']" type="primary" link
@ -57,13 +66,16 @@
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
<el-dialog v-model="dialogTableVisible" :title="tit" width="800">
<div v-html="htmlContent"></div>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="supervisionCheckItemLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionCheckItemLists, apiSupervisionCheckItemDelete } from '@/api/supervision_check_item'
import { apiSupervisionCheckItemLists, apiSupervisionCheckItemDelete, apiSupervisionCheckItemDetail } from '@/api/supervision_check_item'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -71,6 +83,9 @@ import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
const dialogTableVisible = ref(false)
const htmlContent = ref('')
const tit = ref('')
//
@ -106,10 +121,11 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionCheckItemDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
editRef.value?.setFormData(res)
}
//

View File

@ -1,59 +1,207 @@
<template>
<div class="edit-popup">
<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-item label="项目id" prop="project_id">
<el-input v-model="formData.project_id" clearable placeholder="请选择项目" />
</el-form-item>
<el-form-item label="编号" prop="inspection_code">
<el-input v-model="formData.inspection_code" clearable placeholder="请输入编号" />
</el-form-item>
<el-form-item label="巡视类型" prop="inspection_type">
<el-input v-model="formData.inspection_type" clearable placeholder="请输入巡视类型" />
</el-form-item>
<el-form-item label="单位工程" prop="check_item_id">
<el-input v-model="formData.check_item_id" clearable placeholder="请输入单位工程" />
</el-form-item>
<el-form-item label="巡视部位" prop="inspection_position">
<el-input v-model="formData.inspection_position" clearable placeholder="请输入巡视部位" />
</el-form-item>
<el-form-item label="施工人数" prop="workers">
<el-input v-model="formData.workers" clearable placeholder="请输入施工人数" />
</el-form-item>
<el-form-item label="管理人数" prop="managers">
<el-input v-model="formData.managers" clearable placeholder="请输入管理人数" />
</el-form-item>
<el-form-item label="巡视开始时间" prop="start_time">
<el-input v-model="formData.start_time" clearable placeholder="请输入巡视开始时间" />
</el-form-item>
<el-form-item label="巡视结束时间" prop="end_time">
<el-input v-model="formData.end_time" clearable placeholder="请输入巡视结束时间" />
</el-form-item>
<el-form-item label="巡视人员" prop="inspection_user">
<el-input v-model="formData.inspection_user" clearable placeholder="请输入巡视人员" />
</el-form-item>
<el-form-item label="施工单位" prop="company_id">
<el-input v-model="formData.company_id" clearable placeholder="请输入施工单位" />
</el-form-item>
<el-form-item label="巡视内容" prop="inspection_content">
<el-input v-model="formData.inspection_content" clearable placeholder="请输入巡视内容" />
</el-form-item>
<el-form-item label="设置重点关注事项 0-否 1-是" prop="is_importent">
<el-input v-model="formData.is_importent" clearable placeholder="请输入设置重点关注事项 0-否 1-是" />
</el-form-item>
<el-form-item label="关注人" prop="follow_user">
<el-input v-model="formData.follow_user" clearable placeholder="请输入关注人" />
</el-form-item>
<el-form-item label="检查表单选择" prop="check_item_detail_ids">
<el-input v-model="formData.check_item_detail_ids" clearable placeholder="请输入检查表单选择" />
</el-form-item>
<el-form-item label="附件" prop="annex">
<el-input v-model="formData.annex" clearable placeholder="请输入附件" />
</el-form-item>
<el-form-item label="创建人" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编号">
<el-input v-model="formData.inspection_code" disabled clearable placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡视类型" prop="inspection_type">
<el-select class="flex-1" v-model="formData.inspection_type" clearable placeholder="请输入巡视类型">
<el-option v-for="(item, index) in dictData.inspection_type" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单位工程" prop="check_item_id">
<el-input v-model="formData.check_item_name" clearable placeholder="点击选择单位工程" readonly
@click="showDialog1 = true, flag = false" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡视部位" prop="inspection_position">
<el-input v-model="formData.inspection_position" clearable placeholder="请输入巡视部位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="施工人数" prop="workers">
<el-input v-model="formData.workers" clearable placeholder="请输入施工人数" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="管理人数" prop="managers">
<el-input v-model="formData.managers" clearable placeholder="请输入管理人数" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡视开始时间" prop="start_time" label-width="120px">
<el-date-picker class="flex-1 !flex" v-model="formData.start_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择巡视开始时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡视结束时间" prop="end_time">
<el-date-picker class="flex-1 !flex" v-model="formData.end_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择巡视结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="巡视人员" prop="inspection_user">
<el-input v-model="formData.inspection_user" clearable placeholder="请输入巡视人员" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="施工单位" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="点击选择施工单位" readonly
@click="showDialog2 = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡视内容" prop="inspection_content">
<el-input v-model="formData.inspection_content" clearable placeholder="请输入巡视内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="设置重点关注" prop="is_importent">
<el-select v-model="formData.is_importent" clearable placeholder="请选择" class="flex-1">
<el-option label="否" value="0" />
<el-option label="是" value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关注人" prop="follow_user">
<el-input v-model="formData.follow_user" clearable placeholder="请输入关注人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查表单选择" prop="check_item_detail_ids">
<el-input v-model="formData.check_item_detail_name" clearable placeholder="点击选择"
@click="showDialog1 = true, flag = true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建人" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-col>
</el-row>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位工程" width="70%" :title="flag ? '检查表单' : '选择施工单位'">
<supervision_check_item @customEvent="customEvents" :project_id="formData.project_id"
:node_type="flag ? '' : 2">
</supervision_check_item>
</el-dialog>
</div>
<div v-if="showDialog2">
<el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
<supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
:unit_type="6">
</supervision_participating_units>
</el-dialog>
</div>
</el-form>
<div style="margin-bottom: 30px;">巡视结果</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.inspection_result">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="检查类别" prop="check_type">
<template #default="scope">
<el-input v-model="scope.row.check_type" />
</template>
</el-table-column>
<el-table-column label="检查类容" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.check_content" />
</template>
</el-table-column>
<el-table-column label="是否必检" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.must_check" clearable placeholder="请选择">
<el-option label="否" :value="parseInt(0)" />
<el-option label="是" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
<el-table-column label="检查结果" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.check_result" clearable placeholder="请选择">
<el-option label="合格" :value="parseInt(0)" />
<el-option label="不合格" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
</el-table>
</div>
<div style="margin-bottom: 30px;">巡视问题</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.inspection_problem">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd1()">+</el-button>
<el-button @click="handleDelete1(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="问题分类" prop="problem_cate">
<template #default="scope">
<el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
<el-option v-for="( item, index ) in dictData.problem_cate" :key="index"
:label="item.name" :value="item.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="问题说明" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.problem_description" />
</template>
</el-table-column>
<el-table-column label="问题名称" prop="must_check">
<template #default="{ row }">
<el-input v-model="row.problem_name" />
</template>
</el-table-column>
</el-table>
</div>
</popup>
</div>
</template>
@ -61,8 +209,9 @@
<script lang="ts" setup name="supervisionInspectionEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionInspectionAdd, apiSupervisionInspectionEdit, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
import { timeFormat } from '@/utils/util'
import { apiSupervisionInspectionAdd, apiSupervisionInspectionEdit, apisupervision_inspection_result_delete, apisupervision_problem_delete, apiSupervisionInspectionDetail, apisupervision_inspection_result, apisupervision_problem } from '@/api/supervision_inspection'
import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item'
import type { PropType } from 'vue'
defineProps({
dictData: {
@ -74,20 +223,80 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
const showDialog2 = ref(false)
const showDialog3 = ref(false)
const flag = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--巡视登记' : '新增工程监理--巡视登记'
})
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 handleAdd = () => {
formData.inspection_result.push({
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
})
}
const handleDelete = async (row: any) => {
if (formData.inspection_result.length == 1) return
if (row.id) {
await apisupervision_inspection_result_delete({ id: row.id })
const index = formData.inspection_result.indexOf(row);
formData.inspection_result.splice(index, 1);
} else {
const index = formData.inspection_result.indexOf(row);
formData.inspection_result.splice(index, 1);
}
}
const handleAdd1 = () => {
formData.inspection_result.push({
"problem_cate": "",
"problem_description": "",
"problem_name": ""
})
}
const handleDelete1 = async (row: any) => {
if (formData.inspection_problem.length == 1) return
if (row.id) {
await apisupervision_problem_delete({ id: row.id })
const index = formData.inspection_problem.indexOf(row);
formData.inspection_problem.splice(index, 1);
} else {
const index = formData.inspection_problem.indexOf(row);
formData.inspection_problem.splice(index, 1);
}
}
//
const formData = reactive({
id: '',
project_id: '',
project_name: '',
inspection_code: '',
is_important: "",
inspection_type: '',
check_item_id: '',
check_item_name: "",
inspection_position: '',
workers: '',
managers: '',
@ -95,13 +304,67 @@ const formData = reactive({
end_time: '',
inspection_user: '',
company_id: '',
company_name: '',
inspection_content: '',
is_importent: '',
follow_user: '',
check_item_detail_ids: '',
annex: '',
check_item_detail_ids: [],
check_item_detail_name: '',
annex: [],
create_user: '',
inspection_result: [{
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
},],
inspection_problem: [{
"problem_cate": "",
"problem_description": "",
"problem_name": ""
}]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
formData.company_name = ''
formData.company_id = ''
formData.check_item_detail_ids = []
formData.check_item_detail_name = ''
formData.inspection_result = [{
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
},]
}
const customEvents = (e) => {
if (flag.value) {
formData.check_item_detail_ids = e.map(item => item.id)
formData.check_item_detail_name = e.map(item => item.project_name)
apisupervision_check_item_detailLists({ node_ids: formData.check_item_detail_ids.join(',') }).then(res => {
let lists = res.lists.map(item => ({
check_type: item.check_type,
check_content: item.check_content,
must_check: item.must_check,
check_result: item.check_result
}))
formData.inspection_result = lists
})
} else {
formData.check_item_id = e.id
formData.check_item_name = e.project_name
}
showDialog1.value = false
}
const customEvent1 = (e) => {
formData.company_id = e.id
formData.company_name = e.project_name
showDialog2.value = false
}
//
@ -192,8 +455,15 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
formData.inspection_type = String(formData.inspection_type)
formData.is_importent = String(formData.inspection_type)
formData.company_id == 0 ? formData.company_id = '' : ""
apisupervision_inspection_result({ inspection_id: formData.id }).then(res => {
formData.inspection_result = res.lists
})
apisupervision_problem({ data_id: formData.id }).then(res => {
formData.inspection_problem = res.lists
})
}
const getDetail = async (row: Record<string, any>) => {

View File

@ -2,9 +2,9 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="项目id" prop="project_id">
<!-- <el-form-item label="项目id" prop="project_id">
<el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请选择项目" />
</el-form-item>
</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>
@ -31,23 +31,21 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<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="inspection_code" show-overflow-tooltip />
<el-table-column label="巡视类型" prop="inspection_type" show-overflow-tooltip />
<el-table-column label="单位工程" prop="check_item_id" show-overflow-tooltip />
<el-table-column label="巡视类型" prop="inspection_type_text" show-overflow-tooltip />
<el-table-column label="单位工程" prop="check_item_name" show-overflow-tooltip />
<el-table-column label="巡视部位" prop="inspection_position" show-overflow-tooltip />
<el-table-column label="施工人数" prop="workers" show-overflow-tooltip />
<el-table-column label="管理人数" prop="managers" show-overflow-tooltip />
<el-table-column label="巡视开始时间" prop="start_time" show-overflow-tooltip />
<el-table-column label="巡视结束时间" prop="end_time" show-overflow-tooltip />
<el-table-column label="巡视人员" prop="inspection_user" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_id" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="巡视内容" prop="inspection_content" show-overflow-tooltip />
<el-table-column label="设置重点关注事项 0-否 1-是" prop="is_importent" show-overflow-tooltip />
<el-table-column label="设置重点关注事项" prop="is_important_text" show-overflow-tooltip />
<el-table-column label="关注人" prop="follow_user" show-overflow-tooltip />
<el-table-column label="检查表单选择" prop="check_item_detail_ids" 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">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_inspection/edit']" type="primary" link
@ -62,7 +60,7 @@
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
@ -73,7 +71,7 @@
<script lang="ts" setup name="supervisionInspectionLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete } from '@/api/supervision_inspection'
import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -99,7 +97,7 @@ const handleSelectionChange = (val: any[]) => {
}
//
const { dictData } = useDictData('')
const { dictData } = useDictData('inspection_type,problem_cate')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
@ -116,10 +114,11 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionInspectionDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
editRef.value?.setFormData(res)
}
//

View File

@ -1,65 +1,218 @@
<template>
<div class="edit-popup">
<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-item label="项目id" prop="project_id">
<el-input v-model="formData.project_id" clearable placeholder="请选择项目" />
</el-form-item>
<el-form-item label="旁站编号" prop="side_station_code">
<el-input v-model="formData.side_station_code" clearable placeholder="请输入旁站编号" />
</el-form-item>
<el-form-item label="旁站类型" prop="side_station_type">
<el-input v-model="formData.side_station_type" clearable placeholder="请输入旁站类型" />
</el-form-item>
<el-form-item label="单位工程" prop="check_item_id">
<el-input v-model="formData.check_item_id" clearable placeholder="请输入单位工程" />
</el-form-item>
<el-form-item label="部位" prop="position">
<el-input v-model="formData.position" clearable placeholder="请输入部位" />
</el-form-item>
<el-form-item label="施工单位" prop="company_id">
<el-input v-model="formData.company_id" clearable placeholder="请输入施工单位" />
</el-form-item>
<el-form-item label="旁站开始时间" prop="start_time">
<el-input v-model="formData.start_time" clearable placeholder="请输入旁站开始时间" />
</el-form-item>
<el-form-item label="旁站结束时间" prop="end_time">
<el-input v-model="formData.end_time" clearable placeholder="请输入旁站结束时间" />
</el-form-item>
<el-form-item label="施工人数" prop="workers">
<el-input v-model="formData.workers" clearable placeholder="请输入施工人数" />
</el-form-item>
<el-form-item label="管理人数" prop="managers">
<el-input v-model="formData.managers" clearable placeholder="请输入管理人数" />
</el-form-item>
<el-form-item label="现场施工情况" prop="situation">
<el-input v-model="formData.situation" clearable placeholder="请输入现场施工情况" />
</el-form-item>
<el-form-item label="旁站结果 0-完成 1-交班" prop="side_station_result">
<el-input v-model="formData.side_station_result" clearable placeholder="请输入旁站结果 0-完成 1-交班" />
</el-form-item>
<el-form-item label="旁站人员" prop="side_station_user">
<el-input v-model="formData.side_station_user" clearable placeholder="请输入旁站人员" />
</el-form-item>
<el-form-item label="检查项选择" prop="check_item_detail_ids">
<el-input v-model="formData.check_item_detail_ids" clearable placeholder="请输入检查项选择" />
</el-form-item>
<el-form-item label="附件" prop="annex">
<el-input v-model="formData.annex" clearable placeholder="请输入附件" />
</el-form-item>
<el-form-item label="创建人" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编号">
<el-input v-model="formData.side_station_code" disabled clearable placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="旁站类型" prop="side_station_type">
<el-select class="flex-1" v-model="formData.side_station_type" clearable placeholder="请输入巡视类型">
<el-option v-for="(item, index) in dictData.side_station_type" :key="index"
:label="item.name" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单位工程" prop="check_item_name">
<el-input v-model="formData.check_item_name" clearable placeholder="点击选择单位工程" readonly
@click="showDialog1 = true, flag = false" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部位" prop="position">
<el-input v-model="formData.position" clearable placeholder="请输入巡视部位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="施工人数" prop="workers">
<el-input v-model="formData.workers" clearable placeholder="请输入施工人数" type="number" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="管理人数" prop="managers">
<el-input v-model="formData.managers" clearable placeholder="请输入管理人数" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="旁站开始时间" prop="start_time" label-width="120px">
<el-date-picker class="flex-1 !flex" v-model="formData.start_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择巡视开始时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="旁站结束时间" prop="end_time">
<el-date-picker class="flex-1 !flex" v-model="formData.end_time" clearable type="datetime"
value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择巡视结束时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="8">
<el-form-item label="巡视人员" prop="inspection_user">
<el-input v-model="formData.inspection_user" clearable placeholder="请输入巡视人员" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="施工单位" prop="company_name">
<el-input v-model="formData.company_name" clearable placeholder="点击选择施工单位" readonly
@click="showDialog2 = true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现场施工情况" prop="situation">
<el-input v-model="formData.situation" clearable placeholder="请输入巡视内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="旁站" prop="side_station_result">
<el-select v-model="formData.side_station_result" clearable placeholder="请选择" class="flex-1">
<el-option label="完成" value="0" />
<el-option label="交班" value="1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="旁站人员" prop="side_station_user">
<el-input v-model="formData.side_station_user" clearable placeholder="请输入关注人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查项选择" prop="check_item_detail_ids">
<el-input v-model="formData.check_item_detail_name" clearable placeholder="点击选择"
@click="showDialog1 = true, flag = true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="8">
<el-form-item label="创建人" prop="create_user">
<el-input v-model="formData.create_user" clearable placeholder="请输入创建人" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-col>
</el-row>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
<div v-if="showDialog1">
<el-dialog v-model="showDialog1" title="选择单位工程" width="70%" :title="flag ? '检查表单' : '选择施工单位'">
<supervision_check_item @customEvent="customEvents" :project_id="formData.project_id"
:node_type="flag ? '' : 2">
</supervision_check_item>
</el-dialog>
</div>
<div v-if="showDialog2">
<el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
<supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id"
:unit_type="6">
</supervision_participating_units>
</el-dialog>
</div>
</el-form>
<div style="margin-bottom: 30px;">巡视结果</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.side_result">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="检查类别" prop="check_type">
<template #default="scope">
<el-input v-model="scope.row.check_type" />
</template>
</el-table-column>
<el-table-column label="检查类容" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.check_content" />
</template>
</el-table-column>
<el-table-column label="是否必检" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.must_check" clearable placeholder="请选择">
<el-option label="否" :value="parseInt(0)" />
<el-option label="是" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
<el-table-column label="检查结果" prop="must_check">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.check_result" clearable placeholder="请选择">
<el-option label="合格" :value="parseInt(0)" />
<el-option label="不合格" :value="parseInt(1)" />
</el-select>
</template>
</el-table-column>
</el-table>
</div>
<div style="margin-bottom: 30px;">巡视问题</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.side_problem">
<el-table-column label="序号" width="150px">
<template #default="{ row }">
<el-button @click="handleAdd1()">+</el-button>
<el-button @click="handleDelete1(row)">-</el-button>
</template>
</el-table-column>
<el-table-column label="问题分类" prop="problem_cate">
<template #default="scope">
<el-select class="flex-1" v-model="scope.row.problem_cate" clearable placeholder="请输入问题分类">
<el-option v-for="( item, index ) in dictData.problem_cate" :key="index"
:label="item.name" :value="item.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="问题说明" prop="check_content">
<template #default="{ row }">
<el-input v-model="row.problem_description" />
</template>
</el-table-column>
<el-table-column label="问题名称" prop="must_check">
<template #default="{ row }">
<el-input v-model="row.problem_name" />
</template>
</el-table-column>
</el-table>
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionSideStationEdit">
<script lang="ts" setup name="supervisionInspectionEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionSideStationAdd, apiSupervisionSideStationEdit, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
import { timeFormat } from '@/utils/util'
import { apiSupervisionInspectionDetail, apisupervision_inspection_result, apisupervision_problem, apisupervision_problem_delete } from '@/api/supervision_inspection'
import { apisupervision_check_item_detailLists } from '@/api/supervision_check_item'
import { apiSupervisionSideStationAdd, apiSupervisionSideStationEdit, apiSupervisionSideStationDetail, apisupervision_side_station_result, apisupervision_side_station_resultDelete } from '@/api/supervision_side_station'
import type { PropType } from 'vue'
defineProps({
dictData: {
@ -71,12 +224,72 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const showDialog = ref(false)
const showDialog1 = ref(false)
const showDialog2 = ref(false)
const showDialog3 = ref(false)
const flag = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--旁站登记' : '新增工程监理--旁站登记'
return mode.value == 'edit' ? '编辑工程监理--巡视登记' : '新增工程监理--巡视登记'
})
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 handleAdd = () => {
formData.side_result.push({
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
})
}
const handleDelete = async (row: any) => {
if (formData.side_result.length == 1) return
if (row.id) {
await apisupervision_side_station_resultDelete({ id: row.id })
const index = formData.side_result.indexOf(row);
formData.side_result.splice(index, 1);
} else {
const index = formData.side_result.indexOf(row);
formData.side_result.splice(index, 1);
}
}
const handleAdd1 = () => {
formData.side_problem.push({
"problem_cate": "",
"problem_description": "",
"problem_name": ""
})
}
const handleDelete1 = async (row: any) => {
if (formData.side_problem.length == 1) return
if (row.id) {
await apisupervision_problem_delete({ id: row.id })
const index = formData.side_problem.indexOf(row);
formData.side_problem.splice(index, 1);
}
else {
const index = formData.side_problem.indexOf(row);
formData.side_problem.splice(index, 1);
}
}
//
const formData = reactive({
@ -97,7 +310,86 @@ const formData = reactive({
check_item_detail_ids: '',
annex: '',
create_user: '',
project_name: '',
inspection_code: '',
is_important: "",
inspection_type: '',
check_item_name: "",
inspection_position: '',
inspection_user: '',
company_name: '',
inspection_content: '',
is_importent: '',
follow_user: '',
check_item_detail_name: '',
side_result: [
{
"check_type": "",
"check_content": "",
"must_check": 1,
"check_result": 1
}
],
side_problem: [
{
"problem_cate": "",
"problem_description": "",
"problem_name": ""
}
]
// inspection_result: [{
// "check_type": "",
// "check_content": "",
// "must_check": 0,
// "check_result": 0
// },],
// inspection_problem: [{
// "problem_cate": "",
// "problem_description": "",
// "problem_name": ""
// }]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
formData.company_name = ''
formData.company_id = ''
formData.check_item_detail_ids = []
formData.check_item_detail_name = ''
formData.side_result = [{
"check_type": "",
"check_content": "",
"must_check": 0,
"check_result": 0
},]
}
const customEvents = (e) => {
if (flag.value) {
formData.check_item_detail_ids = e.map(item => item.id)
formData.check_item_detail_name = e.map(item => item.project_name)
apisupervision_check_item_detailLists({ node_ids: formData.check_item_detail_ids.join(',') }).then(res => {
let lists = res.lists.map(item => ({
check_type: item.check_type,
check_content: item.check_content,
must_check: item.must_check,
check_result: item.check_result
}))
formData.side_result = lists
})
} else {
formData.check_item_id = e.id
formData.check_item_name = e.project_name
}
showDialog1.value = false
}
const customEvent1 = (e) => {
formData.company_id = e.id
formData.company_name = e.project_name
showDialog2.value = false
}
//
@ -183,12 +475,20 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
apisupervision_side_station_result({ side_station_id: formData.id }).then(res => {
formData.side_result = res.lists
})
apisupervision_problem({ data_id: formData.id }).then(res => {
formData.side_problem = res.lists
})
// if (formData)
formData.company_id == 0 ? formData.company_id = '' : ""
formData.side_station_type = String(formData.side_station_type)
formData.side_station_result = String(formData.side_station_result)
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionSideStationDetail({
const data = await apiSupervisionInspectionDetail({
id: row.id
})
setFormData(data)

View File

@ -31,22 +31,20 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<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="side_station_code" show-overflow-tooltip />
<el-table-column label="旁站类型" prop="side_station_type" show-overflow-tooltip />
<el-table-column label="旁站类型" prop="side_station_type_text" show-overflow-tooltip />
<el-table-column label="单位工程" prop="check_item_id" show-overflow-tooltip />
<el-table-column label="部位" prop="position" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_id" show-overflow-tooltip />
<el-table-column label="施工单位" prop="company_name" show-overflow-tooltip />
<el-table-column label="旁站开始时间" prop="start_time" show-overflow-tooltip />
<el-table-column label="旁站结束时间" prop="end_time" show-overflow-tooltip />
<el-table-column label="施工人数" prop="workers" show-overflow-tooltip />
<el-table-column label="管理人数" prop="managers" show-overflow-tooltip />
<el-table-column label="现场施工情况" prop="situation" show-overflow-tooltip />
<el-table-column label="旁站结果 0-完成 1-交班" prop="side_station_result" show-overflow-tooltip />
<el-table-column label="旁站结果" prop="side_station_result_text" show-overflow-tooltip />
<el-table-column label="旁站人员" prop="side_station_user" show-overflow-tooltip />
<el-table-column label="检查项选择" prop="check_item_detail_ids" 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="检查项选择" prop="check_item_detail_name" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_side_station/edit']" type="primary" link
@ -61,7 +59,7 @@
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
@ -72,7 +70,7 @@
<script lang="ts" setup name="supervisionSideStationLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete } from '@/api/supervision_side_station'
import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@ -98,7 +96,7 @@ const handleSelectionChange = (val: any[]) => {
}
//
const { dictData } = useDictData('')
const { dictData } = useDictData('side_station_type,problem_cate')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
@ -115,10 +113,11 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionSideStationDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
editRef.value?.setFormData(res)
}
//