diff --git a/src/api/user/user.js b/src/api/user/user.js index 96d078f..e0a84c1 100644 --- a/src/api/user/user.js +++ b/src/api/user/user.js @@ -56,8 +56,8 @@ export const getUserDetail = (userId) => { // 操作 export const operate = (data, type) => { // console.log(type ,'type'); - if(data.userId && type !== '0') return editUser(data) - else if(type == '0') return editUserOA(data) + if (data.userId && type !== '0') return editUser(data) + else if (type == '0') return editUserOA(data) return addUser(data) } @@ -186,16 +186,23 @@ export const unbindAllUserByPost = (postId) => { }) } -export const bindAccount=(data)=>{ +export const bindAccount = (data) => { return request({ url: '/admin/mosr/user/bind/account', method: 'post', data }) } -export const getBindAccount=(userId)=>{ +export const getBindAccount = (userId) => { return request({ url: `/admin/mosr/user/bind/account/info/${userId}`, method: 'get' }) } + +export const checkMatrix = (userId) => { + return request({ + url: `/admin/mosr/user/matrix?userId=` + userId, + method: 'get' + }) +} diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index a76ba5c..f80fd8b 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -415,14 +415,6 @@ const handleSubmit = debounce(async (instance) => { if (formData.value.singleFile !== undefined) { formData.value.singleFile = getFileParam(formData.value.singleFile) } - formData.value.resultForm=JSON.stringify(formData.value.resultForm) - let params = { - ...formData.value, - deploymentId: deploymentId.value, - fileList: otherFiles, - requirementId: route.query.id ? route.query.id : '-1' - } - console.log('params', params) if (!attachment.value.isSingleFile) { attachment.value.validate() ElNotification({ @@ -433,7 +425,15 @@ const handleSubmit = debounce(async (instance) => { return; } else { attachment.value.clearValidate() + formData.value.resultForm=JSON.stringify(formData.value.resultForm) } + let params = { + ...formData.value, + deploymentId: deploymentId.value, + fileList: otherFiles, + requirementId: route.query.id ? route.query.id : '-1' + } + console.log('params', params) let res = await requirementReported(params) ElNotification({ title: '提示', @@ -465,11 +465,11 @@ const handleResubmit = debounce(() => { return; } else { attachment.value.clearValidate() + formData.value.resultForm=JSON.stringify(formData.value.resultForm) } if (formData.value.isSpecialFund && formData.value.specialFund === null) { formData.value.specialFund = getFundName(formData.value.specialFundId) } - formData.value.resultForm=JSON.stringify(formData.value.resultForm) let params = { ...formData.value, deploymentId: deploymentId.value, diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index 459236c..d168e91 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -70,8 +70,9 @@