diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..95dc12a Binary files /dev/null and b/dist.zip differ diff --git a/src/App.vue b/src/App.vue index cf3138e..9e6f74a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,19 @@ diff --git a/src/http/apis/toDoCenter/todoList.js b/src/http/apis/toDoCenter/todoList.js index 0d17f35..824988a 100644 --- a/src/http/apis/toDoCenter/todoList.js +++ b/src/http/apis/toDoCenter/todoList.js @@ -11,6 +11,11 @@ export const exportExc = (state, data) => http.post(centerList[state] + '/export export const progressDetail = params => http.get(`/api/v1/todo-center/progress/detail`, { params }) // 流程审核详情 export const projectDetail = id => http.get(`/api/v1/project/lib/${id}`) // 项目详情 export const handler = data => http.post('/api/v1/todo-center/handler', data) // 处理 + +export const toInTheAnnualPlan = data => http.post('/api/v1/todo-center/toInTheAnnualPlan', data) // 驳回至年度计划 + +export const saveOpinions = data => http.post('/api/v1/todo-center/saveOpinions', data) // 添加总验意见 + export const adjustAndHandle = data => http.post('/api/v1/todo-center/adjustAndHandle', data) // 被退回项目内容调整并通过 export const notSealedPdf = data => http.post(`/api/v1/todo-center/getNotSealedPdf`, data) // 获取未盖章pdf export const signSeal = data => http.post('/api/v1/todo-center/getSealedPdf', data) // 盖章 diff --git a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue index 6ee9ffc..3cd0a5a 100644 --- a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue +++ b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue @@ -115,11 +115,11 @@ onMounted(async () => { label-suffix=":" scroll-to-error > - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + 上传附件 + + + + { @@ -103,7 +104,7 @@ const

{{ list.finishTime }}

意见:{{ list.auditInfo.text }}

-
+
附件:

@@ -111,6 +112,16 @@ const

+ +
+ 终验意见: +
+

+ +

+
+
+
diff --git a/src/pages/toDoCenter/handleDuringExamine/index.vue b/src/pages/toDoCenter/handleDuringExamine/index.vue index 157c713..4f14f10 100644 --- a/src/pages/toDoCenter/handleDuringExamine/index.vue +++ b/src/pages/toDoCenter/handleDuringExamine/index.vue @@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router' import FlowRecord from '../components/flowRecord.vue' import AuditDialog from '../components/auditDialog.vue' import ProjectInfo from '@/pages/projectStoreManage/projectStore/projectDetail/components/projectInfo.vue' -import { handler, progressDetail, projectDetail } from '@/http/apis/toDoCenter/todoList' +import { handler, progressDetail, projectDetail, toInTheAnnualPlan } from '@/http/apis/toDoCenter/todoList' import { storeToRefs } from 'pinia' import store from '@/store' import FinalInfo from '@/pages/projectStoreManage/projectStore/projectDetail/components/finalInfo.vue' @@ -13,7 +13,7 @@ import WantReadInfo from '@/pages/projectStoreManage/projectStore/projectDetail/ import SjFlowRecord from '@/pages/projectStoreManage/projectStore/projectDetail/components/sjFlowRecord.vue' import ChangeInfoDialog from '@/pages/toDoCenter/handleDuringExamine/components/changeInfoDialog.vue' import { dictionary } from '@/http/apis/projectCollection/projectCollectionEnter' -import { ElMessageBox } from 'element-plus' +import { ElMessage, ElMessageBox } from 'element-plus' const userInfo = storeToRefs(store.userStore).userInfo || {}, { proxy } = getCurrentInstance(), @@ -262,17 +262,44 @@ onMounted(async () => { }) function rejectYear () { - // ElMessageBox.confirm('确认驳回至年度计划吗?') - // .then(() => { - // }) - // .catch(() => { - // }) + ElMessageBox({ + title: '温馨提示', + message: '确认驳回至年度计划吗?', + showCancelButton: true, + confirmButtonText: '确认', + cancelButtonText: '取消', + beforeClose: async (action, instance, done) => { + if (action === 'confirm') { + instance.confirmButtonLoading = true + instance.confirmButtonText = '正在处理...' + try { + await bohui() + } catch (e) { + instance.confirmButtonLoading = false + } + instance.confirmButtonLoading = false + done() + } else { + done() + } + } + }).then((action) => { + if (action === 'confirm') { + ElMessage.success('驳回成功!') + reload() + } + }) +} - ElMessageBox.confirm('正在开发中......') - .then(() => { - }) - .catch(() => { - }) +async function bohui () { + const postData = { + instanceId: route.query.instanceId, + projectId: route.query.projectId, + projectCode: detailData.value.projectCode, + taskId: route.query.taskId, + action: 'REJECT' + } + await toInTheAnnualPlan(postData) } @@ -351,7 +378,7 @@ function rejectYear () { 流程记录 - + @@ -391,7 +418,7 @@ function rejectYear () { 返回