From 9901db57572f324261d7e8fd4595d89dc8439292 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sun, 29 Sep 2024 10:58:45 +0800 Subject: [PATCH] =?UTF-8?q?2024-09-29=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tool/toolApply.js | 2 + .../modules/changeManagement/changeRecord.vue | 11 +- src/views/modules/tooling/searchToolApply.vue | 132 +++++++++++++++--- 3 files changed, 121 insertions(+), 24 deletions(-) diff --git a/src/api/tool/toolApply.js b/src/api/tool/toolApply.js index 92ec27d..ed9a3b1 100644 --- a/src/api/tool/toolApply.js +++ b/src/api/tool/toolApply.js @@ -22,3 +22,5 @@ export const cancelProjectToolApply = data => createAPI(`/plm/projectToolingAppl export const saveProjectHeaderMessage = data => createAPI(`/plm/projectToolingApplication/saveProjectHeaderMessage`,'post',data) export const editToolApplication= data => createAPI(`/plm/projectToolingApplication/editToolApplication`,'post',data) + +export const submitChange= data => createAPI(`/plm/projectToolingApplication/submitChange`,'post',data) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 0052f17..37e2660 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -369,7 +369,7 @@ 保存 关闭 同意 - 驳回 + 驳回 @@ -519,7 +519,7 @@ 保存 关闭 同意 - 驳回 + 驳回 @@ -573,7 +573,7 @@ 保存 关闭 同意 - 驳回 + 驳回 @@ -1245,6 +1245,7 @@ rejectStepId: '', isReject: '', menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, rejectOpinion: '' }, costImpactData: { @@ -2950,11 +2951,13 @@ faiOperatorId: row.faiOperatorId, faiOperatorName: row.faiOperatorName, nodeConclusion: '', + rejectOpinion: '', stepId: row.stepId, rejectFlag: row.rejectFlag, rejectStepId: row.rejectStepId, isReject: row.isReject, - menuId: this.$route.meta.menuId + menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, } this.changeTitle = '变更申请-' + this.modalData.changeNo // 查选择的ECN种类 diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index df00a8f..a1f2bce 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -304,6 +304,8 @@ {{'保存'}} {{'取消'}} + 同意 + 驳回 @@ -355,6 +357,20 @@ {{'取消'}} + + + + + + + + + + 确定 + 取消 + + + @@ -373,7 +389,8 @@ comfirmProjectToolApply, cancelProjectToolApply, saveProjectHeaderMessage, - editToolApplication + editToolApplication, + submitChange } from "@/api/tool/toolApply.js" import { deleteProjectFile, @@ -422,6 +439,11 @@ remark:'', createBy:'', detailList:[], + status: '', + rejectOpinion: '', + nodeConclusion: '', + menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, }, modelData:{ site:'', @@ -923,6 +945,8 @@ }, ], approvalList: [], + rejectOpinion: '', + submitModalFlag: false, } }, watch: { @@ -1133,17 +1157,22 @@ this.detailList =[] } }, - editModal(row){ - this.dataForm={ + editModal (row) { + this.dataForm = { site: row.site, applyNo: row.applyNo, - applyBy:row.applyBy, - applyDate:row.applyDate, - applySumQty:row.applySumQty, - applyReason:row.applyReason, - remark:row.remark, - createBy:row.createBy, - detailList:[], + applyBy: row.applyBy, + applyDate: row.applyDate, + applySumQty: row.applySumQty, + applyReason: row.applyReason, + remark: row.remark, + createBy: row.createBy, + detailList: [], + status: row.status, + rejectOpinion: '', + nodeConclusion: '', + menuId: this.$route.meta.menuId, + userName: this.$store.state.user.name, } searchProjectToolApplyDetail({ site: row.site, applyNo: row.applyNo,}).then(({data}) => { @@ -1332,19 +1361,55 @@ }) }) }, - saveData(){ - this.dataForm.detailList=this.toolData - editToolApplication(this.dataForm).then(({data}) => { - if (data && data.code == 0) { + + // 同意提交 + agreeSubmit () { + this.$confirm(`是否确认提交?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.dataForm.nodeConclusion = 'Y' + this.submitData() + }) + }, + + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, + + // 驳回提交 + rejectSubmit () { + this.$confirm(`是否确认驳回?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.dataForm.rejectOpinion = this.rejectOpinion + this.dataForm.nodeConclusion = 'N' + this.submitData() + }) + }, + + // 提交 + submitData () { + this.dataForm.userName = this.$store.state.user.name + this.dataForm.menuId = this.$route.meta.menuId + this.dataForm.detailList = this.toolData + submitChange(this.dataForm).then(({data}) => { + if (data && data.code === 0) { for (let i = 0; i { + if (data && data.code === 0) { + for (let i = 0; i { + } + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) }, jumpBM(row){ if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404'){