联调常态化干扰源页面 修改云效bug
This commit is contained in:
@@ -523,7 +523,7 @@ import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
|
||||
import { useAdminInfo } from '@/stores/adminInfo'
|
||||
import { queryByAllCode } from '@/api/system-boot/dictTree'
|
||||
import { uploadFile } from '@/api/system-boot/file'
|
||||
import { submitFormData, getById, updateFormData, addEditor } 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'
|
||||
const props = defineProps({
|
||||
openType: {
|
||||
@@ -946,66 +946,29 @@ const open = async (row: any) => {
|
||||
resendId.value = row.row.id
|
||||
if (props.update) {
|
||||
await getUserReportUpdateById(row.row.id).then(res => {
|
||||
handleResponse(res.userReportMessageJson)
|
||||
handleResponse(res.data.userReportMessageJson)
|
||||
})
|
||||
} else {
|
||||
await getById({ id: row.row.id }).then(res => {
|
||||
handleResponse(res)
|
||||
handleResponse(res.data)
|
||||
})
|
||||
}
|
||||
// if (props.update) {
|
||||
// await getUserReportUpdateById({ id: row.row.id }).then(res => {
|
||||
// // form.value.userType = res.data.userType
|
||||
// if (res.data.userReportProjectPO != null) {
|
||||
// // userType 0 1
|
||||
// form.value = { ...res.data, ...res.data.userReportProjectPO }
|
||||
// fileRaw(res.data, 'userReportProjectPO')
|
||||
// } else if (res.data.userReportSubstationPO != null) {
|
||||
// // userType 2 3 4 5
|
||||
// form.value = { ...res.data, ...res.data.userReportSubstationPO }
|
||||
// fileRaw(res.data, 'userReportSubstationPO')
|
||||
// } else if (res.data.userReportSensitivePO != null) {
|
||||
// // userType6
|
||||
// form.value = { ...res.data, ...res.data.userReportSensitivePO }
|
||||
// fileRaw(res.data, 'userReportSensitivePO')
|
||||
// }
|
||||
// form.value.orgId = adminInfo.$state.deptName
|
||||
// })
|
||||
// } else {
|
||||
// await getById({ id: row.row.id }).then(res => {
|
||||
// // form.value.userType = res.data.userType
|
||||
// if (res.data.userReportProjectPO != null) {
|
||||
// // userType 0 1
|
||||
// form.value = { ...res.data, ...res.data.userReportProjectPO }
|
||||
// fileRaw(res.data, 'userReportProjectPO')
|
||||
// } else if (res.data.userReportSubstationPO != null) {
|
||||
// // userType 2 3 4 5
|
||||
// form.value = { ...res.data, ...res.data.userReportSubstationPO }
|
||||
// fileRaw(res.data, 'userReportSubstationPO')
|
||||
// } else if (res.data.userReportSensitivePO != null) {
|
||||
// // userType6
|
||||
// form.value = { ...res.data, ...res.data.userReportSensitivePO }
|
||||
// fileRaw(res.data, 'userReportSensitivePO')
|
||||
// }
|
||||
// form.value.orgId = adminInfo.$state.deptName
|
||||
// })
|
||||
// }
|
||||
} else {
|
||||
resendId.value = ''
|
||||
form.value.userType = userTypeList.value[0].value
|
||||
}
|
||||
}
|
||||
async function handleResponse(response) {
|
||||
async function handleResponse(data) {
|
||||
// userType logic is commented out; if needed, implement accordingly
|
||||
if (response.data.userReportProjectPO) {
|
||||
form.value = { ...response.data, ...response.data.userReportProjectPO }
|
||||
fileRaw(response.data, 'userReportProjectPO')
|
||||
} else if (response.data.userReportSubstationPO) {
|
||||
form.value = { ...response.data, ...response.data.userReportSubstationPO }
|
||||
fileRaw(response.data, 'userReportSubstationPO')
|
||||
} else if (response.data.userReportSensitivePO) {
|
||||
form.value = { ...response.data, ...response.data.userReportSensitivePO }
|
||||
fileRaw(response.data, 'userReportSensitivePO')
|
||||
if (data.userReportProjectPO) {
|
||||
form.value = { ...data, ...data.userReportProjectPO }
|
||||
fileRaw(data, 'userReportProjectPO')
|
||||
} else if (data.userReportSubstationPO) {
|
||||
form.value = { ...data, ...data.userReportSubstationPO }
|
||||
fileRaw(data, 'userReportSubstationPO')
|
||||
} else if (data.userReportSensitivePO) {
|
||||
form.value = { ...data, ...data.userReportSensitivePO }
|
||||
fileRaw(data, 'userReportSensitivePO')
|
||||
}
|
||||
form.value.orgId = adminInfo.$state.deptName
|
||||
}
|
||||
@@ -1397,18 +1360,28 @@ const confirmForm = (flag: boolean) => {
|
||||
close()
|
||||
})
|
||||
} else {
|
||||
console.log(confirmFormData)
|
||||
confirmFormData.id = resendId.value
|
||||
|
||||
updateFormData(confirmFormData).then(res => {
|
||||
ElMessage({
|
||||
message: '重新发起成功',
|
||||
type: 'success'
|
||||
if (props.normalizedControl) {
|
||||
resend(confirmFormData).then(res => {
|
||||
ElMessage({
|
||||
message: '重新发起成功',
|
||||
type: 'success'
|
||||
})
|
||||
ruleFormRef.value.resetFields()
|
||||
resetForm()
|
||||
close()
|
||||
})
|
||||
ruleFormRef.value.resetFields()
|
||||
resetForm()
|
||||
close()
|
||||
})
|
||||
} else {
|
||||
updateFormData(confirmFormData).then(res => {
|
||||
ElMessage({
|
||||
message: '重新发起成功',
|
||||
type: 'success'
|
||||
})
|
||||
ruleFormRef.value.resetFields()
|
||||
resetForm()
|
||||
close()
|
||||
})
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log('表单验证失败')
|
||||
|
||||
Reference in New Issue
Block a user