From 7a15a8efb5a5dd049f60369f064d7a4adfaa9682 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Thu, 13 Mar 2025 17:32:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96jyj=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocumentTaskResults/index.ts | 8 + .../ContractualTasks/ContractualShowModal.vue | 312 +++++++------ .../ContractualTasks/ContractualTasks.data.ts | 6 +- .../ContractualTasksTable.vue | 2 +- .../ContractualTasks/showResultCard.vue | 410 ++++++++++++++++-- .../ContractualTasksTableModal.vue | 6 +- 6 files changed, 569 insertions(+), 175 deletions(-) diff --git a/src/api/documentReview/DocumentTaskResults/index.ts b/src/api/documentReview/DocumentTaskResults/index.ts index 270350a..409f42a 100644 --- a/src/api/documentReview/DocumentTaskResults/index.ts +++ b/src/api/documentReview/DocumentTaskResults/index.ts @@ -157,3 +157,11 @@ export function DocumentTaskResultsRemove(id: ID | IDS) { // return defHttp.get({ url: '/productManagement/DocumentTaskResults/downloadResult/' + id ,responseType: 'blob',headers: { 'Content-Type': ContentTypeEnum.FORM_URLENCODED }},); } +/** + * 新增合同任务 + * @param data + * @returns + */ +export function modifyContractReview(documentTaskId: ID, contractualRes) { + return defHttp.putWithMsg({ url: '/productManagement/DocumentTaskResults/modifyContractReview/'+documentTaskId, data: contractualRes }); +} \ No newline at end of file diff --git a/src/views/contractReview/ContractualTasks/ContractualShowModal.vue b/src/views/contractReview/ContractualTasks/ContractualShowModal.vue index fdcf3d5..a82acee 100644 --- a/src/views/contractReview/ContractualTasks/ContractualShowModal.vue +++ b/src/views/contractReview/ContractualTasks/ContractualShowModal.vue @@ -3,57 +3,38 @@ v-bind="$attrs" title="title" :canFullscreen="true" - :defaultFullscreen="true" - :showOkBtn="false" + :defaultFullscreen="true" + @ok="submit" @register="registerInnerModal" > -
-
- - -
-
- -
- - -
-
- - - {{ item.text }} - {{ item.content }} - -
-
-
- -
+ - diff --git a/src/views/contractReview/ContractualTasks/ContractualTasks.data.ts b/src/views/contractReview/ContractualTasks/ContractualTasks.data.ts index b1429ad..e27818a 100644 --- a/src/views/contractReview/ContractualTasks/ContractualTasks.data.ts +++ b/src/views/contractReview/ContractualTasks/ContractualTasks.data.ts @@ -21,7 +21,10 @@ export const formSchemas: FormSchema[] = [ { label: '审核结果', field: 'resultType', - component: 'Input', + component: 'Select', + componentProps: { + options: getDictOptions('jyj_contract_result_type'), + }, }, { label: '批次名称', @@ -59,6 +62,7 @@ export const columns: BasicColumn[] = [ { title: '审核结果', dataIndex: 'resultType', + customRender: ({ value }) => renderDict(value, 'jyj_contract_result_type'), }, { title: '状态', diff --git a/src/views/contractReview/ContractualTasks/ContractualTasksTable.vue b/src/views/contractReview/ContractualTasks/ContractualTasksTable.vue index e79b5c9..3da6a47 100644 --- a/src/views/contractReview/ContractualTasks/ContractualTasksTable.vue +++ b/src/views/contractReview/ContractualTasks/ContractualTasksTable.vue @@ -95,7 +95,7 @@ - + diff --git a/src/views/contractReview/ContractualTasks/showResultCard.vue b/src/views/contractReview/ContractualTasks/showResultCard.vue index f8392aa..f57b684 100644 --- a/src/views/contractReview/ContractualTasks/showResultCard.vue +++ b/src/views/contractReview/ContractualTasks/showResultCard.vue @@ -1,49 +1,227 @@ + diff --git a/src/views/contractReview/JyjcontractualTaskBatch/ContractualTasksTableModal.vue b/src/views/contractReview/JyjcontractualTaskBatch/ContractualTasksTableModal.vue index 1b8e1da..88c71ca 100644 --- a/src/views/contractReview/JyjcontractualTaskBatch/ContractualTasksTableModal.vue +++ b/src/views/contractReview/JyjcontractualTaskBatch/ContractualTasksTableModal.vue @@ -45,13 +45,13 @@ const { record, type } = data; if (type == 'passCount') { title.value = '查看审核通过记录'; - resultType.value = '审查合格'; + resultType.value = 'reviewSuccess'; } else if (type == 'rejectCount') { title.value = '查看审核不通过记录'; - resultType.value = '审查不合格'; + resultType.value = 'reviewFail'; } else if(type=="irrelevantCount"){ title.value = '查看非审查范围记录'; - resultType.value = '非审查范围文件'; + resultType.value = 'notReviewable'; }else{ title.value = '查看审查失败的范围记录'; resultType.value = '审查失败文件';