Commit f0281d7c authored by 黄奎's avatar 黄奎

1

parent 5fd8c4f3
...@@ -672,7 +672,7 @@ export default { ...@@ -672,7 +672,7 @@ export default {
resultCode: 1, resultCode: 1,
data: 0, data: 0,
}; };
if (authCode&&authCode!='' && localStorageJson && localStorageJson.ActionMenu && localStorageJson.ActionMenu.length > 0) { if (authCode && authCode != '' && localStorageJson && localStorageJson.ActionMenu && localStorageJson.ActionMenu.length > 0) {
localStorageJson.ActionMenu.forEach(sItem => { localStorageJson.ActionMenu.forEach(sItem => {
if (data.data == 0 && sItem.ActionCode.toLowerCase() == authCode.toLowerCase()) { if (data.data == 0 && sItem.ActionCode.toLowerCase() == authCode.toLowerCase()) {
data.data = 1; data.data = 1;
...@@ -1280,13 +1280,17 @@ export default { ...@@ -1280,13 +1280,17 @@ export default {
.then(res => { .then(res => {
successCall(res); successCall(res);
}).catch(function (reason) { }).catch(function (reason) {
that.$refs['my-upload'].clearFiles(); if (that.$refs['my-upload']) {
that.$refs['my-upload'].clearFiles();
}
that.$message.error('上传失败!'); that.$message.error('上传失败!');
that.MsgBus.$emit('UploadSelfFileErr') that.MsgBus.$emit('UploadSelfFileErr')
}); });
} }
}).catch(function (err) { }).catch(function (err) {
that.$refs['my-upload'].clearFiles(); if (that.$refs['my-upload']) {
that.$refs['my-upload'].clearFiles();
}
that.$message.error('上传失败!'); that.$message.error('上传失败!');
}); });
} }
...@@ -1460,8 +1464,12 @@ export default { ...@@ -1460,8 +1464,12 @@ export default {
let x = nStr.split('.'); let x = nStr.split('.');
let x1 = x[0]; let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : ''; let x2 = x.length > 1 ? '.' + x[1] : '';
if(x2=='.00'){x2='';} if (x2 == '.00') {
if(x2!=''&&x2.slice(-1)=='0'){x2=x2.replace('0','')} x2 = '';
}
if (x2 != '' && x2.slice(-1) == '0') {
x2 = x2.replace('0', '')
}
var rgx = /(\d+)(\d{3})/; var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) { while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2'); x1 = x1.replace(rgx, '$1' + ',' + '$2');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment