diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1a3566d7b..6ab58be1f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -899,4 +899,5 @@ module.exports = {
fullScreenView:'Full Screen View',
systemPrompt:'System Prompt',
loginExpired:'Login Expired',
+ reportNotUploaded:'Report not uploaded',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2c5d00079..a8e3b61c1 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -904,4 +904,5 @@ module.exports = {
fullScreenView:'全屏查看',
systemPrompt:'系统提示',
loginExpired:'登录已过期',
+ reportNotUploaded:'报告未上传',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index b661d8d5b..c29e0e9d9 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -151,10 +151,10 @@
@click="deleteLib(record)">
{{ $t('deleteLib') }}
-
-
-
-
+
+ {{$t('resultReported')}}
+
{{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
@@ -303,7 +303,7 @@
-
+
@@ -1371,8 +1371,15 @@
},
resultReportedClick(val) {
- this.clickButtonToUpload(val, 1)
- // this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val)
+ if (val.regulationOwnerId == this.userInfo().id) {
+ this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val)
+ } else {
+ if (val.fileId) {
+ this.clickButtonToUpload(val.fileId, 1)
+ } else {
+ this.$message.warning(this.$t('reportNotUploaded'))
+ }
+ }
}
}
}
diff --git a/jero-web/src/views/projectManagement/components/resultReportedUpload.vue b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue
index c8d67f6ed..cfe7d6c92 100644
--- a/jero-web/src/views/projectManagement/components/resultReportedUpload.vue
+++ b/jero-web/src/views/projectManagement/components/resultReportedUpload.vue
@@ -14,7 +14,7 @@
name="file"
:file-list="myfileList"
:multiple="true"
- :action="uploadAction+'?state='+state+'&cut='+cut"
+ :action="uploadAction+'?cut='+cut"
:headers="headers"
@preview="preview"
:before-upload="beforeUpload"
@@ -33,7 +33,7 @@