diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml index 7753a56..6e79cc9 100644 --- a/pages/contract/add/add.wxml +++ b/pages/contract/add/add.wxml @@ -251,7 +251,7 @@ 招标日期 - {{form.biddingDate?form.biddingDate:'未选择'}} + {{form.biddingDate?form.biddingDate.slice(0,9):'未选择'}} @@ -292,7 +292,7 @@ 审核时间 - {{form.reviewTime?form.reviewTime:'未选择'}} + {{form.reviewTime?form.reviewTime.slice(0,9):'未选择'}} diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js index 0fb62a6..4b5ea16 100644 --- a/pages/fixedAssets/add/add.js +++ b/pages/fixedAssets/add/add.js @@ -276,7 +276,7 @@ Page({ this.setData({ 'form.netValue' : e.detail.value, 'form.netSalvage' : this.data.form.residualsRate*e.detail.value/100, - 'form.perYearDepreciationValue' : (e.detail.value-(this.data.form.residualsRate*e.detail.value/100))/this.data.form.expectedYears + 'form.perYearDepreciationValue' : (e.detail.value-(this.data.form.residualsRate*e.detail.value/100))/this.data.form.expectedYears.toFixed(2) }) if(e.currentTarget.dataset.name == 'form.residualsRate' ){ this.setData({ @@ -285,12 +285,12 @@ Page({ } if(e.currentTarget.dataset.name == 'form.netSalvage' ){ this.setData({ - 'form.perYearDepreciationValue' : (this.data.form.originalValue-e.detail.value)/this.data.form.expectedYears + 'form.perYearDepreciationValue' : (this.data.form.originalValue-e.detail.value)/this.data.form.expectedYears.toFixed(2) }) } if(e.currentTarget.dataset.name == 'form.expectedYears' ){ this.setData({ - 'form.perYearDepreciationValue' : (this.data.form.originalValue-this.data.form.netSalvage)/e.detail.value + 'form.perYearDepreciationValue' : (this.data.form.originalValue-this.data.form.netSalvage)/e.detail.value.toFixed(2) }) } if(e.currentTarget.dataset.name == 'form.depreciationYears' ){