修改 查看详情 返回页面刷新

This commit is contained in:
GGJ
2024-06-04 18:06:17 +08:00
parent eb62676b5d
commit 9ee495f40d
13 changed files with 404 additions and 278 deletions

View File

@@ -20,7 +20,13 @@
label-position="right"
>
<el-form-item label="原因:" prop="reason">
<el-input v-model="form.reason" autocomplete="off" placeholder="请输入原因" />
<el-input
v-model="form.reason"
autocomplete="off"
:autosize="{ minRows: 2, maxRows: 4 }"
type="textarea"
placeholder="请输入原因"
/>
</el-form-item>
</el-form>
<template #footer>
@@ -37,10 +43,10 @@ import { useDictData } from '@/stores/dictData'
import { useAdminInfo } from '@/stores/adminInfo'
import { addMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
const emits = defineEmits(['onSubmit'])
const props=defineProps({
debugId:{
type:String,
default:''
const props = defineProps({
debugId: {
type: String,
default: ''
}
})
const dictData = useDictData()
@@ -52,7 +58,7 @@ const selectFormType = ref('')
selectFormType.value = '0'
const resetForm = () => {
form.value = {
reason: '', //填报人
reason: '' //填报人
}
}
//初始化数据
@@ -101,9 +107,9 @@ const confirmForm = () => {
ruleFormRef.value.validate(valid => {
if (valid) {
//提交监测点联调信息
form.value={
form.value = {
...form.value,
id:props.debugId
id: props.debugId
}
addMointorPointTempLinedebug(form.value).then(res => {
ruleFormRef.value.resetFields()
@@ -118,4 +124,3 @@ const confirmForm = () => {
}
defineExpose({ open })
</script>

View File

@@ -27,7 +27,7 @@
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -42,14 +42,8 @@ import { cancelMointorPointFormData } from '@/api/supervision-boot/monitorpoint/
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, beforeEach } = useRouter()
beforeEach((to, from) => {
if (from.path == '/bpm/instanceDetail') {
if (to.path == '/admin/terminalNetwotk') {
console.log('监测点2222')
}
}
})
const { push, options, currentRoute } = useRouter()
const flag = ref(false)
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
@@ -107,6 +101,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -205,6 +200,18 @@ const exportEvent = () => {
onMounted(() => {
tableStore.index()
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {

View File

@@ -12,7 +12,7 @@
<addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</template>
<script setup lang="ts">
import { ref, onMounted, provide, nextTick } from 'vue'
import { ref, onMounted, provide, watch } from 'vue'
import TableStore from '@/utils/tableStore'
import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
@@ -27,20 +27,15 @@ import { useAdminInfo } from '@/stores/adminInfo'
//获取登陆用户姓名和部门
const adminInfo = useAdminInfo()
const dictData = useDictData()
const { push, beforeEach } = useRouter()
beforeEach((to, from) => {
if (from.path == '/bpm/instanceDetail') {
if (to.path == '/admin/terminalNetwotk') {
console.log('终端1111')
}
}
})
const { push, options, currentRoute } = useRouter()
const TableHeaderRef = ref()
const tableRef = ref()
const areaOptionList = dictData.getBasicData('jibei_area')
const ruleFormRef = ref()
const show: any = ref(false)
const fileList = ref([])
const flag = ref(false)
const tableStore = new TableStore({
url: '/supervision-boot/deVReport/list',
publicHeight: 65,
@@ -137,6 +132,7 @@ const tableStore = new TableStore({
icon: 'el-icon-EditPen',
render: 'basicButton',
click: row => {
flag.value = true
handleAudit(row.processInstanceId, row.historyInstanceId)
}
},
@@ -233,6 +229,18 @@ onMounted(() => {
tableStore.index()
})
watch(
() => currentRoute.value.path,
() => {
if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
tableStore.index()
flag.value = false
}
},
{
deep: true
}
)
/** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({