diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index de403826..18416461 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -144,6 +144,7 @@ const addSystemConfig = (params)=>postAction("/systemConfig/add",params);
const editSystemConfig = (params)=>putAction("/systemConfig/update",params);
const checkSystemConfig = (params)=>getAction("/systemConfig/checkIsNameExist",params);
const getCurrentSystemConfig = (params)=>getAction("/systemConfig/getCurrentInfo",params);
+const fileSizeLimit = (params)=>getAction("/systemConfig/fileSizeLimit",params);
//用户|角色|模块关系
const addUserBusiness = (params)=>postAction("/userBusiness/add",params);
const editUserBusiness = (params)=>putAction("/userBusiness/update",params);
@@ -262,6 +263,7 @@ export {
editSystemConfig,
checkSystemConfig,
getCurrentSystemConfig,
+ fileSizeLimit,
addUserBusiness,
editUserBusiness,
checkUserBusiness,
diff --git a/jshERP-web/src/components/jeecg/JImageUpload.vue b/jshERP-web/src/components/jeecg/JImageUpload.vue
index 2f3163a6..d4d23e9a 100644
--- a/jshERP-web/src/components/jeecg/JImageUpload.vue
+++ b/jshERP-web/src/components/jeecg/JImageUpload.vue
@@ -28,6 +28,7 @@
import Vue from 'vue'
import { ACCESS_TOKEN } from "@/store/mutation-types"
import { getFileAccessHttpUrl } from '@/api/manage'
+ import { fileSizeLimit } from '@/api/api'
const uidGenerator=()=>{
return '-'+parseInt(Math.random()*10000+1,10);
@@ -50,6 +51,8 @@
fileList: [],
previewImage:"",
previewVisible: false,
+ sizeLimit: 0,
+ uploadGoOn:true,
}
},
props:{
@@ -89,10 +92,18 @@
}
},
created(){
+ this.initFileSizeLimit()
const token = Vue.ls.get(ACCESS_TOKEN);
this.headers = {"X-Access-Token":token}
},
methods:{
+ initFileSizeLimit() {
+ fileSizeLimit().then((res)=>{
+ if(res.code === 200) {
+ this.sizeLimit = res.data
+ }
+ })
+ },
initFileList(paths){
if(!paths || paths.length==0){
this.fileList = [];
@@ -118,13 +129,28 @@
this.fileList = fileList
},
beforeUpload: function(file){
- var fileType = file.type;
+ this.uploadGoOn=true
+ let fileType = file.type;
+ let fileSize = file.size;
if(fileType.indexOf('image')<0){
this.$message.warning('请上传图片');
+ this.uploadGoOn=false
return false;
}
+ //验证文件大小
+ if(fileSize>this.sizeLimit) {
+ let parseSizeLimit = (this.sizeLimit/1024/1024).toFixed(2)
+ this.$message.warning('抱歉，文件大小不能超过' + parseSizeLimit + 'M');
+ this.uploadGoOn=false
+ return false;
+ }
+ return true
},
handleChange(info) {
+ console.log("--文件列表改变--")
+ if(!info.file.status && this.uploadGoOn === false){
+ info.fileList.pop();
+ }
this.picUrl = false;
let fileList = info.fileList
if(info.file.status==='done'){
diff --git a/jshERP-web/src/components/jeecg/JUpload.vue b/jshERP-web/src/components/jeecg/JUpload.vue
index 240ba0eb..0e5aa8f7 100644
--- a/jshERP-web/src/components/jeecg/JUpload.vue
+++ b/jshERP-web/src/components/jeecg/JUpload.vue
@@ -45,6 +45,7 @@
import Vue from 'vue'
import { ACCESS_TOKEN } from "@/store/mutation-types"
import { getFileAccessHttpUrl } from '@/api/manage';
+ import { fileSizeLimit } from '@/api/api'
const FILE_TYPE_ALL = "all"
const FILE_TYPE_IMG = "image"
@@ -77,8 +78,9 @@
moveDisplay:'none',
showMoverTask:false,
moverHold:false,
- currentImg:''
+ currentImg:'',
//---------------------------- end 图片左右换位置 -------------------------------------
+ sizeLimit: 0
}
},
props:{
@@ -162,6 +164,7 @@
}
},
created(){
+ this.initFileSizeLimit()
const token = Vue.ls.get(ACCESS_TOKEN);
//---------------------------- begin 图片左右换位置 -------------------------------------
this.headers = {"X-Access-Token":token};
@@ -170,6 +173,13 @@
},
methods:{
+ initFileSizeLimit() {
+ fileSizeLimit().then((res)=>{
+ if(res.code === 200) {
+ this.sizeLimit = res.data
+ }
+ })
+ },
initFileListArr(val){
if(!val || val.length==0){
this.fileList = [];
@@ -234,7 +244,8 @@
},
beforeUpload(file){
this.uploadGoOn=true
- var fileType = file.type;
+ let fileType = file.type;
+ let fileSize = file.size;
if(this.fileType===FILE_TYPE_IMG){
if(fileType.indexOf('image')<0){
this.$message.warning('请上传图片');
@@ -242,7 +253,13 @@
return false;
}
}
- //TODO 扩展功能验证文件大小
+ //验证文件大小
+ if(fileSize>this.sizeLimit) {
+ let parseSizeLimit = (this.sizeLimit/1024/1024).toFixed(2)
+ this.$message.warning('抱歉，文件大小不能超过' + parseSizeLimit + 'M');
+ this.uploadGoOn=false
+ return false;
+ }
return true
},
handleChange(info) {
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 3e6a2a73..af27c693 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -797,8 +797,8 @@
-
-
+
+
-
+
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index d74d312d..8fd1a874 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -388,8 +388,8 @@
-
-
+
+
-
+
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index a7e09a58..cedc7883 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -143,7 +143,7 @@
-
+