修改 常态化干扰源用户管理 编辑bug

This commit is contained in:
GGJ
2024-07-01 10:58:32 +08:00
parent 84b583f12e
commit 8dc8cd83a0
2 changed files with 24 additions and 12 deletions

View File

@@ -114,7 +114,7 @@ const tableStore = new TableStore({
minWidth: 140, minWidth: 140,
custom: { custom: {
0: 'warning', 0: 'warning',
1: 'primary', 1: 'primary',
2: 'success', 2: 'success',
3: 'danger', 3: 'danger',
@@ -122,7 +122,7 @@ const tableStore = new TableStore({
}, },
replaceValue: { replaceValue: {
0: '待提交审批', 0: '待提交审批',
1: '审批中', 1: '审批中',
2: '审批通过', 2: '审批通过',
3: '审批不通过', 3: '审批不通过',
@@ -177,7 +177,7 @@ const tableStore = new TableStore({
icon: 'el-icon-Open', icon: 'el-icon-Open',
render: 'basicButton', render: 'basicButton',
showDisabled: row => { showDisabled: row => {
return row.createBy != adminInfo.$state.id || !(row.status == 0) return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
}, },
disabled: row => { disabled: row => {
return !(row.status == 0) return !(row.status == 0)

View File

@@ -523,7 +523,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
import { useAdminInfo } from '@/stores/adminInfo' import { useAdminInfo } from '@/stores/adminInfo'
import { queryByAllCode } from '@/api/system-boot/dictTree' import { queryByAllCode } from '@/api/system-boot/dictTree'
import { uploadFile } from '@/api/system-boot/file' import { uploadFile } from '@/api/system-boot/file'
import { submitFormData, getById, updateFormData, addEditor,resend } from '@/api/supervision-boot/interfere/index' import { submitFormData, getById, updateFormData, addEditor, resend } from '@/api/supervision-boot/interfere/index'
import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form' import { getUserReportUpdateById } from '@/api/supervision-boot/userReport/form'
const props = defineProps({ const props = defineProps({
openType: { openType: {
@@ -1362,15 +1362,27 @@ const confirmForm = (flag: boolean) => {
} else { } else {
confirmFormData.id = resendId.value confirmFormData.id = resendId.value
if (props.normalizedControl) { if (props.normalizedControl) {
resend(confirmFormData).then(res => { if (title.value == '编辑') {
ElMessage({ addEditor(confirmFormData).then(res => {
message: '重新发起成功', ElMessage({
type: 'success' message: '发起成功',
type: 'success'
})
ruleFormRef.value.resetFields()
resetForm()
close()
}) })
ruleFormRef.value.resetFields() } else {
resetForm() resend(confirmFormData).then(res => {
close() ElMessage({
}) message: '重新发起成功',
type: 'success'
})
ruleFormRef.value.resetFields()
resetForm()
close()
})
}
} else { } else {
updateFormData(confirmFormData).then(res => { updateFormData(confirmFormData).then(res => {
ElMessage({ ElMessage({