|
|
@@ -6,24 +6,12 @@
|
|
|
<ContentWrap>
|
|
|
<!-- 搜索工作栏 -->
|
|
|
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
|
|
|
- <el-form-item label="地址" prop="address">
|
|
|
- <el-input placeholder="请输入地址" v-model="queryParams.address" />
|
|
|
+ <el-form-item label="PTW编号" prop="ptwNo">
|
|
|
+ <el-input placeholder="请输入PTW编号" v-model="queryParams.ptwNo" />
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="状态" prop="status">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.status"
|
|
|
- placeholder="请选择状态"
|
|
|
- clearable
|
|
|
- style="width: 180px"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_HAZARD_STATUS)"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
+ <el-form-item label="PTW序号" prop="ptwXh">
|
|
|
+ <el-input placeholder="请输入PTW序号" v-model="queryParams.ptwXh" />
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
@@ -52,22 +40,22 @@
|
|
|
height="calc(85vh - 130px)"
|
|
|
:show-overflow-tooltip="true"
|
|
|
>
|
|
|
- <el-table-column :label="t('monitor.serial')" width="70" align="center">
|
|
|
+ <el-table-column :label="t('monitor.serial')" width="70" align="center" fixed="left">
|
|
|
<template #default="scope">
|
|
|
{{ scope.$index + 1 }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column label="PTW编号" align="center" prop="ptwNo" width="100" />
|
|
|
- <el-table-column label="PTW序号" align="center" prop="ptwXh" width="100" />
|
|
|
+ <el-table-column label="PTW编号" align="center" prop="ptwNo" width="100" fixed="left" />
|
|
|
+ <el-table-column label="PTW序号" align="center" prop="ptwXh" width="100" fixed="left" />
|
|
|
|
|
|
<el-table-column label="时间" align="center" show-overflow-tooltip>
|
|
|
<template #default="{ row }">
|
|
|
- {{ formatDate(row.ptwTime) }}
|
|
|
+ {{ formatDate(row.ptwTime).substring(0, 10) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column label="作业票类型" align="center">
|
|
|
+ <el-table-column label="作业票类型" align="center" width="120">
|
|
|
<template #default="{ row }">
|
|
|
<dict-tag :type="DICT_TYPE.QHSE_PTW_TYPE" :value="row.ptwType" />
|
|
|
</template>
|
|
|
@@ -174,8 +162,8 @@
|
|
|
label-width="120px"
|
|
|
v-loading="formLoading"
|
|
|
>
|
|
|
- <el-form-item label="JSA序号" prop="ptwNo">
|
|
|
- <el-input v-model="formData.ptwNo" disabled placeholder="选择JSA序号" style="width: 300px">
|
|
|
+ <el-form-item label="JSA编号" prop="ptwNo">
|
|
|
+ <el-input v-model="formData.ptwNo" disabled placeholder="选择JSA编号" style="width: 300px">
|
|
|
<template #append>
|
|
|
<el-link @click="selectJSA" :underline="false">选择</el-link>
|
|
|
</template>
|
|
|
@@ -206,7 +194,11 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="作业分级" prop="ptwGrade">
|
|
|
+ <el-form-item
|
|
|
+ label="作业分级"
|
|
|
+ prop="ptwGrade"
|
|
|
+ v-if="formData.ptwType === '1' || formData.ptwType === '4' || formData.ptwType === '3'"
|
|
|
+ >
|
|
|
<el-select v-model="formData.ptwGrade" placeholder="请选择作业分级">
|
|
|
<el-option
|
|
|
v-for="item in getDictOptions(DICT_TYPE.QHSE_PTW_GRADE)"
|
|
|
@@ -235,21 +227,39 @@
|
|
|
<el-input
|
|
|
v-model="formData.workPerson"
|
|
|
disabled
|
|
|
- placeholder="作业人员"
|
|
|
+ placeholder="请选择作业人员"
|
|
|
style="width: 300px"
|
|
|
>
|
|
|
<template #append>
|
|
|
- <el-link @click="selectworkPerson" :underline="false">选择</el-link>
|
|
|
+ <el-link @click="selectworkPerson('workPerson')" :underline="false">选择</el-link>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="监护人" prop="guardian">
|
|
|
- <el-input v-model="formData.guardian" placeholder="请输入监护人" />
|
|
|
+ <el-input
|
|
|
+ v-model="formData.guardian"
|
|
|
+ disabled
|
|
|
+ placeholder="请选择监护人"
|
|
|
+ style="width: 300px"
|
|
|
+ >
|
|
|
+ <template #append>
|
|
|
+ <el-link @click="selectworkPerson('guardian')" :underline="false">选择</el-link>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="作业负责人" prop="workDuty">
|
|
|
- <el-input v-model="formData.workDuty" placeholder="请输入作业负责人" />
|
|
|
+ <el-input
|
|
|
+ v-model="formData.workDuty"
|
|
|
+ disabled
|
|
|
+ placeholder="请选择作业负责人"
|
|
|
+ style="width: 300px"
|
|
|
+ >
|
|
|
+ <template #append>
|
|
|
+ <el-link @click="selectworkPerson('workDuty')" :underline="false">选择</el-link>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="附件" prop="file">
|
|
|
@@ -305,7 +315,7 @@
|
|
|
</Dialog>
|
|
|
|
|
|
<!-- 选择作业人员对话框 -->
|
|
|
- <Dialog title="选择作业人员" v-model="personDialogVisible" width="60%">
|
|
|
+ <Dialog :title="personDialog" v-model="personDialogVisible" width="60%">
|
|
|
<ContentWrap>
|
|
|
<!-- 搜索工作栏 -->
|
|
|
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true">
|
|
|
@@ -518,7 +528,7 @@ import { formatDate } from '@/utils/formatTime'
|
|
|
import { useUserStore } from '@/store/modules/user'
|
|
|
import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
|
|
|
import FilePreviewDialog from '@/components/FilePreview/src/FilePreviewDialog.vue'
|
|
|
-import { DICT_TYPE, getStrDictOptions, getDictOptions } from '@/utils/dict'
|
|
|
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
|
|
|
import { getUserProfile } from '@/api/system/user/profile'
|
|
|
const userStore = useUserStore()
|
|
|
defineOptions({ name: 'IotQHSEPTW' })
|
|
|
@@ -536,8 +546,8 @@ const total = ref(0) // 列表的总页数
|
|
|
const queryParams = reactive({
|
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
|
- deptId: '',
|
|
|
- address: ''
|
|
|
+ ptwXh: '',
|
|
|
+ ptwNo: ''
|
|
|
})
|
|
|
|
|
|
const queryParams2 = reactive({
|
|
|
@@ -884,6 +894,7 @@ const getCertList = async () => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+let personType = ref('')
|
|
|
const confirmSelectMeasure = () => {
|
|
|
if (!selectedPerson.value) {
|
|
|
ElMessage.warning('请先选择一个计量器具')
|
|
|
@@ -891,13 +902,33 @@ const confirmSelectMeasure = () => {
|
|
|
}
|
|
|
|
|
|
// 将选中的仪器信息填入表单
|
|
|
- formData.value.workPerson = selectedPerson.value
|
|
|
+ if (personType.value == 'workPerson') {
|
|
|
+ formData.value.workPerson = selectedPerson.value
|
|
|
+ }
|
|
|
+
|
|
|
+ if (personType.value == 'guardian') {
|
|
|
+ formData.value.guardian = selectedPerson.value
|
|
|
+ }
|
|
|
+
|
|
|
+ if (personType.value == 'workDuty') {
|
|
|
+ formData.value.workDuty = selectedPerson.value
|
|
|
+ }
|
|
|
|
|
|
// 关闭选择仪器对话框
|
|
|
personDialogVisible.value = false
|
|
|
selectedPerson.value = undefined
|
|
|
}
|
|
|
-const selectworkPerson = () => {
|
|
|
+
|
|
|
+let personDialog = ref('')
|
|
|
+const selectworkPerson = (type) => {
|
|
|
+ personType.value = type
|
|
|
+ if (type == 'workPerson') {
|
|
|
+ personDialog.value = '选择作业人员'
|
|
|
+ } else if (type == 'guardian') {
|
|
|
+ personDialog.value = '选择监护人'
|
|
|
+ } else if (type == 'workDuty') {
|
|
|
+ personDialog.value = '选择作业负责人'
|
|
|
+ }
|
|
|
personDialogVisible.value = true
|
|
|
getCertList()
|
|
|
}
|
