diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index e560fe0..d38e2f6 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -18,7 +18,7 @@ 变更 跳转至BOM 同意 - 驳回 + 驳回 @@ -119,7 +119,18 @@ 取消 - + + + + + + + + + 确定 + 取消 + + @@ -370,7 +381,8 @@ ifDisableFlag:false, - + rejectOpinion: '', + submitModalFlag: false, } }, mounted () { @@ -556,7 +568,8 @@ userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002', - nodeConclusion: 'N' + nodeConclusion: 'N', + rejectOpinion : this.rejectOpinion } this.submitData(tempData) }) @@ -564,6 +577,7 @@ submitData (tempData) { submitChange(tempData).then(({data}) => { if (data && data.code === 0) { + this.submitModalFlag = false this.$message({message: '操作成功', type: 'success'}) } else { this.$alert(data.msg, '错误', { @@ -573,6 +587,11 @@ }) }, + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, }, } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index a1a2b8a..555ac48 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -4,7 +4,7 @@ 刷新数据 保存 同意 - 驳回 + 驳回 @@ -160,7 +160,18 @@ - + + + + + + + + + 确定 + 取消 + + @@ -229,7 +240,9 @@ trigger: 'change' } ], - } + }, + rejectOpinion: '', + submitModalFlag: false, } }, methods: { @@ -378,7 +391,11 @@ this.submitData(tempData) }) }, - + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, // 驳回提交 rejectSubmit () { this.$confirm(`是否确认驳回?`, '提示', { @@ -391,7 +408,8 @@ userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002', - nodeConclusion: 'N' + nodeConclusion: 'N', + rejectOpinion : this.rejectOpinion } this.submitData(tempData) }) @@ -402,6 +420,7 @@ if (data && data.code === 0) { submitChange(tempData).then(({data}) => { if (data && data.code === 0) { + this.submitModalFlag = false this.$message({message: '操作成功', type: 'success'}) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index 6371ccb..4429aaf 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -12,7 +12,7 @@ 刷新数据 保存数据 同意 - 驳回 + 驳回
- + + + + + + + + + 确定 + 取消 + + @@ -129,6 +140,8 @@ status:'', isReject:'', }, + rejectOpinion: '', + submitModalFlag: false, } }, mounted () { @@ -289,7 +302,11 @@ this.submitData(tempData) }) }, - + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, // 驳回提交 rejectSubmit () { this.$confirm(`是否确认驳回?`, '提示', { @@ -302,7 +319,8 @@ userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002', - nodeConclusion: 'N' + nodeConclusion: 'N', + rejectOpinion : this.rejectOpinion } this.submitData(tempData) }) @@ -313,6 +331,7 @@ if (data && data.code === 0) { submitChange(tempData).then(({data}) => { if (data && data.code === 0) { + this.submitModalFlag = false this.$message({message: '操作成功', type: 'success'}) this.$emit("closeModel") } else { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index aed3d29..573887b 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -15,7 +15,7 @@ 保存 同意 - 驳回 + 驳回 @@ -429,7 +429,18 @@ - + + + + + + + + + 确定 + 取消 + + @@ -866,6 +877,8 @@ currentRoute:null, tagNo:'', tagNo1:'', + rejectOpinion: '', + submitModalFlag: false, } }, mounted () { @@ -1450,7 +1463,11 @@ } }) }, - + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, // 同意提交 agreeSubmit () { this.$confirm(`是否确认提交?`, '提示', { @@ -1481,7 +1498,8 @@ userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002', - nodeConclusion: 'N' + nodeConclusion: 'N', + rejectOpinion : this.rejectOpinion } this.submitData(tempData) }) @@ -1511,6 +1529,7 @@ }) await submitChange(tempData).then(({data}) => { if (data && data.code === 0) { + this.submitModalFlag = false this.$message({message: '操作成功', type: 'success'}) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 4fef656..3624d50 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -4,7 +4,7 @@ 刷新数据 保存 同意 - 驳回 + 驳回 @@ -232,6 +232,19 @@ + + + + + + + + + + 确定 + 取消 + + @@ -326,7 +339,9 @@ trigger: 'change' } ], - } + }, + rejectOpinion: '', + submitModalFlag: false, } }, methods: { @@ -695,6 +710,13 @@ }) }, + + // 打开提交模态框 + submitDataModal () { + this.rejectOpinion = '' + this.submitModalFlag = true + }, + // 驳回提交 rejectSubmit () { this.$confirm(`是否确认驳回?`, '提示', { @@ -707,7 +729,8 @@ userName: this.$store.state.user.name, codeNo: this.searchData.codeNo, menuId: '103002', - nodeConclusion: 'N' + nodeConclusion: 'N', + rejectOpinion : this.rejectOpinion } this.submitData(tempData) }) @@ -718,6 +741,7 @@ if (data && data.code === 0) { submitChange(tempData).then(({data}) => { if (data && data.code === 0) { + this.submitModalFlag = false this.$message({message: '操作成功', type: 'success'}) } else { this.$alert(data.msg, '错误', { diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index d5b218b..2142db4 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -1,6 +1,9 @@