From 5c89970e3ad5392c231b510226898c7392a64374 Mon Sep 17 00:00:00 2001 From: elseif Date: Wed, 13 Mar 2024 16:35:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dictionary/index.ts | 2 +- src/api/work/work.ts | 2 -- src/utils/http/axios/index.ts | 1 - src/views/final/comp/RepeatTaskTableModal.vue | 26 +++++++++---------- src/views/final/content/Content.vue | 26 +++++++++---------- src/views/task/content/Content.vue | 23 ++++++++-------- src/views/task/modal/ConfrimModal.vue | 4 +-- 7 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts index 9d7c2f6..91bfe28 100644 --- a/src/api/dictionary/index.ts +++ b/src/api/dictionary/index.ts @@ -312,6 +312,6 @@ export async function getBackList() { method: 'get', }) - const list = res.data[0].distionaryList + const list = res.data return list } diff --git a/src/api/work/work.ts b/src/api/work/work.ts index b9741c7..a787453 100644 --- a/src/api/work/work.ts +++ b/src/api/work/work.ts @@ -71,8 +71,6 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu const { data: { records, pages, total } } = res - debugger - // 精简一下数据 const list = records.map((item) => { return { diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index ec8d162..3fe822c 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -201,7 +201,6 @@ const transform: AxiosTransform = { // eslint-disable-next-line ts/no-use-before-define const instance = http.getAxios() const config = response.config - const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token'] const expirationTime = storage.get(TOKEN_EXPIRATION_TIME) // console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url) diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index ab28bfe..eb6fc75 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -184,19 +184,19 @@ function approvalHandler() { function rejectHandler(idOrDesc: string, isOther: boolean) { // TODO:实现批量拒绝 - const param: ApprovalParam = { - formid: '', - taskId: '', - approvd: false, - taskComment: '', - } - - if (isOther) - param.taskComment = idOrDesc - else - param.taskComment = idOrDesc - - audit(param) + // const param: ApprovalParam = { + // formid: '', + // taskId: '', + // approvd: false, + // taskComment: '', + // } + + // if (isOther) + // param.taskComment = idOrDesc + // else + // param.taskComment = idOrDesc + + // audit(param) } query(pagination.page, pagination.pageSize) diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 87b9a9e..5cb9e85 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -259,19 +259,19 @@ function approvalHandler() { function rejectHandler(idOrDesc: string, isOther: boolean) { // TODO:实现批量拒绝 - const param: ApprovalParam = { - formid: '', - taskId: '', - approvd: false, - taskComment: '', - } - - if (isOther) - param.taskComment = idOrDesc - else - param.taskComment = idOrDesc - - audit(param) + // const param: ApprovalParam = { + // formid: '', + // taskId: '', + // approvd: false, + // taskComment: '', + // } + + // if (isOther) + // param.taskComment = idOrDesc + // else + // param.taskComment = idOrDesc + + // audit(param) } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index f114076..cba85aa 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -57,20 +57,21 @@ const taskDetailInfo = ref({}) const taskDetailPictureList = ref([]) let processItems: any[] = [] +// states:1未提交，2待审批，3通过，4不通过 function validate(items: any[]) { if (items.length === 0) return '至少选中一个任务' for (const item of items) { - // const { iztrueorfalse, history, states } = item - // if (iztrueorfalse !== null) - // return '存在已经辨识过的任务' + const { iztrueorfalse, history, states } = item + if (iztrueorfalse !== null) + return '未判别真假' + + else if (states !== 2) + return '审批状态不合法' // else if (history) // return '包含历史数据' - - // else if (states !== 1 && states !== 2) - // return '审批状态不合法' } return null @@ -123,14 +124,14 @@ function rejectHandler() { function approval() { const formIds: string[] = processItems.map(item => item.id) - const taskIds: string[] = processItems.map(item => item.taskid) - const tasknames: string[] = processItems.map(item => item.taskname) + const taskIds: string[] = processItems.map(item => item.taskId) + const tasknames: string[] = processItems.map(item => item.buessinessno) const param: ApprovalParam = { formid: formIds, taskId: taskIds, approvd: true, - taskComment: '', + taskComment: 'approval', taskname: tasknames, } @@ -139,8 +140,8 @@ function approval() { function reject(idOrDesc: string, backId: string, isOther: boolean) { const formIds: string[] = processItems.map(item => item.id) - const taskIds: string[] = processItems.map(item => item.taskid) - const tasknames: string[] = processItems.map(item => item.taskname) + const taskIds: string[] = processItems.map(item => item.taskId) + const tasknames: string[] = processItems.map(item => item.buessinessno) const param: ApprovalParam = { formid: formIds, diff --git a/src/views/task/modal/ConfrimModal.vue b/src/views/task/modal/ConfrimModal.vue index e49ffa2..dc1378a 100644 --- a/src/views/task/modal/ConfrimModal.vue +++ b/src/views/task/modal/ConfrimModal.vue @@ -1,5 +1,5 @@