diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue index 091d0b1f8..cdf49d3f1 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue @@ -71,17 +71,17 @@
{{ StandardApplyForEO.reason ? StandardApplyForEO.reason : '--' }}
- +
{{ StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--' }}
- +
{{ StandardApplyForEO.approveTime ? StandardApplyForEO.approveTime : '--' }}
- +
{{ StandardApplyForEO.refuseCause ? StandardApplyForEO.refuseCause : '--' }}
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue index bbf5c1ea4..6227e70da 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/standardTranslationAcquisitionRequestModal.vue @@ -171,7 +171,7 @@ export default { this.$emit('updateIndexList') }, toView (item) { - this.$refs.addModalRef.showModal(item) + this.$refs.detailModalRef.showModal(item) }, edit (item) { this.$refs.addModalRef.showModal(item) diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue index ead6c0169..fbb5632af 100644 --- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue +++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue @@ -204,6 +204,7 @@ export default { data () { return { tableLoading: false, + selectedTag: true, total: 0, StandardApplyForEOPage: { page: 1, @@ -254,7 +255,7 @@ export default { methods: { ResubmitOrWithdraw (id, status) { const query = { - status: status, + status: status ? status : '', ids: id } this.$http.postData('/lawss/standardApplyFor/batchUpdateStatus', query, { _this: this }, res => { @@ -351,6 +352,14 @@ export default { }) return } + if (!this.selectedTag) { + this.$message({ + message: '只能选择待审批的数据,请重新选择', + type: 'warning', + offset: 20 + }) + return + } const ids = id.join(',') this.$confirm('确定通过?', '提示', { confirmButtonText: '确定', @@ -381,6 +390,14 @@ export default { }) return } + if (!this.selectedTag) { + this.$message({ + message: '只能选择待审批的数据,请重新选择', + type: 'warning', + offset: 20 + }) + return + } const ids = id.join(',') this.$prompt('请输入驳回原因', '提示', { confirmButtonText: '确定', @@ -466,6 +483,10 @@ export default { const ids = [] value.forEach(item => { ids.push(item.id) + this.selectedTag = true + if (item.status !== 'pendingApproval') { + this.selectedTag = false + } }) this.selectedList = [ ...ids ] }