diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml
index be5f7a9..9afdf6a 100644
--- a/pages/bank/add/add.wxml
+++ b/pages/bank/add/add.wxml
@@ -1,6 +1,6 @@
-
+
{{form.id?"":"新增"}}开户行
diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml
index 35e1862..31efe6b 100644
--- a/pages/bank/bank.wxml
+++ b/pages/bank/bank.wxml
@@ -1,6 +1,6 @@
-
+
开户行
diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml
index 8beac01..90a0bb2 100644
--- a/pages/bankDraft/add/add.wxml
+++ b/pages/bankDraft/add/add.wxml
@@ -1,6 +1,6 @@
-
+
{{form.id?"":"新增"}}银行汇票
diff --git a/pages/bankDraft/bankDraft.wxml b/pages/bankDraft/bankDraft.wxml
index d726c23..ed6fa9a 100644
--- a/pages/bankDraft/bankDraft.wxml
+++ b/pages/bankDraft/bankDraft.wxml
@@ -1,6 +1,6 @@
-
+
银行汇票
diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js
index 8276db8..98be027 100644
--- a/pages/contract/add/add.js
+++ b/pages/contract/add/add.js
@@ -273,6 +273,7 @@ Page({
UTIL.httpRequest(API.URL_GET_CONTRACTDETAIL + this.data.id, {method:'GET'}, {
success: (res) => {
this.setData({'form':res.data});
+ log
res.data.biddingDate = res.data.biddingDate.slice(0,9)
res.data.reviewTime = res.data.reviewTime.slice(0,9)
let that = this;
diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml
index 7753a56..e42cce7 100644
--- a/pages/contract/add/add.wxml
+++ b/pages/contract/add/add.wxml
@@ -1,6 +1,6 @@
-
+
{{form.id?"":"新增"}}合同信息
@@ -111,7 +111,7 @@
- *合同金额
+ *合同金额(元)
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index 4821006..ce1d460 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -1,6 +1,6 @@
-
+
合同信息
diff --git a/pages/contractAssets/fixedAssets.wxml b/pages/contractAssets/fixedAssets.wxml
index 3edaa63..99ff37e 100644
--- a/pages/contractAssets/fixedAssets.wxml
+++ b/pages/contractAssets/fixedAssets.wxml
@@ -1,6 +1,6 @@
-
+
可关联固定资产
diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js
index 1aac93c..a7b5569 100644
--- a/pages/fixedAssets/add/add.js
+++ b/pages/fixedAssets/add/add.js
@@ -275,8 +275,9 @@ Page({
})
if(e.currentTarget.dataset.name == 'form.originalValue' ){
this.setData({
- '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).toFixed(2)
+ 'form.netSalvage' : (this.data.form.residualsRate*e.detail.value/100).toFixed(2),
+ 'form.perYearDepreciationValue' : ((e.detail.value-(this.data.form.residualsRate*e.detail.value/100))/this.data.form.expectedYears).toFixed(2),
+ 'form.netValue':this.data.form.originalValue-this.data.form.depreciationValue
})
}
if(e.currentTarget.dataset.name == 'form.residualsRate' &&e.detail.value<=100){
diff --git a/pages/fixedAssets/add/add.wxml b/pages/fixedAssets/add/add.wxml
index 2672417..f6a15e0 100644
--- a/pages/fixedAssets/add/add.wxml
+++ b/pages/fixedAssets/add/add.wxml
@@ -1,6 +1,6 @@
-
+
{{form.id?"":"新增"}}资产信息
@@ -190,7 +190,7 @@
资产清理科目
-
+
@@ -206,7 +206,7 @@
折旧费用科目
-
+
diff --git a/pages/fixedAssets/fixedAssets.wxml b/pages/fixedAssets/fixedAssets.wxml
index d3b1c95..e5ad757 100644
--- a/pages/fixedAssets/fixedAssets.wxml
+++ b/pages/fixedAssets/fixedAssets.wxml
@@ -1,6 +1,6 @@
-
+
固定资产
diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml
index 61e7181..8bd644d 100644
--- a/pages/project/add/add.wxml
+++ b/pages/project/add/add.wxml
@@ -1,6 +1,6 @@
-
+
{{form.id?"":"新增"}}工程项目
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index f0b875b..ec73e34 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -1,6 +1,6 @@
-
+
工程项目
diff --git a/pages/project/project.wxss b/pages/project/project.wxss
index f0030e9..b598691 100644
--- a/pages/project/project.wxss
+++ b/pages/project/project.wxss
@@ -345,4 +345,4 @@ text{display: block;}
}
.van-icon-description{
font-size: 60px;
-}
\ No newline at end of file
+}