From fb62df9086ee4de899068c035fc158575c77c598 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 11 Nov 2024 17:27:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/workPlan/monthPlan.js | 8 ++++ .../monthPlanAuditingDetails/pro-index.vue | 4 +- pages/workPlan/monthPlanDetails/pro-index.vue | 44 ++++++++++++++++--- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/api/workPlan/monthPlan.js b/api/workPlan/monthPlan.js index a49fcfa..0346b49 100644 --- a/api/workPlan/monthPlan.js +++ b/api/workPlan/monthPlan.js @@ -230,6 +230,14 @@ export function getAUditingProcessApi(data) { data: data }) } +// 月计划-查看数据-审核流程 +export function getAUditingProcessProApi(data) { + return request_yn({ + url: '/ynPlanApp/proMonth/getCheckDetail', + method: 'post', + data: data + }) +} // 月计划-上报人-获取审核人信息 export function getAUditingUserInfoApi(data) { return request_yn({ diff --git a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue index ad6f27a..a20fd5f 100644 --- a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue +++ b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue @@ -210,7 +210,7 @@ import { getRiskLevelListApi, getControlLevelListApi, updateInfPlanContentProApi, - getAUditingProcessApi, + getAUditingProcessProApi, getAUditingUserInfoApi, // setMonthPlanApi, setAuditingRejectProApi @@ -537,7 +537,7 @@ export default { // } // console.log('paramsparams参数', params) - const res = await getAUditingProcessApi(this.params) + const res = await getAUditingProcessProApi(this.params) console.log('res审核流程', res) res.obj.forEach(e => { diff --git a/pages/workPlan/monthPlanDetails/pro-index.vue b/pages/workPlan/monthPlanDetails/pro-index.vue index cb4e271..732bd18 100644 --- a/pages/workPlan/monthPlanDetails/pro-index.vue +++ b/pages/workPlan/monthPlanDetails/pro-index.vue @@ -189,13 +189,13 @@ import { updateInfPlanContentProApi, getAUditingUserInfoApi, setMonthPlanProApi, - getAUditingProcessApi + getAUditingProcessProApi } from '../../../api/workPlan/monthPlan' export default { data() { return { monthDetailsList: [], - + proId: '', editDisabled: false, state: '', month: '', @@ -540,6 +540,34 @@ export default { }, /* 确定 */ async onHandlerSubmit() { + // const ids = this.auditingUserList.map(e => { + // if (e.isChecked) return e.id + // }) + + // let idsStr = ids.filter(e => e != null).join(',') + + // const params = { + // id: JSON.stringify(this.monthDetailsList), + // user: idsStr, + // state: '2' + // } + + // console.log('saveParams保存参数', params) + + // const result = await setMonthPlanProApi(params) + // if (result.res == 1) { + // uni.showToast({ title: `提交成功!`, icon: 'none' }) + // setTimeout(() => { + // uni.navigateBack({ + // delta: 1, + // success() { + // uni.$emit('update') + // } + // }) + // }, 500) + // } else { + // uni.showToast({ title: `提交失败!`, icon: 'none' }) + // } const ids = this.auditingUserList.map(e => { if (e.isChecked) return e.id }) @@ -547,14 +575,16 @@ export default { let idsStr = ids.filter(e => e != null).join(',') const params = { - id: JSON.stringify(this.monthDetailsList), - user: idsStr, - state: '2' + id: this.proId, + user: idsStr + // state: '2' } console.log('saveParams保存参数', params) const result = await setMonthPlanProApi(params) + + console.log(result, 'results上报人提交结果') if (result.res == 1) { uni.showToast({ title: `提交成功!`, icon: 'none' }) setTimeout(() => { @@ -577,7 +607,7 @@ export default { } console.log('paramsparams参数', params) - const res = await getAUditingProcessApi(params) + const res = await getAUditingProcessProApi(params) console.log('res审核流程', res) res.obj.forEach(e => { @@ -664,11 +694,13 @@ export default { onLoad(options) { this.state = options.state this.month = options.month + this.proId = options.id console.log('options.state', options.state, options.month) Promise.all([this.getRiskLevelListData(), this.getControlLevelListData()]).then(res => { this.params.id = options.id this.getPlanDetailData() }) + this.getAUditingProcessData() }, onReady() { let that = this