Web/admin-sjzx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 重新发起 按钮显示逻辑

Browse Source
This commit is contained in:
GGJ
2024-06-18 13:36:24 +08:00
parent f33aed9b89
commit 16f0a9fa5a
15 changed files with 71 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/app.scss
View File

@@ -381,7 +381,7 @@ body,
height: 100%;
width: 100%;
background: #fff;
z-index: 2;
// z-index: 2;
}
.bjs-powered-by {
display: none;

2
src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
View File

@@ -145,7 +145,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status == 1 || row.status == 2
return !(row.createBy == adminInfo.$state.id || row.status == 3 || row.status == 4)
},
click: row => {
// deviceQuitPopup.value.open('重新发起退运', row)

4
src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
View File

@@ -162,7 +162,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 1 || row.status == 2
return !(row.createBy == adminInfo.$state.id|| row.status == 6 || row.status == 3 || row.status == 4)
},
click: row => {
planTestRef.value.open('重新发起计划测试', row.id, false)
@@ -175,7 +175,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status == 6 || row.status == 2 || row.status == 3 || row.status == 4
return !(row.createBy == adminInfo.$state.id|| row.status == 1 )
},
click: row => {
cancelLeave(row)

2
src/views/pqs/supervise/interfere/components/normalizationManager/components/detailsItem.vue
View File

@@ -16,7 +16,7 @@ onMounted(() => {
</script>
<style lang="less" scoped>
.details_item {
width: 50%;
width: 48%;
height: 40px;
display: flex;
.left_title {

2
src/views/pqs/supervise/interfere/components/undocumented/index.vue
View File

@@ -165,7 +165,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 || row.status == 4)
},
click: row => {
addForms.value.open({

34
src/views/pqs/supervise/plan/index.vue
View File

@@ -2,18 +2,18 @@
<template>
<div class="default-main">
<TableHeader area datePicker ref="TableHeaderRef">
<template #select>
<el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #select>
<el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
<!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
@@ -195,7 +195,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id ||row.status!=3
return row.createBy != adminInfo.$state.id || row.status != 3
},
click: row => {
handleEffectProblem(row)
@@ -221,7 +221,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 || row.status == 4)
},
click: row => {
addForms.value.open({
@@ -237,7 +237,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return row.createBy != adminInfo.$state.id || row.status != 1||!row.processInstanceId
return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
},
click: row => {
cancelLeave(row)
@@ -268,8 +268,8 @@ const tableStore = new TableStore({
click: row => {
router.push({
name: 'supervision/supervision/manage',
state:{
type:1
state: {
type: 1
}
})
}

2
src/views/pqs/supervise/retire/monitor.vue
View File

@@ -133,7 +133,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 || row.status == 4)
},
click: row => {
deviceQuitPopup.value.open('重新发起退运', row)

2
src/views/pqs/supervise/retire/terminal.vue
View File

@@ -157,7 +157,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 || row.status == 4)
},
click: row => {
deviceQuitPopup.value.open('重新发起终端状态变更', row)

2
src/views/pqs/supervise/technology/components/alarm.vue
View File

@@ -162,7 +162,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 || row.status == 4)
},
click: row => {
// deviceQuitPopup.value.open('重新发起', row)

2
src/views/pqs/supervise/technology/components/earlyWarn.vue
View File

@@ -139,7 +139,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 || row.status == 4)
},
click: row => {
// deviceQuitPopup.value.open('重新发起', row)

2
src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
View File

@@ -133,7 +133,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open',
render: 'basicButton',
disabled: row => {
return !(row.status == 3 || row.status == 4)
return !(row.createBy == adminInfo.$state.id|| row.status == 3 || row.status == 4)
},
click: row => {
FormRef.value.open('重新发起', row)

2
src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
View File

@@ -150,7 +150,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 || row.status == 4)
},
click: row => {
debugForms.value.open('重新发起', row)

26
src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
View File

@@ -1,7 +1,7 @@
<!---终端入网检测-->
<template>
<TableHeader area datePicker nextFlag ref="TableHeaderRef">
<template #select>
<template #select>
<el-form-item label="搜索">
<el-input
v-model="tableStore.table.params.searchValue"
@@ -9,16 +9,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
<el-option
v-for="item in statusSelect"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
@@ -125,7 +125,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 || row.status == 4)
},
click: row => {
addForms.value.open({
@@ -156,7 +156,7 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName
}
})
tableStore.table.params.status=''
tableStore.table.params.status = ''
tableStore.table.params.searchValue = ''
// tableStore.table.params.loadType = ''
// tableStore.table.params.userName = ''

2
src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
View File

@@ -169,7 +169,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 || row.status == 4)
},
click: row => {
addForms.value.open({

63
src/views/pqs/supervise/testRun/index.vue
View File

@@ -1,7 +1,7 @@
<!---试运行列表-->
<template>
<div class="default-main">
<TableHeader area datePicker ref='TableHeaderRef'>
<TableHeader area datePicker ref="TableHeaderRef">
<template #select>
<el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -15,10 +15,10 @@
</el-form-item>
</template>
<template #operation>
<el-button icon='el-icon-Plus' type='primary' @click='startRunTest'>试运行</el-button>
<el-button icon="el-icon-Plus" type="primary" @click="startRunTest">试运行</el-button>
</template>
</TableHeader>
<Table ref='tableRef' />
<Table ref="tableRef" :checkbox-config="checkboxConfig" />
<!-- <el-dialog
v-model='timeDialog'
@@ -33,7 +33,7 @@
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
range-separator="至"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
@@ -45,8 +45,8 @@
</el-dialog>-->
</div>
</template>
<script setup lang='ts'>
import { ref, onMounted, provide, nextTick } from 'vue'
<script setup lang="ts">
import { ref, onMounted, provide, reactive } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -55,9 +55,7 @@ import { useDictData } from '@/stores/dictData'
import { ElMessage, ElMessageBox } from 'element-plus'
import { addRunTest } from '@/api/supervision-boot/lineRunTest'
import { formatDate } from '@/utils/formatTime'
import { VxeTablePropTypes } from 'vxe-table'
const dictData = useDictData()
const statusSelect = dictData.statusSelect()
const { push } = useRouter()
@@ -95,12 +93,12 @@ const tableStore = new TableStore({
null: '待试运行'
}
},
{
field: 'testRunTime',
title: '试运行时间范围',
{
field: 'testRunTime',
title: '试运行时间范围',
minWidth: 260,
formatter:(row)=>{
return row.cellValue?row.cellValue:'/'
formatter: row => {
return row.cellValue ? row.cellValue : '/'
}
},
{
@@ -138,14 +136,13 @@ const tableStore = new TableStore({
render: 'buttons',
buttons: [
{
name: 'productSetting',
title: '流程详情',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
handleAudit(row.processInstanceId,row.historyInstanceId)
handleAudit(row.processInstanceId, row.historyInstanceId)
},
disabled: row => {
return row.testRunState != 2
@@ -153,7 +150,6 @@ const tableStore = new TableStore({
},
{
name: 'productSetting',
title: '重新试运行',
type: 'primary',
@@ -168,7 +164,6 @@ const tableStore = new TableStore({
return row.status != 3
}
}
]
}
],
@@ -179,18 +174,21 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName
}
})
tableStore.table.params.status=''
tableStore.table.params.status = ''
provide('tableStore', tableStore)
onMounted(() => {
tableStore.index()
})
const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
labelField: '',
checkMethod: ({ row }) => {
return !(row.testRunState == 1 || row.testRunState == 2)
}
})
/** 处理审批按钮 */
const handleAudit = (instanceId: any,historyInstanceId:any) => {
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({
name: 'BpmProcessInstanceDetail',
state: {
@@ -221,7 +219,6 @@ const startRunTest = () => {
}
})
if (!flag) {
return ElMessage({
message: '请选择未试运行的监测点进行试运行',
@@ -233,14 +230,14 @@ const startRunTest = () => {
ElMessageBox.confirm('是否确认执行72小时监测点试运行？', '试运行', {
confirmButtonText: '确 认',
cancelButtonText: '取 消'
}).then(() => {
runTestSubmit(0)
})
.then(() => {
runTestSubmit(0)
})
.catch(() => console.info('操作取消'))
}
const runTestSubmit = (type:number) => {
const runTestSubmit = (type: number) => {
const start = new Date()
start.setDate(start.getDate() + 1)
start.setHours(0, 0, 0)
@@ -249,12 +246,12 @@ const runTestSubmit = (type:number) => {
end.setDate(end.getDate() + 3)
end.setHours(23, 59, 59)
const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD 格式
const endString = formatDate(end,'YYYY-MM-DD')
const endString = formatDate(end, 'YYYY-MM-DD')
const data = {
startTime: startString,
endTime: endString,
lineIds: monitorIds,
operateType:type
operateType: type
}
addRunTest(data).then((res: any) => {
if (res.code === 'A0000') {
@@ -266,10 +263,6 @@ const runTestSubmit = (type:number) => {
}
})
}
</script>
<style scoped lang='scss'>
</style>
<style scoped lang="scss"></style>