From 938e53ed44352c51dccfd67e0abd064c839dee8e Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Sun, 31 Mar 2024 01:42:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98=E7=BB=88=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/column.svg | 18 +++++ src/views/final/content/Content.vue | 110 +++++++++++++++------------- src/views/task/content/Content.vue | 2 +- 3 files changed, 77 insertions(+), 53 deletions(-) create mode 100644 src/assets/icons/column.svg diff --git a/src/assets/icons/column.svg b/src/assets/icons/column.svg new file mode 100644 index 0000000..954e360 --- /dev/null +++ b/src/assets/icons/column.svg @@ -0,0 +1,18 @@ + + + 自定义列 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 126413c..73cd966 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -46,7 +46,7 @@ const emit = defineEmits(['changeShow']) function changeContent() { emit('changeShow') } - +const checkedRowKeys = ref([]) const dicStore = useDictionary() const izstatusList = ref([]) const router = useRouter() @@ -170,6 +170,10 @@ async function getColumns() { type: 'selection', fixed: 'left', width: 50, + disabled(row: any) { + console.log(row) + return row.states !== 2 + }, }, ] @@ -663,43 +667,34 @@ function singleApproval(row) { doAudit(param) } +// 批量通过 function batchApproval() { - const items = getSelectItems() - const msg = validate(items) + const items: any = getSelectItems() + const list: any = [] + items.forEach((item) => { + list.push({ + formId: item.id, + taskId: item.taskId, + taskName: item.fromtaskname, + }) + }) - if (msg !== null) { - message.error(msg) - return + const param = { + result: true, + comment: '', + disposeType: '', + disposeTypeId: '', + failCauseId: '', + failCauseName: '', + flowTaskInfoList: list, } - - dialog.info({ - title: '确认提示', - content: '确认给该任务审批为【通过】吗?', - positiveText: '确定', - negativeText: '取消', - onPositiveClick: () => { - approval(items) - }, - onNegativeClick: () => {}, - }) + console.log(param) + reload() + checkedRowKeys.value = [] + console.log(selectionIds.value) + // doAudit(param) } -// function approval(items) { -// const formIds: string[] = items.map(item => item.id) -// const taskIds: string[] = items.map(item => item.taskId) -// const tasknames: string[] = items.map(item => item.taskname) - -// const param: ApprovalParam = { -// formid: formIds, -// taskId: taskIds, -// approvd: true, -// taskComment: 'approval', -// taskname: tasknames, -// } - -// doAudit(param) -// } - // 审核不通过 function rejectHandler(list) { const msg = validate(list) @@ -713,24 +708,8 @@ function rejectHandler(list) { modal.showModal(list) } -function reject(idOrDesc: string, backId: string, isOther: boolean) { - const items = getSelectItems() - const formIds: string[] = items.map(item => item.id) - const taskIds: string[] = items.map(item => item.fromtaskid) - const tasknames: string[] = items.map(item => item.fromtaskname) - - const param: ApprovalParam = { - formid: formIds, - taskId: taskIds, - approvd: false, - taskComment: idOrDesc, - taskname: isOther ? tasknames : ['其他'], - } - - doAudit(param) -} - function reload() { + selectionIds.value = [] const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps query(page!, pageSize!) } @@ -786,10 +765,21 @@ function doAudit(param: any) { 小结查重 -
+
+ + + 返回 + + + + +
+ Date: Sun, 31 Mar 2024 02:29:41 +0800 Subject: [PATCH 2/2] bug --- src/components/Approval/NotPassed.vue | 20 +++++++--- src/views/final/content/Content.vue | 50 ++++++++++--------------- src/views/task/content/PictureTable.vue | 2 +- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue index 04bad76..b2e53a5 100644 --- a/src/components/Approval/NotPassed.vue +++ b/src/components/Approval/NotPassed.vue @@ -30,8 +30,8 @@ const rules = { } const formData = reactive({ - disposeTypeId: '', - failCauseId: '', + disposeTypeId: '262403670085013522', + failCauseId: '260402999231251188', comment: '', }) @@ -149,7 +149,7 @@ async function selectChange(id) { - +
@@ -157,9 +157,9 @@ async function selectChange(id) {