diff --git a/src/api/reduction-apply/index.js b/src/api/reduction-apply/index.js index 0723c7fb..2f29039d 100644 --- a/src/api/reduction-apply/index.js +++ b/src/api/reduction-apply/index.js @@ -24,11 +24,11 @@ export function getAuditingDetailsApi(query) { params: query }) } -// 减免申请审核提交接口 export function submitAuditingApi(data) { return request({ - url: '/material/sysWorkflowRecordHistory/update', + url: '/material/sysWorkflowRecordHistory/updateReduction', method: 'post', data }) } + diff --git a/src/views/business-examine/direct-rotation-apply/business-details.vue b/src/views/business-examine/direct-rotation-apply/business-details.vue index 1b8e51fe..258c535c 100644 --- a/src/views/business-examine/direct-rotation-apply/business-details.vue +++ b/src/views/business-examine/direct-rotation-apply/business-details.vue @@ -272,7 +272,8 @@ export default { taskId: '', // 外层列表的taskId isAccept: '', // 审批结果 1. 通过 2. 驳回 recordId: '', - nextNodeId: '' // 下个流程节点ID + nextNodeId: '', // 下个流程节点ID + remarkType:1 // 1.：PC端，2：APP端 } } }, @@ -364,6 +365,7 @@ export default { } this.auditingParams.taskTypeId = 16 + this.auditingParams.remarkType = 1 const loading = this.$loading() const res = await submitAuditingDirectApi(this.auditingParams) diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue index 0a5ef36c..70e15da3 100644 --- a/src/views/business-examine/direct-rotation-apply/index.vue +++ b/src/views/business-examine/direct-rotation-apply/index.vue @@ -72,7 +72,7 @@ diff --git a/src/views/business-examine/reduction-apply/business-details.vue b/src/views/business-examine/reduction-apply/business-details.vue index c21ecc48..f7110ed1 100644 --- a/src/views/business-examine/reduction-apply/business-details.vue +++ b/src/views/business-examine/reduction-apply/business-details.vue @@ -7,6 +7,18 @@ + + + + + + + + + + + + @@ -34,7 +46,7 @@ - + @@ -73,8 +85,25 @@
-
- +
+
+ + + +
+
+ +
@@ -99,6 +128,11 @@ 已驳回 +
+ 审核人: + {{ step.auditBy }} +
+
审核时间: {{ step.createTime }} @@ -159,7 +193,8 @@ export default { }, pagesType: 1, userId: '', - currentNodeId: '' + currentNodeId: '', + previewList: [], } }, created() { @@ -178,8 +213,8 @@ export default { // 通过 或 驳回 async onHandleAuditing(type) { // 组装参数 - const currentAuditing = this.auditingList.filter(e => e.configValues.includes(this.userId)) // 获取当前审核的节点 - const currentIndex = this.auditingList.findIndex(e => e.configValues.includes(this.userId)) // 获取当前的索引 + const currentAuditing = this.auditingList.filter(e => e.nodeId === this.currentNodeId) // 获取当前审核的节点 + const currentIndex = this.auditingList.findIndex(e => e.nodeId === this.currentNodeId) // 获取当前的索引 const { recordId, id, typeId, isAccept } = currentAuditing[0] @@ -196,20 +231,32 @@ export default { if (currentIndex !== this.auditingList.length - 1) { this.auditingParams.nextNodeId = this.auditingList[currentIndex + 1].id } - + this.auditingParams.taskTypeId = 13 + const loading = this.$loading() const res = await submitAuditingApi(this.auditingParams) console.log(res, '提交结果') if (res.code === 200) { this.$modal.msgSuccess('审核成功') + loading.close() setTimeout(() => { - const obj = { path: '/business-examine/reduction-apply' } - this.$tab.closeOpenPage(obj) + // const obj = { path: '/business-examine/reduction-apply' } + // this.$tab.closeOpenPage(obj) + this.$tab.closePage() }, 500) + } else { + loading.close() + this.$modal.msgError(res.message); } console.log(this.auditingParams, ' this.auditingParams组装好的参数') }, + + handleImg(img) { + console.log('🚀 ~ handleImg ~ img:', img) + this.previewList = this.fileList.filter(file => file.type === 'image').map(file => file.url) + }, + // 获取数据详情 和 审核记录详情 async getLeaseTaskDetailFun(id, taskId) { const { data: res } = await getDiscountViewList(id) @@ -217,12 +264,21 @@ export default { this.detailsInfo = res this.detailsList = res.detailList this.fileList = res.bmFileInfos - + if (this.fileList.length > 0) { + this.fileList.forEach(item => { + // 如果url 是 .pdf 结尾 添加 type= pdf + if (item.url.includes('.pdf')) { + item.type = 'pdf' + } else { + item.type = 'image' + } + }) + } this.detailsList.forEach(e => { this.totalAmount += e.reduceLeaseMoney * 1 }) - const { rows: result } = await getAuditingDetailsApi({ taskId }) + const { rows: result } = await getAuditingDetailsApi({ taskId,taskType: 13 }) this.auditingList = result console.log('result审核记录详情', result) } diff --git a/src/views/business-examine/reduction-apply/index.vue b/src/views/business-examine/reduction-apply/index.vue index 6692328e..1ec90e1a 100644 --- a/src/views/business-examine/reduction-apply/index.vue +++ b/src/views/business-examine/reduction-apply/index.vue @@ -69,36 +69,26 @@ {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }} + - - + + - - - - + @@ -127,7 +117,6 @@ 审核 + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
- + 重置 -