This commit is contained in:
zmj 2024-03-04 18:01:24 +08:00
parent a905195ce9
commit 81309efb5b
46 changed files with 7218 additions and 3275 deletions

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--危大方案提交列表列表
export function apiSupervisionDangerousEngineeringCaseLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_case/lists', params })
}
// 添加工程监理--危大方案提交列表
export function apiSupervisionDangerousEngineeringCaseAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_case/add', params })
}
// 编辑工程监理--危大方案提交列表
export function apiSupervisionDangerousEngineeringCaseEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_case/edit', params })
}
// 删除工程监理--危大方案提交列表
export function apiSupervisionDangerousEngineeringCaseDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_case/delete', params })
}
// 工程监理--危大方案提交列表详情
export function apiSupervisionDangerousEngineeringCaseDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_case/detail', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--危大工程施工列表列表
export function apiSupervisionDangerousEngineeringConstructionLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_construction/lists', params })
}
// 添加工程监理--危大工程施工列表
export function apiSupervisionDangerousEngineeringConstructionAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_construction/add', params })
}
// 编辑工程监理--危大工程施工列表
export function apiSupervisionDangerousEngineeringConstructionEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_construction/edit', params })
}
// 删除工程监理--危大工程施工列表
export function apiSupervisionDangerousEngineeringConstructionDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_construction/delete', params })
}
// 工程监理--危大工程施工列表详情
export function apiSupervisionDangerousEngineeringConstructionDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_construction/detail', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--危大工程消除列表列表
export function apiSupervisionDangerousEngineeringEliminateLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_eliminate/lists', params })
}
// 添加工程监理--危大工程消除列表
export function apiSupervisionDangerousEngineeringEliminateAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_eliminate/add', params })
}
// 编辑工程监理--危大工程消除列表
export function apiSupervisionDangerousEngineeringEliminateEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_eliminate/edit', params })
}
// 删除工程监理--危大工程消除列表
export function apiSupervisionDangerousEngineeringEliminateDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_eliminate/delete', params })
}
// 工程监理--危大工程消除列表详情
export function apiSupervisionDangerousEngineeringEliminateDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_eliminate/detail', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--危大工程监控列表
export function apiSupervisionDangerousEngineeringMonitoringLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_monitoring/lists', params })
}
// 添加工程监理--危大工程监控
export function apiSupervisionDangerousEngineeringMonitoringAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_monitoring/add', params })
}
// 编辑工程监理--危大工程监控
export function apiSupervisionDangerousEngineeringMonitoringEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_monitoring/edit', params })
}
// 删除工程监理--危大工程监控
export function apiSupervisionDangerousEngineeringMonitoringDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_dangerous_engineering_monitoring/delete', params })
}
// 工程监理--危大工程监控详情
export function apiSupervisionDangerousEngineeringMonitoringDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_dangerous_engineering_monitoring/detail', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--超规模危险性较大工程安全监控列表
export function apiSupervisionExcessRiskSecurityMonitoringLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_excess_risk_security_monitoring/lists', params })
}
// 添加工程监理--超规模危险性较大工程安全监控
export function apiSupervisionExcessRiskSecurityMonitoringAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_excess_risk_security_monitoring/add', params })
}
// 编辑工程监理--超规模危险性较大工程安全监控
export function apiSupervisionExcessRiskSecurityMonitoringEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_excess_risk_security_monitoring/edit', params })
}
// 删除工程监理--超规模危险性较大工程安全监控
export function apiSupervisionExcessRiskSecurityMonitoringDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_excess_risk_security_monitoring/delete', params })
}
// 工程监理--超规模危险性较大工程安全监控详情
export function apiSupervisionExcessRiskSecurityMonitoringDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_excess_risk_security_monitoring/detail', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--危险性较大的工程安全监控列表
export function apiSupervisionHighRiskSecurityMonitoringLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_high_risk_security_monitoring/lists', params })
}
// 添加工程监理--危险性较大的工程安全监控
export function apiSupervisionHighRiskSecurityMonitoringAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_high_risk_security_monitoring/add', params })
}
// 编辑工程监理--危险性较大的工程安全监控
export function apiSupervisionHighRiskSecurityMonitoringEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_high_risk_security_monitoring/edit', params })
}
// 删除工程监理--危险性较大的工程安全监控
export function apiSupervisionHighRiskSecurityMonitoringDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_high_risk_security_monitoring/delete', params })
}
// 工程监理--危险性较大的工程安全监控详情
export function apiSupervisionHighRiskSecurityMonitoringDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_high_risk_security_monitoring/detail', params })
}

View File

@ -0,0 +1,35 @@
import request from '@/utils/request'
// 工程监理--大型机械设备及仪器台账列表
export function apiSupervisionLargeMechanicalEquipmentLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_large_mechanical_equipment/lists', params })
}
// 添加工程监理--大型机械设备及仪器台账
export function apiSupervisionLargeMechanicalEquipmentAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_large_mechanical_equipment/add', params })
}
// 编辑工程监理--大型机械设备及仪器台账
export function apiSupervisionLargeMechanicalEquipmentEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_large_mechanical_equipment/edit', params })
}
// 删除工程监理--大型机械设备及仪器台账
export function apiSupervisionLargeMechanicalEquipmentDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_large_mechanical_equipment/delete', params })
}
// 工程监理--大型机械设备及仪器台账详情
export function apiSupervisionLargeMechanicalEquipmentDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_large_mechanical_equipment/detail', params })
}
// 工程监理--大型机械设备及仪器台账详情
export function apisupervision_large_mechanical_equipment_maintenance_record(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_large_mechanical_equipment_maintenance_record/lists', params })
}
// 工程监理--大型机械设备及仪器台账详情
export function apisupervision_large_mechanical_equipment_maintenance_record_delete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_large_mechanical_equipment_maintenance_record/delete', params })
}

View File

@ -23,4 +23,12 @@ export function apiSupervisionMaterialParallelTestingDelete(params: any) {
// 工程监理--材料平行检验详情
export function apiSupervisionMaterialParallelTestingDetail(params: any) {
return request.get({ url: '/supervision_work.supervision_material_parallel_testing/detail', params })
}
}
export function apisupervision_material_parallel_testing_detail(params: any) {
return request.get({ url: '/supervision_work.supervision_material_parallel_testing_detail/lists', params })
}
export function apisupervision_material_parallel_testing_detail_check(params: any) {
return request.post({ url: '/supervision_work.supervision_material_parallel_testing_detail/check', params })
}

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 工程监理--现场安全警示标志列表
export function apiSupervisionSafetyWarningSignLists(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_safety_warning_sign/lists', params })
}
// 添加工程监理--现场安全警示标志
export function apiSupervisionSafetyWarningSignAdd(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_safety_warning_sign/add', params })
}
// 编辑工程监理--现场安全警示标志
export function apiSupervisionSafetyWarningSignEdit(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_safety_warning_sign/edit', params })
}
// 删除工程监理--现场安全警示标志
export function apiSupervisionSafetyWarningSignDelete(params: any) {
return request.post({ url: '/supervision_dangerous.supervision_safety_warning_sign/delete', params })
}
// 工程监理--现场安全警示标志详情
export function apiSupervisionSafetyWarningSignDetail(params: any) {
return request.get({ url: '/supervision_dangerous.supervision_safety_warning_sign/detail', params })
}

View File

@ -7,8 +7,8 @@
</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-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>
@ -37,7 +37,7 @@
</el-card>
</div>
</template>
<script lang="ts" setup>
import { usePaging } from "@/hooks/usePaging"
import { apiSupervisionCheckItemLists } from '@/api/supervision_check_item'

View File

@ -20,25 +20,30 @@
</template>
新增
</el-button>
<el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
</el-button>
</el-button> -->
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id" lazy :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table :data="pager.lists" @selection-change="handleSelectionChange" row-key="id" lazy
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" />
<el-table-column label="分类名称" prop="name" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link @click="handleEdit(row)">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link @click="handleDelete(row.id)">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button> -->
</el-button>
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/detail']" link @click="handledetail(row)">
详情
</el-button> -->
@ -134,4 +139,3 @@ const handledetail = async (data: any) => {
getLists()
</script>

View File

@ -1,18 +1,17 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="材料采购申请详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<el-descriptions :column="2" border>
<el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_name }}</el-descriptions-item>
formData.project_name }}</el-descriptions-item>
<el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_code }}</el-descriptions-item>
formData.project_code }}</el-descriptions-item>
<el-descriptions-item label="采购申请单号" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_purchase_request_code }}</el-descriptions-item>
formData.material_purchase_request_code }}</el-descriptions-item>
<el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{
formData.remark
}}</el-descriptions-item>
formData.remark
}}</el-descriptions-item>
<el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
@ -122,7 +121,7 @@ const handleCurrentChange1 = (val: number) => {
//
const budgetDetailLists = (id) => {
materialrequestDetailLists({ 'page_no': pager1.page_no, 'page_size': pager1.page_size, id: id }).then((res) => {
materialrequestDetailLists({ 'page_no': pager1.page_no, 'page_size': pager1.page_size, material_purchase_request_id: id }).then((res) => {
tableData.value = res.lists
total.value = res.count
})
@ -182,16 +181,13 @@ const getbidDocumentExaminationFlows = async () => {
}
defineExpose({
open,
setFormData,
getDetail
})
</script>
<style lang="scss" scoped>
.tit {
font-size: 1.2em;

View File

@ -1,14 +1,17 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
<div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
<div
style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
<el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
<el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
</el-select>
<el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
<el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织"
@change="deptrmt">
<el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
</el-select>
</div>
@ -69,8 +72,8 @@
<div>
<div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
target="_blank">{{ item.name }}</a>
<a style="margin-left: 10px; color: #4a5dff; align-self: flex-start"
:href="item.uri" target="_blank">{{ item.name }}</a>
<span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
</div>
</div>
@ -79,15 +82,14 @@
</el-col>
</el-row>
<div style="margin: 20px 0;">申购明细</div>
<el-col :span="24">
<div style="margin: 20px 0;" v-if="mode == 'add'">申购明细</div>
<el-col :span="24" v-if="mode == 'add'">
<div style=" display: flex;justify-content: flex-end;margin-bottom: 30px;">
<el-button @click="showDialog = true" type="primary" plain>选择材料</el-button>
</div>
</el-col>
<el-row>
<el-row v-if="mode == 'add'">
<el-table :data="tablist1">
<el-table-column label="序号">
<template #default="{ row }">
@ -97,43 +99,52 @@
</template>
</el-table-column>
<el-table-column label="材料名称" prop="material_name">
<template #default="{ row, $index }">
<el-input v-model="row.material_name" disabled @click="subjectmu(row, $index)" />
</template>
</el-table-column>
<el-table-column label="材料编码" prop="material_code">
<template #default="{ row }">
<el-input v-model="row.material_code" disabled />
</template></el-table-column>
<el-table-column label="规格型号" prop="material_specs">
<template #default="{ row }">
<el-input v-model="row.material_specs" disabled /> </template>
</el-table-column>
<el-table-column label="品牌" prop="material_brand">
<template #default="{ row }">
<el-input v-model="row.material_brand" disabled /> </template>
</el-table-column>
<el-table-column label="参数说明" prop="material_parameter_description">
<template #default="{ row }">
<el-input v-model="row.material_parameter_description" disabled /> </template>
</el-table-column>
<el-table-column label="单位" prop="material_unit">
<template #default="{ row }">
<el-input v-model="row.material_unit" disabled /> </template>
</el-table-column>
<el-table-column label="可申购数量" prop="residual_num">
<template #default="{ row }">
<el-input v-model="row.residual_num" disabled /> </template>
</el-table-column>
<el-table-column label="申请采购数量" prop="num">
<template #default="{ row }">
<el-input v-model="row.num" /> </template>
</el-table-column>
<el-table-column label="备注" prop="remark">
<template #default="{ row }">
<el-input v-model="row.remark" /> </template>
</el-table-column>
@ -163,6 +174,8 @@ import Popup from '@/components/popup/index.vue'
import { toChinesNum } from "@/utils/util";
import projectDialog from '@/components/project/index.vue'
import { materialrequestAdd, materialrequestEdit, materialrequestDetail } from '@/api/material_purchase_request'
import { materialrequestDetailLists } from '@/api/material_purchase_request_detail'
import { getAllProjectTypes } from '@/api/projecttype'
import { timeFormat } from '@/utils/util'
import { isEmail, isIdCard, isPhone } from '@/utils/validate'
@ -290,6 +303,8 @@ const formData = reactive({
org_id: '',
dept_id: '',
project_id: '',
project_name: '',
project_code: '',
apply_date: '',
arrival_date: '',
remark: '',
@ -328,9 +343,13 @@ const setFormData = async (data: Record<any, any>) => {
}
project_name.value = data.contract_name;
project_code.value = data.contract_code
project_name.value = data.project_name;
project_code.value = data.project_code
materialrequestDetailLists({ project_material_budget_detail_id: formData.id }).then(res => {
res.lists.forEach((item, index) => {
tablist1[index] = res.lists[index]
})
})
}
@ -355,7 +374,6 @@ const handleSubmit = async () => {
}))
}
console.log(formRef.value?.validate(), '22222222')
await formRef.value?.validate()

View File

@ -36,11 +36,14 @@
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
<!-- <el-table-column label="申请人" prop="invoicing_date" show-overflow-tooltip /> -->
<el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }">
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link @click="handleEdit(row)">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="primary" link
@click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link @click="handleDelete(row.id)">
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/edit']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button> -->
<el-button v-perms="['InvoicingRequests.InvoicingRequests/detail']" link
@ -113,14 +116,14 @@ const handleAdd = async () => {
editRef.value?.open('add')
}
// //
// const handleEdit = async (data: any) => {
// let res = await materialrequestDetail({ id: data.id })
// showEdit.value = true
// await nextTick()
// editRef.value?.open('edit')
// editRef.value?.setFormData(res)
// }
//
const handleEdit = async (data: any) => {
let res = await materialrequestDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(res)
}
// //
// const handleDelete = async (id: number | any[]) => {
@ -147,4 +150,3 @@ if (route.query?.listId) {
getLists()
</script>

View File

@ -1,43 +1,43 @@
<template>
<div class="detail-popup">
<popup ref="popupRef" title="项目材料采购申请明细调整" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" title="项目材料采购申请明细调整" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-descriptions :column="2" border>
<el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_name }}</el-descriptions-item>
formData.project_name }}</el-descriptions-item>
<el-descriptions-item label="项目编码" label-align="left" align="left" label-class-name="my-label"> {{
formData.project_code }}</el-descriptions-item>
formData.project_code }}</el-descriptions-item>
<el-descriptions-item label="申请日期" label-align="left" align="left" label-class-name="my-label"> {{
formData.apply_date }}</el-descriptions-item>
formData.apply_date }}</el-descriptions-item>
<el-descriptions-item label="希望到货日期" label-align="left" align="left" label-class-name="my-label"> {{
formData.arrival_date }}</el-descriptions-item>
formData.arrival_date }}</el-descriptions-item>
<el-descriptions-item label="材料名称" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_name }}</el-descriptions-item>
formData.material_name }}</el-descriptions-item>
<el-descriptions-item label="材料编码" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_code }}</el-descriptions-item>
formData.material_code }}</el-descriptions-item>
<el-descriptions-item label="材料大类" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_first_level }}</el-descriptions-item>
formData.material_first_level }}</el-descriptions-item>
<el-descriptions-item label="材料中类" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_second_level
}}</el-descriptions-item>
formData.material_second_level
}}</el-descriptions-item>
<el-descriptions-item label="材料小类" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_three_level }}</el-descriptions-item>
formData.material_three_level }}</el-descriptions-item>
<el-descriptions-item label="单位" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_unit }}</el-descriptions-item>
formData.material_unit }}</el-descriptions-item>
<!--
<el-descriptions-item label="单价" label-align="left" align="left" label-class-name="my-label"> {{
formData.price }}</el-descriptions-item> -->
<el-descriptions-item label="数量" label-align="left" align="left" label-class-name="my-label"> {{
formData.num
}}</el-descriptions-item>
formData.num
}}</el-descriptions-item>
<el-descriptions-item label="品牌" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_brand
}}</el-descriptions-item>
formData.material_brand
}}</el-descriptions-item>
<el-descriptions-item label="参数说明" label-align="left" align="left" label-class-name="my-label"> {{
formData.material_parameter_description
}}</el-descriptions-item>
formData.material_parameter_description
}}</el-descriptions-item>
<!-- <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{
@ -144,6 +144,7 @@ defineExpose({
getDetail
})
</script>
<style lang="scss" scoped>
.tit {
font-size: 1.2em;

View File

@ -1,7 +1,8 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
@ -93,11 +94,11 @@
<el-input v-model="formData.num" clearable placeholder="请输入数量" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</el-form>

View File

@ -35,9 +35,10 @@
@click="handleEdit(row)">
编辑
</el-button>
<!-- <el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link @click="handleDelete(row.id)">
<el-button v-perms="['InvoicingRequests.InvoicingRequests/delete']" type="danger" link
@click="handleDelete(row.id)">
删除
</el-button> -->
</el-button>
<el-button v-perms="['InvoicingRequests.InvoicingRequests/detail']" link
@click="handledetail(row)">
详情
@ -135,4 +136,3 @@ const handledetail = async (data: any) => {
getLists()
</script>

View File

@ -0,0 +1,158 @@
<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="dangerous_engineering_monitoring_id">
<el-input v-model="formData.dangerous_engineering_monitoring_id" clearable placeholder="请输入危大工程监控id" />
</el-form-item>
<el-form-item label="方案名称" prop="case_name">
<el-input v-model="formData.case_name" clearable placeholder="请输入方案名称" />
</el-form-item>
<el-form-item label="评审人员" prop="assessor">
<el-input v-model="formData.assessor" clearable placeholder="请输入评审人员" />
</el-form-item>
<el-form-item label="评审内容" prop="review_content">
<el-input v-model="formData.review_content" clearable placeholder="请输入评审内容" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" 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>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringCaseEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionDangerousEngineeringCaseAdd, apiSupervisionDangerousEngineeringCaseEdit, apiSupervisionDangerousEngineeringCaseDetail } from '@/api/supervision_dangerous_engineering_case'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危大方案提交列表' : '新增工程监理--危大方案提交列表'
})
//
const formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
case_name: '',
assessor: '',
review_content: '',
remark: '',
annex: '',
create_user: '',
})
//
const formRules = reactive<any>({
dangerous_engineering_monitoring_id: [{
required: true,
message: '请输入危大工程监控id',
trigger: ['blur']
}],
case_name: [{
required: true,
message: '请输入方案名称',
trigger: ['blur']
}],
assessor: [{
required: true,
message: '请输入评审人员',
trigger: ['blur']
}],
review_content: [{
required: true,
message: '请输入评审内容',
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionDangerousEngineeringCaseDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionDangerousEngineeringCaseEdit(data)
: await apiSupervisionDangerousEngineeringCaseAdd(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

@ -0,0 +1,139 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="危大工程监控id" prop="dangerous_engineering_monitoring_id">
<el-input class="w-[280px]" v-model="queryParams.dangerous_engineering_monitoring_id" clearable placeholder="请输入危大工程监控id" />
</el-form-item>
<el-form-item label="方案名称" prop="case_name">
<el-input class="w-[280px]" v-model="queryParams.case_name" clearable placeholder="请输入方案名称" />
</el-form-item>
<el-form-item label="评审人员" prop="assessor">
<el-input class="w-[280px]" v-model="queryParams.assessor" clearable placeholder="请输入评审人员" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_case/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_case/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<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="dangerous_engineering_monitoring_id" show-overflow-tooltip />
<el-table-column label="方案名称" prop="case_name" show-overflow-tooltip />
<el-table-column label="评审人员" prop="assessor" show-overflow-tooltip />
<el-table-column label="评审内容" prop="review_content" 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_dangerous.supervision_dangerous_engineering_case/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_case/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringCaseLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDangerousEngineeringCaseLists, apiSupervisionDangerousEngineeringCaseDelete } from '@/api/supervision_dangerous_engineering_case'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
dangerous_engineering_monitoring_id: '',
case_name: '',
assessor: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionDangerousEngineeringCaseLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionDangerousEngineeringCaseDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -0,0 +1,136 @@
<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="dangerous_engineering_monitoring_id">
<el-input v-model="formData.dangerous_engineering_monitoring_id" clearable placeholder="请输入危大工程监控id" />
</el-form-item>
<el-form-item label="实际施工日期" prop="actual_construction_date">
<el-input v-model="formData.actual_construction_date" clearable placeholder="请输入实际施工日期" />
</el-form-item>
<el-form-item label="是否告知 0-否 1-是" prop="is_notice">
<el-input v-model="formData.is_notice" clearable placeholder="请输入是否告知 0-否 1-是" />
</el-form-item>
<el-form-item label="告知人员" prop="notice_user">
<el-input v-model="formData.notice_user" clearable placeholder="请输入告知人员" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringConstructionEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionDangerousEngineeringConstructionAdd, apiSupervisionDangerousEngineeringConstructionEdit, apiSupervisionDangerousEngineeringConstructionDetail } from '@/api/supervision_dangerous_engineering_construction'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危大工程施工列表' : '新增工程监理--危大工程施工列表'
})
//
const formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
actual_construction_date: '',
is_notice: '',
notice_user: '',
})
//
const formRules = reactive<any>({
dangerous_engineering_monitoring_id: [{
required: true,
message: '请输入危大工程监控id',
trigger: ['blur']
}],
actual_construction_date: [{
required: true,
message: '请输入实际施工日期',
trigger: ['blur']
}],
is_notice: [{
required: true,
message: '请输入是否告知 0-否 1-是',
trigger: ['blur']
}],
notice_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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionDangerousEngineeringConstructionDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionDangerousEngineeringConstructionEdit(data)
: await apiSupervisionDangerousEngineeringConstructionAdd(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

@ -0,0 +1,136 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="危大工程监控id" prop="dangerous_engineering_monitoring_id">
<el-input class="w-[280px]" v-model="queryParams.dangerous_engineering_monitoring_id" clearable placeholder="请输入危大工程监控id" />
</el-form-item>
<el-form-item label="是否告知 0-否 1-是" prop="is_notice">
<el-input class="w-[280px]" v-model="queryParams.is_notice" clearable placeholder="请输入是否告知 0-否 1-是" />
</el-form-item>
<el-form-item label="告知人员" prop="notice_user">
<el-input class="w-[280px]" v-model="queryParams.notice_user" clearable placeholder="请输入告知人员" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_construction/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_construction/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<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="dangerous_engineering_monitoring_id" show-overflow-tooltip />
<el-table-column label="实际施工日期" prop="actual_construction_date" show-overflow-tooltip />
<el-table-column label="是否告知 0-否 1-是" prop="is_notice" show-overflow-tooltip />
<el-table-column label="告知人员" prop="notice_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_construction/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_construction/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringConstructionLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDangerousEngineeringConstructionLists, apiSupervisionDangerousEngineeringConstructionDelete } from '@/api/supervision_dangerous_engineering_construction'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
dangerous_engineering_monitoring_id: '',
is_notice: '',
notice_user: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionDangerousEngineeringConstructionLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionDangerousEngineeringConstructionDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -0,0 +1,140 @@
<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="dangerous_engineering_monitoring_id">
<el-input v-model="formData.dangerous_engineering_monitoring_id" clearable
placeholder="请输入危大工程监控id" />
</el-form-item>
<el-form-item label="危险消除日期" prop="eliminate_date">
<el-input v-model="formData.eliminate_date" clearable placeholder="请输入危险消除日期" />
</el-form-item>
<el-form-item label="消除人" prop="eliminate_user">
<el-input v-model="formData.eliminate_user" clearable placeholder="请输入消除人" />
</el-form-item>
<el-form-item label="是否告知 0-否 1-是" prop="is_notice">
<el-input v-model="formData.is_notice" clearable placeholder="请输入是否告知 0-否 1-是" />
</el-form-item>
<el-form-item label="告知人员" prop="notice_user">
<el-input v-model="formData.notice_user" clearable placeholder="请输入告知人员" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringEliminateEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionDangerousEngineeringEliminateAdd, apiSupervisionDangerousEngineeringEliminateEdit, apiSupervisionDangerousEngineeringEliminateDetail } from '@/api/supervision_dangerous_engineering_eliminate'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危大工程消除列表' : '新增工程监理--危大工程消除列表'
})
//
const formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
eliminate_date: '',
eliminate_user: '',
is_notice: '',
notice_user: '',
})
//
const formRules = reactive<any>({
dangerous_engineering_monitoring_id: [{
required: true,
message: '请输入危大工程监控id',
trigger: ['blur']
}],
eliminate_date: [{
required: true,
message: '请输入危险消除日期',
trigger: ['blur']
}],
eliminate_user: [{
required: true,
message: '请输入消除人',
trigger: ['blur']
}],
is_notice: [{
required: true,
message: '请输入是否告知 0-否 1-是',
trigger: ['blur']
}],
notice_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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionDangerousEngineeringEliminateDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionDangerousEngineeringEliminateEdit(data)
: await apiSupervisionDangerousEngineeringEliminateAdd(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

@ -0,0 +1,123 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="消除人" prop="eliminate_user">
<el-input class="w-[280px]" v-model="queryParams.eliminate_user" clearable placeholder="请输入消除人" />
</el-form-item>
<el-form-item label="告知人员" prop="notice_user">
<el-input class="w-[280px]" v-model="queryParams.notice_user" clearable placeholder="请输入告知人员" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_eliminate/add']"
type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_eliminate/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<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="dangerous_engineering_monitoring_id"
show-overflow-tooltip />
<el-table-column label="危险消除日期" prop="eliminate_date" show-overflow-tooltip />
<el-table-column label="消除人" prop="eliminate_user" show-overflow-tooltip />
<el-table-column label="是否告知 0-否 1-是" prop="is_notice" show-overflow-tooltip />
<el-table-column label="告知人员" prop="notice_user" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_eliminate/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_eliminate/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringEliminateLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDangerousEngineeringEliminateLists, apiSupervisionDangerousEngineeringEliminateDelete } from '@/api/supervision_dangerous_engineering_eliminate'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
dangerous_engineering_monitoring_id: '',
eliminate_user: '',
notice_user: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionDangerousEngineeringEliminateLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionDangerousEngineeringEliminateDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -0,0 +1,210 @@
<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="120px" :rules="formRules">
<el-form-item label="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
<el-form-item label="危大工程类型" prop="type">
<el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择危大工程类型">
<el-option label="超规模工程" :value="parseInt(0)" />
<el-option label="危险性较大工程" :value="parseInt(1)" />
</el-select>
</el-form-item>
<el-form-item label="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="formData.partial_project" clearable placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="计划施工时间" prop="planned_construction_time">
<el-date-picker class="flex-1 !flex" v-model="formData.planned_construction_time" clearable
value-format="YYYY-MM-DD" placeholder="选择计划施工时间">
</el-date-picker>
</el-form-item>
<el-form-item label="单位工程" prop="node_name">
<el-input v-model="formData.node_name" clearable placeholder="请输入单位工程" readonly
@click="showDialog1 = true" />
</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="project_characteristics">
<el-input v-model="formData.project_characteristics" clearable placeholder="请输入本项目特征"
type="textarea" />
</el-form-item>
<el-form-item label="上级监管人员" prop="supervisor">
<el-input v-model="formData.supervisor" clearable placeholder="请输入上级监管人员" />
</el-form-item>
<el-form-item label="负责人" prop="responsible_person">
<el-input v-model="formData.responsible_person" clearable placeholder="请输入负责人" />
</el-form-item>
</el-form>
<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%">
<supervision_check_item @customEvent="customEvents" :project_id="formData.project_id"
:node_type="2">
</supervision_check_item>
</el-dialog>
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringMonitoringEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionDangerousEngineeringMonitoringAdd, apiSupervisionDangerousEngineeringMonitoringEdit, apiSupervisionDangerousEngineeringMonitoringDetail } from '@/api/supervision_dangerous_engineering_monitoring'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危大工程监控' : '新增工程监理--危大工程监控'
})
//
const formData = reactive({
id: '',
project_id: 0,
project_name: "",
type: '',
partial_project: '',
planned_construction_time: '',
check_item_id: '',
// check_item_name: "",
node_name: "",
position: '',
project_characteristics: '',
supervisor: '',
responsible_person: '',
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.node_name
showDialog.value = false
}
const customEvents = (e) => {
formData.check_item_id = e.id
formData.node_name = e.node_name
showDialog1.value = false
}
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
type: [{
required: true,
message: '请输入危大工程类型',
trigger: ['blur']
}],
partial_project: [{
required: true,
message: '请输入分部分项工程',
trigger: ['blur']
}],
planned_construction_time: [{
required: true,
message: '请输入计划施工时间',
trigger: ['blur']
}],
check_item_id: [{
required: true,
message: '请输入单位工程',
trigger: ['blur']
}],
position: [{
required: true,
message: '请输入施工部位',
trigger: ['blur']
}],
project_characteristics: [{
required: true,
message: '请输入本项目特征',
trigger: ['blur']
}],
supervisor: [{
required: true,
message: '请输入上级监管人员',
trigger: ['blur']
}],
responsible_person: [{
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionDangerousEngineeringMonitoringDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionDangerousEngineeringMonitoringEdit(data)
: await apiSupervisionDangerousEngineeringMonitoringAdd(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

@ -0,0 +1,131 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="危大工程类型" prop="type">
<el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入危大工程类型" />
</el-form-item>
<el-form-item label="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="queryParams.partial_project" clearable placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="施工部位" prop="position">
<el-input class="w-[280px]" v-model="queryParams.position" clearable placeholder="请输入施工部位" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/add']"
type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<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="type_text" show-overflow-tooltip />
<el-table-column label="分部分项工程" prop="partial_project_text" show-overflow-tooltip />
<el-table-column label="计划施工时间" prop="planned_construction_time" show-overflow-tooltip />
<el-table-column label="施工部位" prop="position" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_dangerous_engineering_monitoring/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionDangerousEngineeringMonitoringLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDangerousEngineeringMonitoringLists, apiSupervisionDangerousEngineeringMonitoringDelete, apiSupervisionDangerousEngineeringMonitoringDetail } from '@/api/supervision_dangerous_engineering_monitoring'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
project_id: '',
type: '',
partial_project: '',
position: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('partial_project')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionDangerousEngineeringMonitoringLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionDangerousEngineeringMonitoringDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(res)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionDangerousEngineeringMonitoringDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -1,6 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -54,7 +55,8 @@
</el-dialog>
</div>
<el-dialog v-model="showDialog3" title="选择材料信息" width="70%">
<supervision_material_equipment_info @customEvent="customEvent2"></supervision_material_equipment_info>
<supervision_material_equipment_info @customEvent="customEvent2">
</supervision_material_equipment_info>
</el-dialog>
</el-form>
<div style="margin-bottom: 30px;">设备信息</div>
@ -67,21 +69,25 @@
</template>
</el-table-column>
<el-table-column label="设备名称" prop="name">
<template #default="scope">
<el-input v-model="scope.row.name" @click="showDialog3 = true, tableIndex = scope.$index" />
</template>
</el-table-column>
<el-table-column label="设备品牌" prop="brand">
<template #default="scope">
<el-input v-model="scope.row.brand" />
</template>
</el-table-column>
<el-table-column label="计数单位" prop="unit">
<template #default="{ row }">
<el-input v-model="row.unit" />
</template>
</el-table-column>
<el-table-column label="是否合同约定品牌" prop="contract_brand">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
<el-option label="否" :value="0" />
@ -90,16 +96,19 @@
</template>
</el-table-column>
<el-table-column label="型号" prop="model">
<template #default="{ row }">
<el-input v-model="row.model" />
</template>
</el-table-column>
<el-table-column label="进场数量" prop="entry_number">
<template #default="{ row }">
<el-input v-model="row.entry_number" />
</template>
</el-table-column>
<el-table-column label="证明文件是否安全" prop="documentation">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.documentation" clearable placeholder="请选择">
<el-option label="否" :value="0" />
@ -108,6 +117,7 @@
</template>
</el-table-column>
<el-table-column label="核对是否一致" prop="verify">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.verify" clearable placeholder="请选择">
<el-option label="否" :value="0" />
@ -121,12 +131,14 @@
<div style="margin-bottom: 30px;">
<el-table :data="formData.entry_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"
@ -135,12 +147,14 @@
</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="problem_name">
<template #default="{ row }">
<el-input v-model="row.problem_name" />
</template>

View File

@ -0,0 +1,372 @@
<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="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="formData.partial_project" clearable
placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="归属年月" prop="attribution_date">
<el-date-picker class="flex-1 !flex" v-model="formData.attribution_date" clearable
value-format="YYYY-MM" placeholder="选择归属年月">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本项目特征" prop="project_characteristics">
<el-input v-model="formData.project_characteristics" clearable placeholder="请输入本项目特征" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划施工时间" prop="planned_construction_time">
<el-date-picker class="flex-1 !flex" v-model="formData.planned_construction_time" clearable
value-format="YYYY-MM-DD" placeholder="选择计划施工时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际施工时间" prop="actual_construction_time">
<el-date-picker class="flex-1 !flex" v-model="formData.actual_construction_time" clearable
value-format="YYYY-MM-DD" placeholder="选择实际施工时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否已经专家组论证" prop="is_discuss" label-width="180px">
<el-radio-group v-model="formData.is_discuss">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否已按专家意见修改" prop="is_modify" label-width="200px">
<el-radio-group v-model="formData.is_modify">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="监理审批是否同意" prop="is_agree" label-width="160px">
<el-radio-group v-model="formData.is_agree">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否实施验收" prop="is_accept">
<!-- <el-input v-model="formData.is_accept" clearable placeholder="请输入是否实施验收 0-否 1-是" /> -->
<el-radio-group v-model="formData.is_accept">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否按方案实施验收" prop="is_accept_to_plan" label-width="180px">
<el-radio-group v-model="formData.is_accept_to_plan">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查人" prop="check_user">
<el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查时间" prop="check_time">
<el-date-picker class="flex-1 !flex" v-model="formData.check_time" clearable
value-format="YYYY-MM-DD" placeholder="选择检查时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="存在问题和整改情况" prop="problems_rectification" label-width="180px">
<el-input v-model="formData.problems_rectification" clearable placeholder="请输入存在问题和整改情况" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="监控责任人" prop="responsible_person">
<el-input v-model="formData.responsible_person" clearable placeholder="请输入监控责任人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否超控制值" prop="exceed_the_control_value">
<el-radio-group v-model="formData.exceed_the_control_value">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否超预警值" prop="exceed_the_warning_value">
<el-radio-group v-model="formData.exceed_the_warning_value">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="控制措施" prop="control_measures">
<el-input v-model="formData.control_measures" clearable placeholder="请输入控制措施" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionExcessRiskSecurityMonitoringEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionExcessRiskSecurityMonitoringAdd, apiSupervisionExcessRiskSecurityMonitoringEdit, apiSupervisionExcessRiskSecurityMonitoringDetail } from '@/api/supervision_excess_risk_security_monitoring'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--超规模危险性较大工程安全监控' : '新增工程监理--超规模危险性较大工程安全监控'
})
//
const formData = reactive({
id: '',
project_id: '',
project_name: "",
partial_project: '',
attribution_date: '',
project_characteristics: '',
planned_construction_time: '',
actual_construction_time: '',
is_discuss: '',
is_modify: '',
is_agree: '',
is_accept: '',
is_accept_to_plan: '',
check_user: '',
check_time: '',
problems_rectification: '',
responsible_person: '',
exceed_the_control_value: '',
exceed_the_warning_value: '',
control_measures: '',
create_user: '',
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请选择项目',
trigger: ['blur']
}],
partial_project: [{
required: true,
message: '请输入分部分项工程',
trigger: ['blur']
}],
attribution_date: [{
required: true,
message: '请输入归属年月',
trigger: ['blur']
}],
project_characteristics: [{
required: true,
message: '请输入本项目特征',
trigger: ['blur']
}],
planned_construction_time: [{
required: true,
message: '请输入计划施工时间',
trigger: ['blur']
}],
actual_construction_time: [{
required: true,
message: '请输入实际施工时间',
trigger: ['blur']
}],
is_discuss: [{
required: true,
message: '请输入是否已经专家组论证 0-否 1-是',
trigger: ['blur']
}],
is_modify: [{
required: true,
message: '请输入是否已按专家意见修改 0-否 1-是',
trigger: ['blur']
}],
is_agree: [{
required: true,
message: '请输入监理审批是否同意 0-否 1-是',
trigger: ['blur']
}],
is_accept: [{
required: true,
message: '请输入是否实施验收 0-否 1-是',
trigger: ['blur']
}],
is_accept_to_plan: [{
required: true,
message: '请输入是否按方案实施验收 0-否 1-是',
trigger: ['blur']
}],
check_user: [{
required: true,
message: '请输入检查人',
trigger: ['blur']
}],
check_time: [{
required: true,
message: '请输入检查时间',
trigger: ['blur']
}],
problems_rectification: [{
required: true,
message: '请输入存在问题和整改情况',
trigger: ['blur']
}],
responsible_person: [{
required: true,
message: '请输入监控责任人',
trigger: ['blur']
}],
exceed_the_control_value: [{
required: true,
message: '请输入是否超控制值 0-否 1-是',
trigger: ['blur']
}],
exceed_the_warning_value: [{
required: true,
message: '请输入是否超预警值 0-否 1-是',
trigger: ['blur']
}],
control_measures: [{
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionExcessRiskSecurityMonitoringDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionExcessRiskSecurityMonitoringEdit(data)
: await apiSupervisionExcessRiskSecurityMonitoringAdd(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

@ -0,0 +1,129 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="queryParams.partial_project" clearable placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="本项目特征" prop="project_characteristics">
<el-input class="w-[280px]" v-model="queryParams.project_characteristics" clearable
placeholder="请输入本项目特征" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_excess_risk_security_monitoring/add']"
type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_excess_risk_security_monitoring/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<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="partial_project_text" show-overflow-tooltip />
<el-table-column label="归属年月" prop="attribution_date" show-overflow-tooltip />
<el-table-column label="本项目特征" prop="project_characteristics" show-overflow-tooltip />
<el-table-column label="计划施工时间" prop="planned_construction_time" show-overflow-tooltip />
<el-table-column label="实际施工时间" prop="actual_construction_time" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['supervision_dangerous.supervision_excess_risk_security_monitoring/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_excess_risk_security_monitoring/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionExcessRiskSecurityMonitoringLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionExcessRiskSecurityMonitoringLists, apiSupervisionExcessRiskSecurityMonitoringDelete, apiSupervisionExcessRiskSecurityMonitoringDetail } from '@/api/supervision_excess_risk_security_monitoring'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
project_id: '',
partial_project: '',
project_characteristics: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('partial_project')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionExcessRiskSecurityMonitoringLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionExcessRiskSecurityMonitoringDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(res)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionExcessRiskSecurityMonitoringDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -0,0 +1,353 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @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="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="formData.partial_project" clearable
placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="归属年月" prop="attribution_date">
<el-date-picker class="flex-1 !flex" v-model="formData.attribution_date" clearable
value-format="YYYY-MM" placeholder="选择归属年月">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="本项目特征" prop="project_characteristics">
<el-input v-model="formData.project_characteristics" clearable placeholder="请输入本项目特征" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划施工时间" prop="planned_construction_time">
<el-date-picker class="flex-1 !flex" v-model="formData.planned_construction_time" clearable
value-format="YYYY-MM-DD" placeholder="选择计划施工时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际施工时间" prop="actual_construction_time">
<el-date-picker class="flex-1 !flex" v-model="formData.actual_construction_time" clearable
value-format="YYYY-MM-DD" placeholder="选择实际施工时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="施工方案是否上报监理" prop="is_report" label-width="200px">
<el-radio-group v-model="formData.is_report">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="监理审批是否同意" prop="is_agree" label-width="200px">
<el-radio-group v-model="formData.is_agree">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否实施验收 " prop="is_accept">
<el-radio-group v-model="formData.is_accept">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否按方案实施验收" prop="is_accept_to_plan" label-width="200px">
<el-radio-group v-model="formData.is_accept_to_plan">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查人" prop="check_user">
<el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检查时间" prop="check_time">
<el-date-picker class="flex-1 !flex" v-model="formData.check_time" clearable
value-format="YYYY-MM-DD" placeholder="选择检查时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="存在问题和整改情况" prop="problems_rectification" label-width="200px">
<el-input v-model="formData.problems_rectification" clearable placeholder="请输入存在问题和整改情况" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目部监控责任人" prop="responsible_person" label-width="200px">
<el-input v-model="formData.responsible_person" clearable placeholder="请输入项目部监控责任人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否超控制值" prop="exceed_the_control_value">
<el-radio-group v-model="formData.exceed_the_control_value">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否超预警值" prop="exceed_the_warning_value">
<el-radio-group v-model="formData.exceed_the_warning_value">
<el-radio :label="0">
</el-radio>
<el-radio :label="1">
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="控制措施" prop="control_measures">
<el-input v-model="formData.control_measures" clearable placeholder="请输入控制措施" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionHighRiskSecurityMonitoringEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionHighRiskSecurityMonitoringAdd, apiSupervisionHighRiskSecurityMonitoringEdit, apiSupervisionHighRiskSecurityMonitoringDetail } from '@/api/supervision_high_risk_security_monitoring'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危险性较大的工程安全监控' : '新增工程监理--危险性较大的工程安全监控'
})
//
const formData = reactive({
id: '',
project_id: '',
project_name: "",
partial_project: '',
attribution_date: '',
project_characteristics: '',
planned_construction_time: '',
actual_construction_time: '',
is_report: '',
is_agree: '',
is_accept: '',
is_accept_to_plan: '',
check_user: '',
check_time: '',
problems_rectification: '',
responsible_person: '',
exceed_the_control_value: '',
exceed_the_warning_value: '',
control_measures: '',
create_user: '',
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
partial_project: [{
required: true,
message: '请输入分部分项工程',
trigger: ['blur']
}],
attribution_date: [{
required: true,
message: '请输入归属年月',
trigger: ['blur']
}],
project_characteristics: [{
required: true,
message: '请输入本项目特征',
trigger: ['blur']
}],
planned_construction_time: [{
required: true,
message: '请输入计划施工时间',
trigger: ['blur']
}],
actual_construction_time: [{
required: true,
message: '请输入实际施工时间',
trigger: ['blur']
}],
is_report: [{
required: true,
message: '请输入施工方案是否上报监理 0-否 1-是',
trigger: ['blur']
}],
is_agree: [{
required: true,
message: '请输入监理审批是否同意 0-否 1-是',
trigger: ['blur']
}],
is_accept: [{
required: true,
message: '请输入是否实施验收 0-否 1-是',
trigger: ['blur']
}],
is_accept_to_plan: [{
required: true,
message: '请输入是否按方案实施验收 0-否 1-是',
trigger: ['blur']
}],
check_user: [{
required: true,
message: '请输入检查人',
trigger: ['blur']
}],
check_time: [{
required: true,
message: '请输入检查时间',
trigger: ['blur']
}],
problems_rectification: [{
required: true,
message: '请输入存在问题和整改情况',
trigger: ['blur']
}],
responsible_person: [{
required: true,
message: '请输入项目部监控责任人',
trigger: ['blur']
}],
exceed_the_control_value: [{
required: true,
message: '请输入是否超控制值 0-否 1-是',
trigger: ['blur']
}],
exceed_the_warning_value: [{
required: true,
message: '请输入是否超预警值 0-否 1-是',
trigger: ['blur']
}],
control_measures: [{
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionHighRiskSecurityMonitoringDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionHighRiskSecurityMonitoringEdit(data)
: await apiSupervisionHighRiskSecurityMonitoringAdd(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

@ -0,0 +1,128 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="分部分项工程" prop="partial_project">
<el-select class="flex-1" v-model="queryParams.partial_project" clearable placeholder="请选择分部分项工程">
<el-option v-for="(item, index) in dictData.partial_project" :key="index" :label="item.name"
:value="parseInt(item.value)" />
</el-select>
</el-form-item>
<el-form-item label="本项目特征" prop="project_characteristics">
<el-input class="w-[280px]" v-model="queryParams.project_characteristics" clearable
placeholder="请输入本项目特征" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_high_risk_security_monitoring/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_high_risk_security_monitoring/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<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="partial_project_text" show-overflow-tooltip />
<el-table-column label="归属年月" prop="attribution_date" show-overflow-tooltip />
<el-table-column label="本项目特征" prop="project_characteristics" show-overflow-tooltip />
<el-table-column label="计划施工时间" prop="planned_construction_time" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['supervision_dangerous.supervision_high_risk_security_monitoring/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['supervision_dangerous.supervision_high_risk_security_monitoring/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionHighRiskSecurityMonitoringLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionHighRiskSecurityMonitoringLists, apiSupervisionHighRiskSecurityMonitoringDelete, apiSupervisionHighRiskSecurityMonitoringDetail } from '@/api/supervision_high_risk_security_monitoring'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
project_id: '',
partial_project: '',
project_characteristics: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('partial_project')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionHighRiskSecurityMonitoringLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
let res = await apiSupervisionHighRiskSecurityMonitoringDetail({ id: data.id })
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(res)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionHighRiskSecurityMonitoringDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -0,0 +1,408 @@
<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.sn" clearable placeholder="系统自动生成" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="大型机械设备及仪器具" prop="name" label-width="200px">
<el-input v-model="formData.name" clearable placeholder="请输入大型机械设备及仪器具" />
</el-form-item> </el-col>
<el-col :span="8">
<el-form-item label="使用部位" prop="use_site">
<el-input v-model="formData.use_site" clearable placeholder="请输入使用部位" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="进场时间" prop="entry_time">
<el-date-picker class="flex-1 !flex" v-model="formData.entry_time" clearable
value-format="YYYY-MM-DD" placeholder="选择进场时间">
</el-date-picker>
</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="approval_date">
<el-date-picker class="flex-1 !flex" v-model="formData.approval_date" clearable
value-format="YYYY-MM-DD" placeholder="选择报审日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报审结果" prop="approval_result">
<el-input v-model="formData.approval_result" clearable placeholder="请输入报审结果" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报审表编号" prop="approval_form_code">
<el-input v-model="formData.approval_form_code" clearable placeholder="请输入报审表编号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报审类型" prop="approval_type">
<el-select class="flex-1" v-model="formData.approval_type" clearable placeholder="请选择报审类型">
<el-option v-for="(item, index) in dictData.approval_type" :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="专监初审意见" prop="first_audit_opinion">
<el-select class="flex-1" v-model="formData.first_audit_opinion" clearable
placeholder="请选择专监初审意见">
<el-option v-for="(item, index) in dictData.first_audit_opinion" :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="初审人" prop="first_auditor">
<el-input v-model="formData.first_auditor" clearable placeholder="请输入初审人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="初审时间" prop="first_audit_time">
<el-date-picker class="flex-1 !flex" v-model="formData.first_audit_time" clearable
value-format="YYYY-MM-DD" placeholder="选择初审时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总监审定结论" prop="final_audit_opinion">
<el-select class="flex-1" v-model="formData.final_audit_opinion" clearable
placeholder="请选择总监审定结论">
<el-option v-for="(item, index) in dictData.final_audit_opinion" :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审定时间" prop="final_audit_time">
<el-date-picker class="flex-1 !flex" v-model="formData.final_audit_time" clearable
value-format="YYYY-MM-DD" placeholder="选择审定时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</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-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
<div v-if="showDialog2">
<el-dialog v-model="showDialog2" width=" 70%" title="选择施工单位">
<supervision_participating_units @customEvent="customEvent1" :project_id="formData.project_id">
</supervision_participating_units>
</el-dialog>
</div>
<div style="margin-bottom: 30px;">机械维修保养记录</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.maintenance_record">
<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="reg_date">
<template #default="scope">
<el-date-picker class="flex-1 !flex" v-model="scope.row.reg_date" clearable
value-format="YYYY-MM-DD" placeholder="选择登记日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="机械每月维修保养附件" prop="month_warranty_file">
<template #default="{ row }">
<el-input v-model="row.month_warranty_file" />
</template>
</el-table-column>
<el-table-column label="设备维保有效期" prop="maintenance_period">
<template #default="scope">
<el-date-picker class="flex-1 !flex" v-model="scope.row.maintenance_period" clearable
value-format="YYYY-MM-DD" placeholder="选择设备维保有效期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="附配件1有效期" prop="accessory_one_validity">
<template #default="scope">
<el-date-picker class="flex-1 !flex" v-model="scope.row.accessory_one_validity" clearable
value-format="YYYY-MM-DD" placeholder="选择附配件1有效期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="附配件2有效期" prop="accessory_two_validity">
<template #default="scope">
<el-date-picker class="flex-1 !flex" v-model="scope.row.accessory_two_validity" clearable
value-format="YYYY-MM-DD" placeholder="选择附配件2有效期">
</el-date-picker>
</template>
</el-table-column>
</el-table>
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionLargeMechanicalEquipmentEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionLargeMechanicalEquipmentAdd, apiSupervisionLargeMechanicalEquipmentEdit, apisupervision_large_mechanical_equipment_maintenance_record_delete, apiSupervisionLargeMechanicalEquipmentDetail, apisupervision_large_mechanical_equipment_maintenance_record } from '@/api/supervision_large_mechanical_equipment'
import { timeFormat } from '@/utils/util'
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 showDialog2 = ref(false)
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--大型机械设备及仪器台账' : '新增工程监理--大型机械设备及仪器台账'
})
//
const formData = reactive({
id: '',
project_id: 0,
project_name: "",
sn: '',
name: '',
use_site: '',
entry_time: '',
company_id: '',
company_name: '',
approval_date: '',
approval_result: '',
approval_form_code: '',
approval_type: '',
first_audit_opinion: '',
first_auditor: '',
first_audit_time: '',
final_audit_opinion: '',
final_audit_time: '',
remark: '',
annex: [],
maintenance_record: [{
"reg_date": "",
"month_warranty_file": "",
"maintenance_period": "",
"accessory_one_validity": "",
"accessory_two_validity": ""
}]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
formData.company_name = ''
formData.company_id = ''
}
const customEvent1 = (e) => {
formData.company_id = e.id
formData.company_name = e.project_name
showDialog2.value = false
}
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 handleAdd1 = () => {
formData.maintenance_record.push({
"reg_date": "",
"month_warranty_file": "",
"maintenance_period": "",
"accessory_one_validity": "",
"accessory_two_validity": ""
})
}
const handleDelete1 = async (row: any) => {
if (row.id) {
await apisupervision_large_mechanical_equipment_maintenance_record_delete({ id: row.id })
const index = formData.maintenance_record.indexOf(row);
formData.maintenance_record.splice(index, 1);
} else {
const index = formData.maintenance_record.indexOf(row);
formData.maintenance_record.splice(index, 1);
}
}
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
name: [{
required: true,
message: '请输入大型机械设备及仪器具',
trigger: ['blur']
}],
use_site: [{
required: true,
message: '请输入使用部位',
trigger: ['blur']
}],
entry_time: [{
required: true,
message: '请输入进场时间',
trigger: ['blur']
}],
company_id: [{
required: true,
message: '请输入报审单位名称',
trigger: ['blur']
}],
approval_date: [{
required: true,
message: '请输入报审日期',
trigger: ['blur']
}],
approval_result: [{
required: true,
message: '请输入报审结果',
trigger: ['blur']
}],
approval_form_code: [{
required: true,
message: '请输入报审表编号',
trigger: ['blur']
}],
approval_type: [{
required: true,
message: '请输入报审类型',
trigger: ['blur']
}],
first_audit_opinion: [{
required: true,
message: '请输入专监初审意见',
trigger: ['blur']
}],
first_auditor: [{
required: true,
message: '请输入初审人',
trigger: ['blur']
}],
first_audit_time: [{
required: true,
message: '请输入初审时间',
trigger: ['blur']
}],
final_audit_opinion: [{
required: true,
message: '请输入总监审定结论',
trigger: ['blur']
}],
final_audit_time: [{
required: true,
message: '请输入审定时间',
trigger: ['blur']
}],
remark: [{
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]
}
}
let res = await apisupervision_large_mechanical_equipment_maintenance_record({ large_mechanical_equipment_id: formData.id })
formData.maintenance_record = res.lists
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionLargeMechanicalEquipmentDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionLargeMechanicalEquipmentEdit(data)
: await apiSupervisionLargeMechanicalEquipmentAdd(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

@ -0,0 +1,150 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="序号" prop="sn">
<el-input class="w-[280px]" v-model="queryParams.sn" clearable placeholder="请输入序号" />
</el-form-item>
<el-form-item label="大型机械设备及仪器具" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入大型机械设备及仪器具" />
</el-form-item>
<el-form-item label="使用部位" prop="use_site">
<el-input class="w-[280px]" v-model="queryParams.use_site" clearable placeholder="请输入使用部位" />
</el-form-item>
<el-form-item label="报审单位名称" prop="company_id">
<el-input class="w-[280px]" v-model="queryParams.company_id" clearable placeholder="请输入报审单位名称" />
</el-form-item>
<el-form-item label="报审结果" prop="approval_result">
<el-input class="w-[280px]" v-model="queryParams.approval_result" clearable placeholder="请输入报审结果" />
</el-form-item>
<el-form-item label="报审类型" prop="approval_type">
<el-select class="flex-1" v-model="queryParams.approval_type" clearable placeholder="请选择报审类型">
<el-option v-for="(item, index) in dictData.approval_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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_large_mechanical_equipment/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_large_mechanical_equipment/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<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="sn" show-overflow-tooltip />
<el-table-column label="大型机械设备及仪器具" prop="name" show-overflow-tooltip />
<el-table-column label="使用部位" prop="use_site" show-overflow-tooltip />
<el-table-column label="进场时间" prop="entry_time" show-overflow-tooltip />
<el-table-column label="报审单位名称" prop="company_name" show-overflow-tooltip />
<el-table-column label="报审日期" prop="approval_date" show-overflow-tooltip />
<el-table-column label="报审结果" prop="approval_result" show-overflow-tooltip />
<el-table-column label="报审表编号" prop="approval_form_code" show-overflow-tooltip />
<el-table-column label="报审类型" prop="approval_type_text" show-overflow-tooltip />
<el-table-column label="专监初审意见" prop="first_audit_opinion_text" show-overflow-tooltip />
<el-table-column label="初审人" prop="first_auditor" show-overflow-tooltip />
<el-table-column label="初审时间" prop="first_audit_time" show-overflow-tooltip />
<el-table-column label="总监审定结论" prop="final_audit_opinion_text" show-overflow-tooltip />
<el-table-column label="审定时间" prop="final_audit_time" 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_dangerous.supervision_large_mechanical_equipment/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_large_mechanical_equipment/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionLargeMechanicalEquipmentLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionLargeMechanicalEquipmentLists, apiSupervisionLargeMechanicalEquipmentDelete } from '@/api/supervision_large_mechanical_equipment'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
project_id: '',
sn: '',
name: '',
use_site: '',
company_id: '',
approval_result: '',
approval_type: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('approval_type,first_audit_opinion,final_audit_opinion')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionLargeMechanicalEquipmentLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionLargeMechanicalEquipmentDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -1,15 +1,9 @@
<template>
<!-- <template>
<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-item label="项目id" prop="project_id">
<el-form-item label="项目名称" prop="project_id">
<el-input v-model="formData.project_id" clearable placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="来源单据" prop="material_entry_id">
@ -123,8 +117,8 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
@ -138,9 +132,274 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionMaterialParallelTestingEdit(data)
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionMaterialParallelTestingEdit(data)
: await apiSupervisionMaterialParallelTestingAdd(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> -->
<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="90px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="来源单据" prop="material_entry_name">
<el-input v-model="formData.material_entry_name" clearable placeholder="点击来源单据" readonly
@click="showDialog2 = true" />
</el-form-item>
</el-col>
<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-date-picker class="flex-1 !flex" v-model="formData.inspection_date" clearable
value-format="YYYY-MM-DD" placeholder="选择取样日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="送检人">
<el-input v-model="formData.inspector" clearable placeholder="请输入见证人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</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>
<el-dialog v-model="showDialog2" title="选择来源单据" width="70%">
<supervision_material_entry @customEvent="customEvent1"></supervision_material_entry>
</el-dialog>
</el-form>
<div style="margin-bottom: 30px;">材料信息</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.detail">
<!-- <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="name">
<template #default="scope">
<el-input v-model="scope.row.name" />
</template>
</el-table-column>
<el-table-column label="材料品牌" prop="brand">
<template #default="scope">
<el-input v-model="scope.row.brand" />
</template>
</el-table-column>
<el-table-column label="单位" prop="unit">
<template #default="{ row }">
<el-input v-model="row.unit" />
</template>
</el-table-column>
<el-table-column label="是否合同约定品牌" prop="contract_brand">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
<el-option label="否" :value="0" />
<el-option label="是" :value="1" />
</el-select>
</template>
</el-table-column>
<el-table-column label="型号" prop="model">
<template #default="{ row }">
<el-input v-model="row.model" />
</template>
</el-table-column>
<el-table-column label="进场数量" prop="entry_number">
<template #default="{ row }">
<el-input v-model="row.entry_number" />
</template>
</el-table-column>
<el-table-column label="检验数量" prop="num">
<template #default="{ row }">
<el-input v-model="row.num" />
</template>
</el-table-column>
</el-table>
</div>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionWitnessSamplingEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionMaterialParallelTestingAdd, apiSupervisionMaterialParallelTestingEdit, apiSupervisionMaterialParallelTestingDetail } from '@/api/supervision_material_parallel_testing'
import { apisupervision_material_entry_detail, apisupervision_material_entry_detail_delete } from '@/api/supervision_material_entry'
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 showDialog2 = ref(false)
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--见证取样' : '新增工程监理--见证取样'
})
//
const formData = reactive({
project_name: "",
"project_id": 1,
"material_entry_id": 1,
material_entry_name: "",
"inspector": "",
"inspection_date": "",
"remark": "",
"annex": [],
"detail": [
{
"name": "",
"brand": "",
"model": "",
"unit": "",
"contract_brand": 0,
"entry_number": 0,
num: ""
}
]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
const customEvent1 = async (e) => {
formData.project_name = e.project_name
formData.project_id = e.project_id
formData.material_entry_id = e.id
formData.material_entry_name = e.theme
showDialog2.value = false
let res = await apisupervision_material_entry_detail({ material_entry_id: e.id })
formData.detail = res.lists
}
//
const formRules = reactive<any>({
project_name: [{
required: true,
message: '请选择项目',
trigger: ['blur']
}],
material_entry_id: [{
required: true,
message: '请输入来源单据',
trigger: ['blur']
}],
sampling_date: [{
required: true,
message: '请输入取样日期',
trigger: ['blur']
}],
witness: [{
required: true,
message: '请输入见证人',
trigger: ['blur']
}],
sampler: [{
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]
}
}
let res = await apisupervision_material_entry_detail({ material_entry_id: formData.material_entry_id })
formData.detail = res.lists
}
const getDetail = async (row: Record<string, any>) => {
// const data = await apiSupervisionWitnessSamplingDetail({
// id: row.id
// })
// setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
data.detail = formData.detail.map(item => ({ material_entry_detail_id: item.id, num: item.num }))
mode.value == 'edit'
? await apiSupervisionMaterialParallelTestingEdit(data)
: await apiSupervisionMaterialParallelTestingAdd(data)
popupRef.value?.close()
emit('success')

View File

@ -1,61 +1,54 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item>
<el-form class="mb-[-16px]" :model="queryParams" inline>
<!-- <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/add']" type="primary" @click="handleAdd">
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['supervision_work.supervision_material_parallel_testing/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<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="material_entry_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="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="附件" 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_material_parallel_testing/edit']"
type="primary"
link
@click="handleEdit(row)"
>
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['supervision_work.supervision_material_parallel_testing/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
<el-button v-perms="['supervision_work.supervision_material_parallel_testing/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
<router-link :to="{
path: '/supervision/supervision_work/supervision_material_parallel_testing_detail',
query: { id: row.id }
}">
<el-button type="primary" link>
明细
</el-button>
</router-link>
</template>
</el-table-column>
</el-table>
@ -83,7 +76,7 @@ const showEdit = ref(false)
//
const queryParams = reactive({
})
//
@ -127,4 +120,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>

View File

@ -0,0 +1,257 @@
<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="90px" :rules="formRules">
<el-row>
<el-col :span="8">
<el-form-item label="报告编号" prop="check_code">
<el-input v-model="formData.check_code" clearable placeholder="请输入报告编号" type="number" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验结果" prop="check_result">
<el-radio-group v-model="formData.check_result">
<el-radio label="1">
符合标准
</el-radio>
<el-radio label="2">
不符合标准
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="获得日期" prop="check_time">
<el-date-picker class="flex-1 !flex" v-model="formData.check_time" clearable
value-format="YYYY-MM-DD" placeholder="选择开始日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作人" prop="check_user">
<el-input v-model="formData.check_user" clearable placeholder="请输入操作人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.check_annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="margin-bottom: 30px;">问题</div>
<div style="margin-bottom: 30px;">
<el-table :data="formData.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="problem_name">
<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="supervisionDiaryEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apisupervision_material_parallel_testing_detail_check } from '@/api/supervision_material_parallel_testing'
import { timeFormat } from '@/utils/util'
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 handleAvatarSuccess_four = (response: any) => {
Array.isArray(formData.check_annex) ? "" : formData.check_annex = []
// @ts-ignore
response.code != 0 ? formData.check_annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
//
const delFileFn = (index: number) => { formData.check_annex.splice(index, 1) }
//
const popupTitle = computed(() => {
return '检验结果'
})
const handleAdd1 = () => {
formData.check_problem.push({
"problem_cate": '',
"problem_description": "",
"problem_name": ""
})
}
const handleDelete1 = async (row: any) => {
const index = formData.check_problem.indexOf(row);
formData.check_problem.splice(index, 1);
}
//
const formData = reactive({
"id": 1,
"check_code": 1,
"check_result": 1,
"check_time": "",
"check_user": "",
"check_remark": "",
"check_annex": [
],
"check_problem": [
{
"problem_cate": '',
"problem_description": "",
"problem_name": ""
}
]
})
//
const formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
date: [{
required: true,
message: '请输入日期',
trigger: ['blur']
}],
week: [{
required: true,
message: '请输入星期',
trigger: ['blur']
}],
air_temperature: [{
required: true,
message: '请输入气温',
trigger: ['blur']
}],
climate: [{
required: true,
message: '请输入气候',
trigger: ['blur']
}],
user: [{
required: true,
message: '请输入监理人员',
trigger: ['blur']
}],
director: [{
required: true,
message: '请输入监理总监',
trigger: ['blur']
}],
engineering_dynamics: [{
required: true,
message: '请输入工程动态',
trigger: ['blur']
}],
supervision_work: [{
required: true,
message: '请输入监理工作',
trigger: ['blur']
}],
construction_situation: [{
required: true,
message: '请输入安全文明施工情况',
trigger: ['blur']
}],
other_matters: [{
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apisupervision_material_parallel_testing_detail_check(data)
: await apisupervision_material_parallel_testing_detail_check(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

@ -0,0 +1,133 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="来源单据" prop="material_entry_id">
<el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable
placeholder="请输入来源单据" />
</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="witness">
<el-input class="w-[280px]" v-model="queryParams.witness" clearable placeholder="请输入见证人" />
</el-form-item>
<el-form-item label="取样人" prop="sampler">
<el-input class="w-[280px]" v-model="queryParams.sampler" clearable placeholder="请输入取样人" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_work.supervision_witness_sampling/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_work.supervision_witness_sampling/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="材料名称" prop="name" show-overflow-tooltip />
<el-table-column label="型号" prop="model" show-overflow-tooltip />
<el-table-column label="取样时间" prop="sampling_date" show-overflow-tooltip />
<el-table-column label="进场数量" prop="entry_number" show-overflow-tooltip />
<el-table-column label="进场日期" prop="enter_time" show-overflow-tooltip />
<el-table-column label="检验结果" prop="check_result_text" show-overflow-tooltip />
<el-table-column label="问题数量" prop="problem_num" show-overflow-tooltip />
<el-table-column label="回复数量" prop="reply_num" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_witness_sampling/edit']" type="primary"
link @click="handleEdit(row)">
检验结果
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionWitnessSamplingLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
// import { apiSupervisionWitnessSamplingListsDetail, apiSupervisionWitnessSamplingDelete } from '@/api/supervision_witness_sampling'
import { apisupervision_material_parallel_testing_detail, apiSupervisionMaterialParallelTestingDelete } from '@/api/supervision_material_parallel_testing'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import { useRoute } from "vue-router"
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
const route = useRoute()
//
const queryParams = reactive({
material_entry_id: '',
code: '',
witness: '',
sampler: '',
material_parallel_testing_id: route.query.id || ""
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('problem_cate')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apisupervision_material_parallel_testing_detail,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionMaterialParallelTestingDelete({ id })
getLists()
}
//
getLists()
</script>

View File

@ -1,6 +1,7 @@
<template>
<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="120px" :rules="formRules">
<el-form-item label="整改回复时间" prop="rectification_time">
<el-date-picker class="flex-1 !flex" v-model="formData.rectification_time" clearable
@ -21,7 +22,8 @@
</el-radio-group>
</el-form-item>
<el-form-item label="整改回复意见" prop="rectification_opinion">
<el-input v-model="formData.rectification_opinion" clearable placeholder="请输入整改回复意见" type="textarea" />
<el-input v-model="formData.rectification_opinion" clearable placeholder="请输入整改回复意见"
type="textarea" />
</el-form-item>
<el-form-item label="附件" prop="rectification_annex">
<annexUpload :annex="formData.rectification_annex" @handleAvatarSuccess="handleAvatarSuccess_four"

View File

@ -6,7 +6,8 @@
<el-input class="w-[280px]" v-model="queryParams.problem_cate" clearable placeholder="请输入问题分类" />
</el-form-item>
<el-form-item label="问题说明" prop="problem_description">
<el-input class="w-[280px]" v-model="queryParams.problem_description" clearable placeholder="请输入问题说明" />
<el-input class="w-[280px]" v-model="queryParams.problem_description" clearable
placeholder="请输入问题说明" />
</el-form-item>
<el-form-item label="问题名称" prop="problem_name">
<el-input class="w-[280px]" v-model="queryParams.problem_name" clearable placeholder="请输入问题名称" />
@ -22,8 +23,8 @@
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button> -->
新增
</el-button> -->
<el-button v-perms="['supervision_work.supervision_problem/delete']" :disabled="!selectData.length"
@click="handleDelete(selectData)">
删除
@ -40,10 +41,11 @@
<el-table-column label="整改结果" prop="rectification_result_text" show-overflow-tooltip />
<el-table-column label="整改意见" prop="rectification_opinion" show-overflow-tooltip />
<el-table-column label="是否整改" prop="is_rectification_text" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" width="200" fixed="right" align="center">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_problem/edit']" type="primary" link
@click="handleEdit(row)">
@click="handleEdit(row)" v-if="row.is_rectification == 0">
检查验收
</el-button>
<el-button v-perms="['supervision_work.supervision_problem/delete']" type="danger" link
@ -125,4 +127,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>

View File

@ -0,0 +1,173 @@
<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="项目名称" prop="project_name">
<el-input v-model="formData.project_name" clearable placeholder="点击选择项目" readonly
@click="showDialog = true" />
</el-form-item>
<el-form-item label="检查人" prop="check_user">
<el-input v-model="formData.check_user" clearable placeholder="请输入检查人" />
</el-form-item>
<el-form-item label="检查日期" prop="check_date">
<el-date-picker class="flex-1 !flex" v-model="formData.check_date" clearable
value-format="YYYY-MM-DD" placeholder="选择检查日期">
</el-date-picker>
</el-form-item>
<el-form-item label="检查地点" prop="check_area">
<el-input v-model="formData.check_area" clearable placeholder="请输入检查地点" />
</el-form-item>
<el-form-item label="问题描述" prop="problem_desc">
<el-input v-model="formData.problem_desc" clearable placeholder="请输入问题描述" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" clearable placeholder="请输入备注" />
</el-form-item>
<el-form-item label="附件" prop="annex">
<annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
@delFile="delFileFn" />
</el-form-item>
</el-form>
<el-dialog v-model="showDialog" title="选择项目" width="70%">
<supervision_project @customEvent="customEvent"></supervision_project>
</el-dialog>
</popup>
</div>
</template>
<script lang="ts" setup name="supervisionSafetyWarningSignEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiSupervisionSafetyWarningSignAdd, apiSupervisionSafetyWarningSignEdit, apiSupervisionSafetyWarningSignDetail } from '@/api/supervision_safety_warning_sign'
import { timeFormat } from '@/utils/util'
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 popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--现场安全警示标志' : '新增工程监理--现场安全警示标志'
})
//
const formData = reactive({
id: '',
project_id: '',
project_name: "",
check_user: '',
check_date: '',
check_area: '',
problem_desc: '',
remark: '',
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 formRules = reactive<any>({
project_id: [{
required: true,
message: '请输入项目id',
trigger: ['blur']
}],
check_user: [{
required: true,
message: '请输入检查人',
trigger: ['blur']
}],
check_date: [{
required: true,
message: '请输入检查日期',
trigger: ['blur']
}],
check_area: [{
required: true,
message: '请输入检查地点',
trigger: ['blur']
}],
problem_desc: [{
required: true,
message: '请输入问题描述',
trigger: ['blur']
}],
remark: [{
required: true,
message: '请输入备注',
trigger: ['blur']
}]
})
const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
showDialog.value = false
}
//
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]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiSupervisionSafetyWarningSignDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiSupervisionSafetyWarningSignEdit(data)
: await apiSupervisionSafetyWarningSignAdd(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

@ -0,0 +1,122 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="检查人" prop="check_user">
<el-input class="w-[280px]" v-model="queryParams.check_user" clearable placeholder="请输入检查人" />
</el-form-item>
<el-form-item label="检查地点" prop="check_area">
<el-input class="w-[280px]" v-model="queryParams.check_area" clearable placeholder="请输入检查地点" />
</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>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/delete']"
:disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
<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="check_user" show-overflow-tooltip />
<el-table-column label="检查日期" prop="check_date" show-overflow-tooltip />
<el-table-column label="检查地点" prop="check_area" show-overflow-tooltip />
<el-table-column label="问题描述" prop="problem_desc" 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="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/edit']"
type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button v-perms="['supervision_dangerous.supervision_safety_warning_sign/delete']"
type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
</div>
</template>
<script lang="ts" setup name="supervisionSafetyWarningSignLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionSafetyWarningSignLists, apiSupervisionSafetyWarningSignDelete } from '@/api/supervision_safety_warning_sign'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const showEdit = ref(false)
//
const queryParams = reactive({
project_id: '',
check_user: '',
check_area: ''
})
//
const selectData = ref<any[]>([])
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
//
const { dictData } = useDictData('')
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiSupervisionSafetyWarningSignLists,
params: queryParams
})
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiSupervisionSafetyWarningSignDelete({ id })
getLists()
}
getLists()
</script>

View File

@ -1,7 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<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">
@ -17,7 +17,8 @@
</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-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>
@ -84,7 +85,8 @@
<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-select v-model="formData.side_station_result" clearable placeholder="请选择"
class="flex-1">
<el-option label="完成" value="0" />
<el-option label="交班" value="1" />
</el-select>
@ -144,17 +146,20 @@
</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)" />
@ -163,6 +168,7 @@
</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)" />
@ -177,12 +183,14 @@
<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"
@ -191,12 +199,14 @@
</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>

View File

@ -1,6 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -59,24 +60,28 @@
<template #default="{ row }">
<el-button @click="handleAdd()">+</el-button>
<el-button @click="handleDelete(row)">-</el-button>
</template>
</el-table-column> -->
</template>
</el-table-column> -->
<el-table-column label="材料名称" prop="name">
<template #default="scope">
<el-input v-model="scope.row.name" />
</template>
</el-table-column>
<el-table-column label="材料品牌" prop="brand">
<template #default="scope">
<el-input v-model="scope.row.brand" />
</template>
</el-table-column>
<el-table-column label="单位" prop="unit">
<template #default="{ row }">
<el-input v-model="row.unit" />
</template>
</el-table-column>
<el-table-column label="是否合同约定品牌" prop="contract_brand">
<template #default="{ row }">
<el-select class="flex-1" v-model="row.contract_brand" clearable placeholder="请选择">
<el-option label="否" :value="0" />
@ -85,16 +90,19 @@
</template>
</el-table-column>
<el-table-column label="型号" prop="model">
<template #default="{ row }">
<el-input v-model="row.model" />
</template>
</el-table-column>
<el-table-column label="进场数量" prop="entry_number">
<template #default="{ row }">
<el-input v-model="row.entry_number" />
</template>
</el-table-column>
<el-table-column label="取样数量" prop="num">
<template #default="{ row }">
<el-input v-model="row.num" />
</template>
@ -236,8 +244,9 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
formData.sampling_detail = formData.sampling_detail.map(item => ({ material_entry_detail_id: item.id, num: item.num }))
// formData.sampling_detail = formData.sampling_detail.map(item => ({ material_entry_detail_id: item.id, num: item.num }))
const data = { ...formData, }
data.sampling_detail = formData.sampling_detail.map(item => ({ material_entry_detail_id: item.id, num: item.num }))
mode.value == 'edit'
? await apiSupervisionWitnessSamplingEdit(data)
: await apiSupervisionWitnessSamplingAdd(data)

View File

@ -1,6 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -57,6 +58,7 @@
</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"
@ -65,12 +67,14 @@
</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="problem_name">
<template #default="{ row }">
<el-input v-model="row.problem_name" />
</template>
@ -101,6 +105,8 @@ const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
const handleAvatarSuccess_four = (response: any) => {
Array.isArray(formData.check_annex) ? "" : formData.check_annex = []
// @ts-ignore
response.code != 0 ? formData.check_annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
};
@ -115,14 +121,14 @@ const popupTitle = computed(() => {
const handleAdd1 = () => {
formData.check_problem.push({
"problem_cate": 0,
"problem_cate": '',
"problem_description": "",
"problem_name": ""
})
}
const handleDelete1 = async (row: any) => {
const index = formData.problem.indexOf(row);
formData.problem.splice(index, 1);
const index = formData.check_problem.indexOf(row);
formData.check_problem.splice(index, 1);
}

View File

@ -3,7 +3,8 @@
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="来源单据" prop="material_entry_id">
<el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable placeholder="请输入来源单据" />
<el-input class="w-[280px]" v-model="queryParams.material_entry_id" clearable
placeholder="请输入来源单据" />
</el-form-item>
<el-form-item label="编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编号" />
@ -21,7 +22,8 @@
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['supervision_work.supervision_witness_sampling/add']" type="primary" @click="handleAdd">
<el-button v-perms="['supervision_work.supervision_witness_sampling/add']" type="primary"
@click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
@ -40,12 +42,13 @@
<el-table-column label="进场数量" prop="entry_number" show-overflow-tooltip />
<el-table-column label="进场日期" prop="enter_time" show-overflow-tooltip />
<el-table-column label="检验结果" prop="check_result_text" show-overflow-tooltip />
<el-table-column label="问题数量" prop="check_result_text" show-overflow-tooltip />
<el-table-column label="回复数量" prop="check_result_text" show-overflow-tooltip />
<el-table-column label="问题数量" prop="problem_num" show-overflow-tooltip />
<el-table-column label="回复数量" prop="reply_num" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button v-perms="['supervision_work.supervision_witness_sampling/edit']" type="primary" link
@click="handleEdit(row)">
<el-button v-perms="['supervision_work.supervision_witness_sampling/edit']" type="primary"
link @click="handleEdit(row)">
检验结果
</el-button>
</template>
@ -127,4 +130,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
</script>

View File

@ -1,6 +1,7 @@
<template>
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
<popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
@close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-row>
<el-col :span="8">
@ -71,21 +72,23 @@
<el-col :span="8">
<el-form-item label="审核流程" prop="examine">
<el-select class="flex-1" v-model="formData.examine" clearable placeholder="请选择审核流程">
<el-option v-for="(item, index) in dictData.review_process " :key="index" :label="item.name"
:value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.review_process " :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="一级审核人" prop="one">
<el-input v-model="formData.one" clearable placeholder="请输入一级审核人" @click="userclick('one')" />
<el-input v-model="formData.one" clearable placeholder="请输入一级审核人"
@click="userclick('one')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="二级审核人" prop="two">
<el-input v-model="formData.two" clearable placeholder="请输入二级审核人" @click="userclick('two')" />
<el-input v-model="formData.two" clearable placeholder="请输入二级审核人"
@click="userclick('two')" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -149,8 +152,8 @@
<el-form-item label="造价依据" prop="according">
<!-- <el-input v-model="formData.according" clearable placeholder="请输入造价依据" /> -->
<el-select class="flex-1" v-model="formData.according" clearable placeholder="请选择造价依据">
<el-option v-for="(item, index) in dictData.cost_sentence " :key="index" :label="item.name"
:value="parseInt(item.value)" />
<el-option v-for="(item, index) in dictData.cost_sentence " :key="index"
:label="item.name" :value="parseInt(item.value)" />
</el-select>
</el-form-item>
</el-col>

6242
yarn.lock

File diff suppressed because it is too large Load Diff