diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue index 7ace56299..96f4f6441 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue @@ -379,7 +379,7 @@ } else if (data == '2') { return '审批通过' } else { - return data; + return '作废'; } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue index acc3eb81a..9a4348ac7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue @@ -148,7 +148,8 @@ }, UpperAmount: { type: 'text', - title: '总金额' + title: '总金额', + verify: 'NotNull' }, Status: { type: 'text', @@ -207,6 +208,7 @@ // this.dataSource.FundsApply.CheckStatus = result.data.map(t => ({ text: t.name, value: t.id })) // }), ]) + // console.log(this.dataSource.FundsApply.ApplyUser) await this.fetchForm() this.ready = true @@ -221,7 +223,7 @@ // this.EnCode = result.EnCode const source = { ApplyDept: this.user.departmentId, - ApplyUser: this.user.account, + ApplyUser: this.user.userId, ApplyTime: new Date().getTime() }; let resultres = Object.assign(result, source) @@ -358,9 +360,15 @@ }, del(str, num) { console.log(str) + let _this = this this.FundsApplyDetail.splice(num, 1) console.log(this.FundsApplyDetail) - // this.queryData[str].splice(num, 1) + let Amounts = _this.FundsApplyDetail.map(item => { + return item.Amount + }) + + _this.current.FundsApply.SumAmount = _this.sum(Amounts) + _this.current.FundsApply.UpperAmount = _this.smalltoBIG(_this.current.FundsApply.SumAmount) }, SumAmountChange(item) { console.log(item) @@ -381,6 +389,9 @@ }, sum(args) { + if(args == 0){ + return '' + } // var args = arguments,//获取所有的参数 var d = 0, //定义小数位的初始长度,默认为整数,即小数位为0 sum = 0; //定义sum来接收所有数据的和 @@ -405,6 +416,9 @@ return sum / m; }, smalltoBIG(n) { + if(n == 0){ + return '' + } var fraction = ['角', '分']; var digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']; var unit = [