diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 0310841..f91960d 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -513,3 +513,7 @@ input[type="number"] { -moz-appearance: textfield; /* Firefox */ text-align: right; } +.auto .el-form-item__content{ + height: auto; + line-height: 1.5; +} diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index 5eb5b73..87d52bc 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -313,7 +313,7 @@ 保存 关闭 同意 - 驳回 + 驳回 @@ -1016,7 +1016,17 @@ 关闭 - + + + + + + + + 确定 + 取消 + + @@ -1120,6 +1130,11 @@ export default { this.$refs.projectPartTable.clearSelection(); } }, + rejectVisible(newVal,oldVal){ + if (newVal === false){ + this.rejectOpinion = '' + } + } }, computed: { delegateAccessName: { @@ -2277,6 +2292,8 @@ export default { columnWidth: 140 } ], + rejectVisible: false, + rejectOpinion: '', } }, mounted() { @@ -3638,6 +3655,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { + this.modalData.rejectOpinion = this.rejectOpinion this.modalData.nodeConclusion = 'N' this.submitData() }) diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 6237105..f684a7d 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -370,7 +370,7 @@ 保存 关闭 同意 - 驳回 + 驳回 @@ -561,6 +561,19 @@ + + + + + + + + + 确定 + 取消 + + + @@ -993,6 +1006,11 @@ export default { this.$refs.projectPartTable.clearSelection(); } }, + rejectVisible(newVal,oldVal){ + if (newVal === false){ + this.rejectOpinion = '' + } + } }, data() { @@ -2080,6 +2098,8 @@ export default { columnWidth: 140 } ], + rejectVisible:false, + rejectOpinion:'', } }, mounted() { @@ -3386,6 +3406,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { + this.modalData.rejectOpinion = this.rejectOpinion this.modalData.nodeConclusion = 'N' this.submitData() })