diff --git a/src/utils/finance.js b/src/utils/finance.js index 8dac27d2..d00466a9 100644 --- a/src/utils/finance.js +++ b/src/utils/finance.js @@ -236,6 +236,27 @@ export const FINANCE = { a = new BigNumber(a, 10); return a.isZero(); }, + sub(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.minus(b, 10); + }, + mul(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.multipliedBy(b, 10); + }, + div(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.div(b, 10); + }, toNumber(a) { if(typeof(a) === 'number') return a; diff --git a/src/views/sunVillage_info/list_register_add.vue b/src/views/sunVillage_info/list_register_add.vue index 559b0fd6..6514591f 100644 --- a/src/views/sunVillage_info/list_register_add.vue +++ b/src/views/sunVillage_info/list_register_add.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -113,7 +114,12 @@ this.jobTime = data; this.showBuildTime = false; }, - + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_register_edit.vue b/src/views/sunVillage_info/list_register_edit.vue index b08b22ca..a60a4207 100644 --- a/src/views/sunVillage_info/list_register_edit.vue +++ b/src/views/sunVillage_info/list_register_edit.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob , getOddjob , updateOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -122,6 +123,12 @@ this.jobTime = data; this.showBuildTime = false; }, + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 0e6fde90..6782be19 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -25,8 +25,8 @@ - - + + 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue index b079f517..5c20d17b 100644 --- a/src/views/sunVillage_info/list_tourists_registration_edit.vue +++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue @@ -25,8 +25,8 @@ - - + + 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, }