From b1ac328d9d09e981012c7d687e7859a350fe027b Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 3 Jul 2024 01:45:10 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat=20:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=94=A8=E6=88=B7=E6=97=B6=E8=AF=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=9F=A9=E9=98=B5=E7=8A=B6=E6=80=81=E6=A3=80?= =?UTF-8?q?=E6=9F=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d2ddf378bfb76e0862982bd96d952023649de9d2. --- src/api/user/user.js | 15 +-- src/views/project-demand/summary/add.vue | 18 +-- .../workflow/process/common/UserPicker.vue | 30 +---- .../process/config/ApprovalNodeConfig.vue | 110 +++++++++--------- 4 files changed, 71 insertions(+), 102 deletions(-) diff --git a/src/api/user/user.js b/src/api/user/user.js index e0a84c1..96d078f 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,23 +186,16 @@ 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 f80fd8b..a76ba5c 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -415,6 +415,14 @@ 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({ @@ -425,15 +433,7 @@ 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 d168e91..459236c 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -70,9 +70,8 @@