添加填报人

This commit is contained in:
zhujiyan
2024-06-05 15:08:24 +08:00
parent fa4ce4693e
commit a66734a9f9
26 changed files with 235 additions and 44 deletions

View File

@@ -43,12 +43,8 @@ const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
const statusSelect = dictData.statusSelect()
const ruleFormRef = ref()
const show: any = ref(false)
const fileList = ref([])
const tableStore = new TableStore({
url: '/supervision-boot/tempLinedebug/list',
@@ -76,6 +72,14 @@ const tableStore = new TableStore({
{ field: 'lineId', title: '监测点编号', minWidth: 170 },
// { field: 'monitoringTerminalCode', title: '监测终端编码', minWidth: 170 },
{ field: 'monitoringTerminalName', title: '监测终端名称', minWidth: 170 },
{
field: 'createBy',
title: '填报人',
minWidth: 80,
formatter: (row: any) => {
return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
}
},
{
field: 'status',
title: '审核状态',

View File

@@ -68,7 +68,14 @@ const tableStore = new TableStore({
{ field: 'monitoringTerminalName', title: '所属装置', minWidth: 170 },
{ field: 'lineName', title: '监测点名称', minWidth: 150 },
{ field: 'reportDate', title: '填报日期', minWidth: 150 },
{ field: 'reporter', title: '填报人', minWidth: 80 },
{
field: 'createBy',
title: '填报人',
minWidth: 80,
formatter: (row: any) => {
return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
}
},
{
field: 'status',
title: '审核状态',
@@ -111,9 +118,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return (
row.createBy != adminInfo.$state.id || row.status !=3
)
return row.createBy != adminInfo.$state.id || row.status != 3
},
click: row => {
addForms.value.open({
@@ -129,7 +134,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status !=1
return row.createBy != adminInfo.$state.id || row.status != 1
},
click: row => {
cancelLeave(row)

View File

@@ -40,7 +40,6 @@ import { useAdminInfo } from '@/stores/adminInfo'
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
@@ -76,7 +75,14 @@ const tableStore = new TableStore({
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
{ field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
{ field: 'reportDate', title: '填报日期', minWidth: 170 },
{ field: 'reporter', title: '填报人', minWidth: 80 },
{
field: 'createBy',
title: '填报人',
minWidth: 80,
formatter: (row: any) => {
return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
}
},
{
field: 'status',
title: '审核状态',