diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue
index ffa3a9190..d9ac7c7a6 100644
--- a/jero-web/src/components/viewFileModel/index.vue
+++ b/jero-web/src/components/viewFileModel/index.vue
@@ -5,10 +5,10 @@
style="z-index: 1007"
:visible="visibleFile"
:maskClosable="false"
- @cancel="visibleFile = false"
+ @cancel="visibleFile = false;$emit('visible')"
>
-
+
{{$t('cancel')}}
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 674fb5c81..ce2a0159a 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -26,8 +26,10 @@
-
+
@@ -81,6 +83,7 @@
import { getAction, putAction, downloadFile } from '@/api/manage'
import { mapGetters } from 'vuex'
import { postAction } from '../../../../api/manage'
+ import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default {
name: 'evaluationResultsList',
@@ -88,12 +91,14 @@
uploadFile,
viewFileModel
},
+ mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
loading: false,
total: 0,
pageSize: 10,
pageNo: 1,
+ isTrue: true,
flag:false,
dataSource: [],
formInline: {},
@@ -170,6 +175,9 @@
},
methods: {
...mapGetters(['userInfo']),
+ sVisible(){
+ this.getDataAdmin()
+ },
clickButtonToUpload(item) {
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
@@ -257,6 +265,12 @@
seeFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
},
+ getDataAdmin(){
+ this.isTrue = false
+ setTimeout(()=>{
+ this.isTrue = true
+ },100)
+ },
endProcessClick() {
let query = {
ids: this.$route.query.id
@@ -276,7 +290,7 @@
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 91cc0667f..d723a70cc 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -465,4 +465,8 @@
::v-deep .ant-table-body {
background: transparent !important;
}
+
+ ::v-deep .ant-table-placeholder {
+ margin-top: 8px !important;
+ }
\ No newline at end of file