修改 技术监督 查询流程问题

This commit is contained in:
GGJ
2024-08-22 15:59:15 +08:00
parent 439310e971
commit c0bd772b61
14 changed files with 179 additions and 59 deletions

View File

@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
import { DICT_DATA } from '@/stores/constant/cacheKey' import { DICT_DATA } from '@/stores/constant/cacheKey'
import type { DictData } from '@/stores/interface/index' import type { DictData } from '@/stores/interface/index'
import { reactive } from 'vue' import { reactive } from 'vue'
import { useAdminInfo } from '@/stores/adminInfo'
const adminInfo = useAdminInfo()
export const useDictData = defineStore( export const useDictData = defineStore(
'dictData', 'dictData',
@@ -28,13 +30,20 @@ export const useDictData = defineStore(
} }
const statusSelect = () => { const statusSelect = () => {
return [ if (adminInfo.deptLevel == 2) {
{ name: '待提交审批', id: 0 }, return [
{ name: '审批中', id: 1 }, { name: '审批中', id: 1 },
{ name: '审批通过', id: 2 }, { name: '审批通过', id: 2 }
{ name: '审批不通过', id: 3 }, ]
{ name: '已取消', id: 4 } } else {
] return [
{ name: '待提交审批', id: 0 },
{ name: '审批中', id: 1 },
{ name: '审批通过', id: 2 },
{ name: '审批不通过', id: 3 },
{ name: '已取消', id: 4 }
]
}
} }
return { return {

View File

@@ -4,7 +4,13 @@
<TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef"> <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
<template #select> <template #select>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -178,7 +184,7 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
provide('tableStore', tableStore) provide('tableStore', tableStore)
@@ -191,6 +197,11 @@ const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
return !(row.testRunState == 1 || row.testRunState == 2) return !(row.testRunState == 1 || row.testRunState == 2)
} }
}) })
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
/** 处理审批按钮 */ /** 处理审批按钮 */
const handleAudit = (instanceId: any, historyInstanceId: any) => { const handleAudit = (instanceId: any, historyInstanceId: any) => {
push({ push({

View File

@@ -12,7 +12,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select v-model="tableStore.table.params.status" multiple
collapse-tags
@change="changeStatus" placeholder="请选择流程状态">
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -205,7 +207,7 @@ const tableStore = new TableStore({
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
tableStore.table.params.supvType = '' tableStore.table.params.supvType = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
// 新增计划 // 新增计划
@@ -213,7 +215,11 @@ const add = () => {
// title.value = '普测计划新增' // title.value = '普测计划新增'
planAddRef.value.open('计划新增') planAddRef.value.open('计划新增')
} }
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
const exportFn = () => { const exportFn = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params)) let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1 form.pageNum = 1

View File

@@ -12,7 +12,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -220,10 +226,15 @@ const tableStore = new TableStore({
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
tableStore.table.params.supvType = '' tableStore.table.params.supvType = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
// 新增计划 // 新增计划
const add = (id: string) => { const add = (id: string) => {
planTestRef.value.open('计划测试填报', id, true) planTestRef.value.open('计划测试填报', id, true)

View File

@@ -137,7 +137,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item for="-" label="预测评估单位:" prop="evaluationDept"> <el-form-item for="-" label="预测评估单位:" prop="evaluationDept">
<el-select v-model="form.evaluationDept" placeholder="请选择预测评估单位"> <el-select v-model="form.evaluationDept" allow-create filterable placeholder="请选择预测评估单位">
<el-option <el-option
v-for="(item, index) in evaluationDeptList" v-for="(item, index) in evaluationDeptList"
:label="item.name" :label="item.name"

View File

@@ -16,7 +16,13 @@
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -38,7 +44,7 @@
<!-- 上传 --> <!-- 上传 -->
<Audit ref="AuditRef" @onSubmit="tableStore.index()" /> <Audit ref="AuditRef" @onSubmit="tableStore.index()" />
<!-- 查看详情 detail 新增/修改 create--> <!-- 查看详情 detail 新增/修改 create-->
<addForm ref="addForms" @onSubmit="tableStore.index()" ></addForm> <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, provide, watch } from 'vue' import { ref, onMounted, provide, watch } from 'vue'
@@ -81,7 +87,7 @@ const tableStore = new TableStore({
{ {
field: 'city', field: 'city',
title: '所在地市', title: '所在地市',
minWidth: 80, minWidth: 80
// formatter: (obj: any) => { // formatter: (obj: any) => {
// return areaOptionList.filter(item => item.id == obj.row.city)[0]?.name // return areaOptionList.filter(item => item.id == obj.row.city)[0]?.name
// } // }
@@ -235,13 +241,18 @@ tableStore.table.params.loadType = ''
tableStore.table.params.userName = '' tableStore.table.params.userName = ''
tableStore.table.params.fileUploadflag = '' tableStore.table.params.fileUploadflag = ''
tableStore.table.params.orgId = adminInfo.$state.deptId tableStore.table.params.orgId = adminInfo.$state.deptId
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
provide('tableStore', tableStore) provide('tableStore', tableStore)
// 新增 // 新增
const addList = () => { const addList = () => {
addRef.value.open() addRef.value.open()
} }
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
const addForms = ref() const addForms = ref()
const addFormModel = () => { const addFormModel = () => {

View File

@@ -4,7 +4,13 @@
<TableHeader date-picker nextFlag theCurrentTime> <TableHeader date-picker nextFlag theCurrentTime>
<template #select> <template #select>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -225,9 +231,13 @@ const tableStore = new TableStore({
} }
}) })
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
//新增退运终端信息 //新增退运终端信息
const add = () => { const add = () => {
deviceQuitPopup.value.open('新增监测点状态变更') deviceQuitPopup.value.open('新增监测点状态变更')

View File

@@ -4,7 +4,13 @@
<TableHeader date-picker nextFlag theCurrentTime> <TableHeader date-picker nextFlag theCurrentTime>
<template v-slot:select> <template v-slot:select>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -14,12 +20,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="搜索"> <el-form-item label="搜索">
<el-input <el-input
v-model="tableStore.table.params.searchValue" v-model="tableStore.table.params.searchValue"
placeholder="输入变电站、终端" placeholder="输入变电站、终端"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> </template>
<template #operation> <template #operation>
<el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button> <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
@@ -83,7 +89,7 @@ const tableStore = new TableStore({
2: 'danger', 2: 'danger',
3: 'warning', 3: 'warning',
4: 'info', 4: 'info',
null: 'primary' null: 'primary'
}, },
replaceValue: { replaceValue: {
0: '运行', 0: '运行',
@@ -105,7 +111,7 @@ const tableStore = new TableStore({
2: 'danger', 2: 'danger',
3: 'warning', 3: 'warning',
4: 'info', 4: 'info',
null: 'primary' null: 'primary'
}, },
replaceValue: { replaceValue: {
0: '运行', 0: '运行',
@@ -113,7 +119,7 @@ const tableStore = new TableStore({
2: '停运', 2: '停运',
3: '调试', 3: '调试',
4: '退运', 4: '退运',
null:'/' null: '/'
} }
}, },
{ {
@@ -220,10 +226,14 @@ const tableStore = new TableStore({
tableStore.table.params.deviceType = 1 tableStore.table.params.deviceType = 1
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id)
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
//新增退运终端信息 //新增退运终端信息
const add = () => { const add = () => {
deviceQuitPopup.value.open('新增终端状态变更') deviceQuitPopup.value.open('新增终端状态变更')

View File

@@ -2,7 +2,13 @@
<TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef"> <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
<template #select> <template #select>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -193,7 +199,7 @@ const tableStore = new TableStore({
render: 'buttons', render: 'buttons',
fixed: 'right', fixed: 'right',
buttons: [ buttons: [
{ {
name: 'productSetting', name: 'productSetting',
title: '查看报告', title: '查看报告',
type: 'primary', type: 'primary',
@@ -404,8 +410,12 @@ const cancelLeave = async (row: any) => {
// 加载数据 // 加载数据
tableStore.index() tableStore.index()
} }
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
provide('tableStore', tableStore) provide('tableStore', tableStore)
onMounted(() => { onMounted(() => {

View File

@@ -10,7 +10,9 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select v-model="tableStore.table.params.status" multiple
collapse-tags
@change="changeStatus" placeholder="请选择流程状态">
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -214,12 +216,16 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
tableStore.table.params.state = '' tableStore.table.params.state = ''
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
onMounted(() => { onMounted(() => {
tableStore.index() tableStore.index()
}) })

View File

@@ -10,7 +10,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -50,7 +56,7 @@ const flag = ref(false)
const TableHeaderRef = ref() const TableHeaderRef = ref()
const tableRef = ref() const tableRef = ref()
const statusSelect = dictData.statusSelect() const statusSelect = dictData.statusSelect()
statusSelect.push({ name: '同步台账成功', id: 5 })
const tableStore = new TableStore({ const tableStore = new TableStore({
url: '/supervision-boot/tempLinedebug/list', url: '/supervision-boot/tempLinedebug/list',
publicHeight: 65, publicHeight: 65,
@@ -216,14 +222,18 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
// tableStore.table.params.loadType = '' // tableStore.table.params.loadType = ''
// tableStore.table.params.userName = '' // tableStore.table.params.userName = ''
// tableStore.table.params.fileUploadflag = '' // tableStore.table.params.fileUploadflag = ''
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
const exportEvent = () => { const exportEvent = () => {
let form = JSON.parse(JSON.stringify(tableStore.table.params)) let form = JSON.parse(JSON.stringify(tableStore.table.params))
form.pageNum = 1 form.pageNum = 1

View File

@@ -10,7 +10,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -132,7 +138,7 @@ const tableStore = new TableStore({
showDisabled: row => { showDisabled: row => {
return row.createBy != adminInfo.$state.id || !(row.status == 0) return row.createBy != adminInfo.$state.id || !(row.status == 0)
}, },
disabled: row => { disabled: row => {
return !(row.status == 0) return !(row.status == 0)
}, },
@@ -181,11 +187,13 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
// tableStore.table.params.loadType = '' const changeStatus = e => {
// tableStore.table.params.userName = '' if (e.length == 0) {
// tableStore.table.params.fileUploadflag = '' tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
provide('tableStore', tableStore) provide('tableStore', tableStore)

View File

@@ -9,7 +9,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
@change="changeStatus"
collapse-tags
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -215,7 +221,7 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id)
tableStore.table.params.searchValue = '' tableStore.table.params.searchValue = ''
// tableStore.table.params.loadType = '' // tableStore.table.params.loadType = ''
// tableStore.table.params.userName = '' // tableStore.table.params.userName = ''
@@ -252,7 +258,11 @@ const cancelLeave = async (row: any) => {
// 加载数据 // 加载数据
tableStore.index() tableStore.index()
} }
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
//导出模板 //导出模板
const exportExcelTemplate = () => { const exportExcelTemplate = () => {
downloadDevTemplate().then((res: any) => { downloadDevTemplate().then((res: any) => {

View File

@@ -4,7 +4,13 @@
<TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef"> <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
<template #select> <template #select>
<el-form-item label="流程状态"> <el-form-item label="流程状态">
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态"> <el-select
v-model="tableStore.table.params.status"
multiple
collapse-tags
@change="changeStatus"
placeholder="请选择流程状态"
>
<el-option <el-option
v-for="item in statusSelect" v-for="item in statusSelect"
:key="item.id" :key="item.id"
@@ -245,10 +251,14 @@ const tableStore = new TableStore({
// tableStore.table.params.relationUserName = tableStore.table.params.userName // tableStore.table.params.relationUserName = tableStore.table.params.userName
} }
}) })
tableStore.table.params.status = '' tableStore.table.params.status = statusSelect.map(item => item.id) //[]
provide('tableStore', tableStore) provide('tableStore', tableStore)
const changeStatus = e => {
if (e.length == 0) {
tableStore.table.params.status = statusSelect.map(item => item.id)
}
}
onMounted(() => { onMounted(() => {
tableStore.index() tableStore.index()
}) })
@@ -369,8 +379,6 @@ const runTestSubmit = (type: number) => {
} }
}) })
} }
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>