diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts index b6c115c..cbc4a70 100644 --- a/src/views/device/deviceMaintenance/checkList_interface.ts +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -18,7 +18,7 @@ managerPoinLocation: string // 管理点位置 remark: string // 备注 updateTime: null | string // 更新时间 - approvalStatusName: string // 审批状态名称 + approvalStatusName?: string // 审批状态名称 } // 标准配套设备表头类型 export interface columnsType { diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts index b6c115c..cbc4a70 100644 --- a/src/views/device/deviceMaintenance/checkList_interface.ts +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -18,7 +18,7 @@ managerPoinLocation: string // 管理点位置 remark: string // 备注 updateTime: null | string // 更新时间 - approvalStatusName: string // 审批状态名称 + approvalStatusName?: string // 审批状态名称 } // 标准配套设备表头类型 export interface columnsType { diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue index a236a10..747971d 100644 --- a/src/views/device/deviceMaintenance/components/listApproval.vue +++ b/src/views/device/deviceMaintenance/components/listApproval.vue @@ -269,10 +269,6 @@ const approvalSuccess = () => { fetchData(true) } -// 审批弹窗关闭 -const handleClose = () => { - applyShow.value = false -} // 点击数据后的操作按钮 const clickBtn = (row: IlistApproval, buttonType: string) => { @@ -312,10 +308,7 @@ fetchData(false) }, { immediate: true }) -// 导出id类型 -interface ISupplierTable { - id: never -} + // 打印列表 function printList() { // 打印列 diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts index b6c115c..cbc4a70 100644 --- a/src/views/device/deviceMaintenance/checkList_interface.ts +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -18,7 +18,7 @@ managerPoinLocation: string // 管理点位置 remark: string // 备注 updateTime: null | string // 更新时间 - approvalStatusName: string // 审批状态名称 + approvalStatusName?: string // 审批状态名称 } // 标准配套设备表头类型 export interface columnsType { diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue index a236a10..747971d 100644 --- a/src/views/device/deviceMaintenance/components/listApproval.vue +++ b/src/views/device/deviceMaintenance/components/listApproval.vue @@ -269,10 +269,6 @@ const approvalSuccess = () => { fetchData(true) } -// 审批弹窗关闭 -const handleClose = () => { - applyShow.value = false -} // 点击数据后的操作按钮 const clickBtn = (row: IlistApproval, buttonType: string) => { @@ -312,10 +308,7 @@ fetchData(false) }, { immediate: true }) -// 导出id类型 -interface ISupplierTable { - id: never -} + // 打印列表 function printList() { // 打印列 diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue index 2d86a98..6229abf 100644 --- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue +++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue @@ -17,7 +17,7 @@ const props = defineProps({ status: { type: String, - default: '0', + default: '', }, buttons: { type: Array as PropType, @@ -30,11 +30,7 @@ const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1} // 操作列宽度-计算属性 const operationWidth = computed(() => { - // 审批中状态时候长度返回错误 - if (props.status === '3' || props.status === '6') { - props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度 - } - return props.buttons.length * 40 + 23 + return props.buttons.length * 40 + 20 }) // 获取字典值 async function getDict() { @@ -139,7 +135,6 @@ checkoutList.value = e.map((item: { id: string }) => item.id) } -const buttonTypeMap = ref('') // 点击删除 const handleDelete = (row: IlistApproval) => { ElMessageBox.confirm( @@ -243,12 +238,10 @@ } // 驳回后编辑 const editAgain = (row: IlistApproval) => { - $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`) + $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`) } // 跳转到详情 const goDetail = (row: IlistApproval, type: string) => { - console.log('-----') - $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`) } // 获取到组织信息 @@ -297,7 +290,12 @@ approvalSubmit(row) break case '编辑': - goDetail(row, 'edit') + if (row.approvalStatusName === '未通过-驳回') { + editAgain(row) + } + else { + goDetail(row, 'edit') + } break case '同意': approvalDialog.value.initDialog('agree', row.taskId) @@ -322,9 +320,10 @@ () => props.status, (newVal: string) => { listQuery.value.approvalStatus = newVal + window.sessionStorage.setItem('maintenceListApprovalStatus', newVal) fetchData(false) }, - { immediate: true }) +) // 打印列表 function printList() { @@ -347,19 +346,14 @@ } } onMounted(async () => { - console.log(sessionStorage.getItem('maintenceListApprovalStatus')) - - // await getDict() - // if (sessionStorage.getItem('maintenceListApprovalStatus')) { - // listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')! - // console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!]) - // } - // else { - // console.log('没有') - - // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] - // } - // fetchData(true) + await getDict() + if (window.sessionStorage.getItem('maintenceListApprovalStatus')) { + listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')! + } + else { + listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] + } + fetchData(true) }) @@ -483,7 +477,7 @@ 取消 - 删除 + --> + + + 删除 diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts index b6c115c..cbc4a70 100644 --- a/src/views/device/deviceMaintenance/checkList_interface.ts +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -18,7 +18,7 @@ managerPoinLocation: string // 管理点位置 remark: string // 备注 updateTime: null | string // 更新时间 - approvalStatusName: string // 审批状态名称 + approvalStatusName?: string // 审批状态名称 } // 标准配套设备表头类型 export interface columnsType { diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue index a236a10..747971d 100644 --- a/src/views/device/deviceMaintenance/components/listApproval.vue +++ b/src/views/device/deviceMaintenance/components/listApproval.vue @@ -269,10 +269,6 @@ const approvalSuccess = () => { fetchData(true) } -// 审批弹窗关闭 -const handleClose = () => { - applyShow.value = false -} // 点击数据后的操作按钮 const clickBtn = (row: IlistApproval, buttonType: string) => { @@ -312,10 +308,7 @@ fetchData(false) }, { immediate: true }) -// 导出id类型 -interface ISupplierTable { - id: never -} + // 打印列表 function printList() { // 打印列 diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue index 2d86a98..6229abf 100644 --- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue +++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue @@ -17,7 +17,7 @@ const props = defineProps({ status: { type: String, - default: '0', + default: '', }, buttons: { type: Array as PropType, @@ -30,11 +30,7 @@ const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1} // 操作列宽度-计算属性 const operationWidth = computed(() => { - // 审批中状态时候长度返回错误 - if (props.status === '3' || props.status === '6') { - props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度 - } - return props.buttons.length * 40 + 23 + return props.buttons.length * 40 + 20 }) // 获取字典值 async function getDict() { @@ -139,7 +135,6 @@ checkoutList.value = e.map((item: { id: string }) => item.id) } -const buttonTypeMap = ref('') // 点击删除 const handleDelete = (row: IlistApproval) => { ElMessageBox.confirm( @@ -243,12 +238,10 @@ } // 驳回后编辑 const editAgain = (row: IlistApproval) => { - $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`) + $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`) } // 跳转到详情 const goDetail = (row: IlistApproval, type: string) => { - console.log('-----') - $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`) } // 获取到组织信息 @@ -297,7 +290,12 @@ approvalSubmit(row) break case '编辑': - goDetail(row, 'edit') + if (row.approvalStatusName === '未通过-驳回') { + editAgain(row) + } + else { + goDetail(row, 'edit') + } break case '同意': approvalDialog.value.initDialog('agree', row.taskId) @@ -322,9 +320,10 @@ () => props.status, (newVal: string) => { listQuery.value.approvalStatus = newVal + window.sessionStorage.setItem('maintenceListApprovalStatus', newVal) fetchData(false) }, - { immediate: true }) +) // 打印列表 function printList() { @@ -347,19 +346,14 @@ } } onMounted(async () => { - console.log(sessionStorage.getItem('maintenceListApprovalStatus')) - - // await getDict() - // if (sessionStorage.getItem('maintenceListApprovalStatus')) { - // listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')! - // console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!]) - // } - // else { - // console.log('没有') - - // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] - // } - // fetchData(true) + await getDict() + if (window.sessionStorage.getItem('maintenceListApprovalStatus')) { + listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')! + } + else { + listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] + } + fetchData(true) }) @@ -483,7 +477,7 @@ 取消 - 删除 + --> + + + 删除 diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts index de38a57..8120747 100644 --- a/src/api/device/receive.ts +++ b/src/api/device/receive.ts @@ -80,3 +80,12 @@ data, }) } + +// 设备领用、借用-未通过-驳回编辑 +export function failUpdateEquipmentApply(data: object) { + return request({ + url: '/equipmentApply/failUpdate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts index 1c3ae09..cb7dee6 100644 --- a/src/api/measure/source.ts +++ b/src/api/measure/source.ts @@ -64,7 +64,7 @@ }) } // 驳回后编辑接口 -export function updateSourceApproval(data: object) { +export function failUpdateSourceApproval(data: object) { return request({ url: '/meter/supplier/failUpdate', method: 'post', diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts index 64a02ff..3911d5b 100644 --- a/src/router/modules/measure.ts +++ b/src/router/modules/measure.ts @@ -411,7 +411,7 @@ }, }, { - path: ':type/:id?', + path: ':type/:id?/:processId?', name: 'ListSourceAdd', component: () => import('@/views/measure/source/listAdd.vue'), meta: { diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue index 17040fc..c81ef0b 100644 --- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue +++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue @@ -357,7 +357,7 @@ addReport(formInline.value).then((res) => { if (res.code === 200) { ElMessage.success('保存成功') - addId.value = res.data.id + addId.value = res.data.data } }) }) @@ -706,7 +706,7 @@ - + - + ([]) // 右上角菜单组 const buttonsSet: { [key: string]: IButton[] } = { 全部: [{ name: '查看', type: 'primary' }, - { name: '同意', type: 'primary' }, - { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } }, - { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } }, + { name: '编辑', type: 'primary' }, { name: '取消', type: 'info' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 草稿箱: [ { name: '查看', type: 'primary' }, { name: '编辑', type: 'primary' }, { name: '提交', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 待审批: [ { name: '查看', type: 'primary' }, @@ -28,19 +26,22 @@ ], 审批中: [ { name: '查看', type: 'primary' }, + { name: '删除', type: 'danger' }, + { name: '取消', type: 'info' }, ], 已通过: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + // { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 未通过: [ { name: '查看', type: 'primary' }, - { name: '编辑', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], 已取消: [ { name: '查看', type: 'primary' }, - { name: '删除', type: 'danger' }, + { name: '编辑', type: 'primary' }, + { name: '提交', type: 'primary' }, + { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' }, ], } // 操作按钮组 diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue index 207663f..c47d53e 100644 --- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue +++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue @@ -31,7 +31,7 @@ const { proxy } = getCurrentInstance() as any // 操作列宽度-计算属性 const operationWidth = computed(() => { - return props.buttons.length * 40 + 24 + return props.buttons.length * 40 + 20 }) const mesureCategoryList = ref([]) // 校检类别 // 查询条件 @@ -153,8 +153,8 @@ .then(() => { cancelApproval(params).then(() => { ElMessage.success('已取消') + fetchData(true) }) - fetchData(true) }) } @@ -380,7 +380,7 @@ diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue index 28555d7..e37bc6a 100644 --- a/src/views/device/borrow/borrwoApply.vue +++ b/src/views/device/borrow/borrwoApply.vue @@ -431,7 +431,7 @@ } onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') { + if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('buttonBoxActive')! } else { diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts index b6c115c..cbc4a70 100644 --- a/src/views/device/deviceMaintenance/checkList_interface.ts +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -18,7 +18,7 @@ managerPoinLocation: string // 管理点位置 remark: string // 备注 updateTime: null | string // 更新时间 - approvalStatusName: string // 审批状态名称 + approvalStatusName?: string // 审批状态名称 } // 标准配套设备表头类型 export interface columnsType { diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue index a236a10..747971d 100644 --- a/src/views/device/deviceMaintenance/components/listApproval.vue +++ b/src/views/device/deviceMaintenance/components/listApproval.vue @@ -269,10 +269,6 @@ const approvalSuccess = () => { fetchData(true) } -// 审批弹窗关闭 -const handleClose = () => { - applyShow.value = false -} // 点击数据后的操作按钮 const clickBtn = (row: IlistApproval, buttonType: string) => { @@ -312,10 +308,7 @@ fetchData(false) }, { immediate: true }) -// 导出id类型 -interface ISupplierTable { - id: never -} + // 打印列表 function printList() { // 打印列 diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue index 2d86a98..6229abf 100644 --- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue +++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue @@ -17,7 +17,7 @@ const props = defineProps({ status: { type: String, - default: '0', + default: '', }, buttons: { type: Array as PropType, @@ -30,11 +30,7 @@ const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1} // 操作列宽度-计算属性 const operationWidth = computed(() => { - // 审批中状态时候长度返回错误 - if (props.status === '3' || props.status === '6') { - props.buttons.length = 4 // 传递长度 + 判断条件下显示按钮长度 - } - return props.buttons.length * 40 + 23 + return props.buttons.length * 40 + 20 }) // 获取字典值 async function getDict() { @@ -139,7 +135,6 @@ checkoutList.value = e.map((item: { id: string }) => item.id) } -const buttonTypeMap = ref('') // 点击删除 const handleDelete = (row: IlistApproval) => { ElMessageBox.confirm( @@ -243,12 +238,10 @@ } // 驳回后编辑 const editAgain = (row: IlistApproval) => { - $router.push(`/maintenance/maintenanceList/edit/${row.id}?from=reject`) + $router.push(`/maintenance/maintenanceList/edit/${row.id}/${row.approvalStatusName}/${row.processId}?from=reject`) } // 跳转到详情 const goDetail = (row: IlistApproval, type: string) => { - console.log('-----') - $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`) } // 获取到组织信息 @@ -297,7 +290,12 @@ approvalSubmit(row) break case '编辑': - goDetail(row, 'edit') + if (row.approvalStatusName === '未通过-驳回') { + editAgain(row) + } + else { + goDetail(row, 'edit') + } break case '同意': approvalDialog.value.initDialog('agree', row.taskId) @@ -322,9 +320,10 @@ () => props.status, (newVal: string) => { listQuery.value.approvalStatus = newVal + window.sessionStorage.setItem('maintenceListApprovalStatus', newVal) fetchData(false) }, - { immediate: true }) +) // 打印列表 function printList() { @@ -347,19 +346,14 @@ } } onMounted(async () => { - console.log(sessionStorage.getItem('maintenceListApprovalStatus')) - - // await getDict() - // if (sessionStorage.getItem('maintenceListApprovalStatus')) { - // listQuery.value.approvalStatus = sessionStorage.getItem('maintenceListApprovalStatus')! - // console.log(approvalStatusReserveMap.value[sessionStorage.getItem('maintenceListMenu')!]) - // } - // else { - // console.log('没有') - - // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] - // } - // fetchData(true) + await getDict() + if (window.sessionStorage.getItem('maintenceListApprovalStatus')) { + listQuery.value.approvalStatus = window.sessionStorage.getItem('maintenceListApprovalStatus')! + } + else { + listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部'] + } + fetchData(true) }) @@ -483,7 +477,7 @@ 取消 - 删除 + --> + + + 删除 diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue index bc8fe9d..d92910f 100644 --- a/src/views/device/deviceMaintenance/components/manageAdd.vue +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -1,19 +1,14 @@ + @@ -483,7 +477,7 @@ 取消 - 删除 + --> + + + 删除 diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue index bc8fe9d..d92910f 100644 --- a/src/views/device/deviceMaintenance/components/manageAdd.vue +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -1,19 +1,14 @@ + diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue index bc8fe9d..d92910f 100644 --- a/src/views/device/deviceMaintenance/components/manageAdd.vue +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -1,19 +1,14 @@ + diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue index bc8fe9d..d92910f 100644 --- a/src/views/device/deviceMaintenance/components/manageAdd.vue +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -1,19 +1,14 @@ + diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue index 860d610..3e0498c 100644 --- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue +++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue @@ -227,6 +227,10 @@ const addId = ref('') // 提交、保存 const getAddList = async (item: string, formEl: FormInstance | undefined) => { + if (!formInline.value.equipmentInfoList.length) { + ElMessage.warning('要求设备检修列表不能为空') + return + } if (item === '保存' && pageType.value === 'add') { if (!formEl) { return } await formEl.validate((valid, fields) => { @@ -270,6 +274,9 @@ } }) } + else { + formInline.value.equipmentList = [] + } if (from.value === 'reject') { // 未通过-驳回的编辑 failUpdateEquipmentApply(formInline.value).then((res) => { if (res.code === 200) { @@ -408,13 +415,15 @@ const approvalRecordData = ref([]) // 审批流程数据 // 查询审批记录 function getApprovalRecord(processId: string) { - if (processId) { - fetchApproval(processId).then((res) => { - approvalRecordData.value = res.data - }) - } - else { - ElMessage.warning('流程实例id为空') + if (pageType.value !== 'add') { + if (processId) { + fetchApproval(processId).then((res) => { + approvalRecordData.value = res.data + }) + } + else { + ElMessage.warning('流程实例id为空') + } } } // 审批结束回调 @@ -570,7 +579,7 @@ - + diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue index bc8fe9d..d92910f 100644 --- a/src/views/device/deviceMaintenance/components/manageAdd.vue +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -1,19 +1,14 @@ + + +