From 7c9c11ddcfb1b47f938b061066759c66835204d5 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Wed, 1 Jun 2022 15:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bank/add/add.wxml               | 2 +-
 pages/bank/bank.wxml                  | 2 +-
 pages/bankDraft/add/add.wxml          | 2 +-
 pages/bankDraft/bankDraft.wxml        | 2 +-
 pages/contract/add/add.js             | 1 +
 pages/contract/add/add.wxml           | 4 ++--
 pages/contract/contract.wxml          | 2 +-
 pages/contractAssets/fixedAssets.wxml | 2 +-
 pages/fixedAssets/add/add.js          | 5 +++--
 pages/fixedAssets/add/add.wxml        | 6 +++---
 pages/fixedAssets/fixedAssets.wxml    | 2 +-
 pages/project/add/add.wxml            | 2 +-
 pages/project/project.wxml            | 2 +-
 pages/project/project.wxss            | 2 +-
 14 files changed, 19 insertions(+), 17 deletions(-)

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 @@
 <!--pages/payee/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}开户行</text>
 </view>
 <view class="main-box table-box table-boxs" style="margin-top:{{isIPX?'100px':'75px'}};">
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 @@
 <!--pages/bank/bank.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">开户行</text>
 </view>
 
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 @@
 <!--pages/payee/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}银行汇票</text>
 </view>
 <view class="main-box table-box table-boxs" style="margin-top:{{isIPX?'100px':'75px'}};">
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 @@
 <!--pages/bank/bank.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">银行汇票</text>
 </view>
 
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 @@
 <!--pages/contract/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-    <image src="../../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+    <image src="../../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
     <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}合同信息</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
@@ -111,7 +111,7 @@
         </view>
         <view>
             <view>
-                <text><text style="color:red;margin-right: 10rpx;">*</text>合同金额</text>
+                <text><text style="color:red;margin-right: 10rpx;">*</text>合同金额(元)</text>
             </view>
             <view>
                 <input type="text" value="{{form.totalAmount}}" bindinput="bindNewInput" type="digit" data-name="form.totalAmount" placeholder="合同金额" style="text-align: right;margin-top: 20rpx;" />
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 @@
 <!--pages/bank/bank.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">合同信息</text>
 </view>
 
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 @@
 <!--pages/fixedAssets/fixedAssets.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">可关联固定资产</text>
 </view>
 
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 @@
 <!--pages/contract/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-    <image src="../../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+    <image src="../../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
     <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}资产信息</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
@@ -190,7 +190,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>资产清理科目</text>
             </view>
             <view>
-                <input type="text" value="{{form.fixedSubject}}" bindinput="bindNewInput" disabled="true" data-name="form.fixedSubject" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.fixedSubject}}" bindinput="bindNewInput" readonly data-name="form.fixedSubject" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -206,7 +206,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>折旧费用科目</text>
             </view>
             <view>
-                <input type="text" value="{{form.depreciationFeeSubject}}" disabled="true" bindinput="bindNewInput" data-name="form.depreciationFeeSubject" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.depreciationFeeSubject}}" disabled="true" bindinput="bindNewInput" data-name="form.depreciationFeeSubject" style="text-align: right;margin-top: 20rpx;margin-left: -30%;" />
             </view>
         </view>
         <view>
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 @@
 <!--pages/fixedAssets/fixedAssets.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">固定资产</text>
 </view>
 
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 @@
 <!--pages/payee/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
+  <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}工程项目</text>
 </view>
 <view class="main-box table-box table-boxs" style="margin-top:{{isIPX?'100px':'75px'}};">
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 @@
 <!--pages/project/project.wxml-->
 <view class="ns" id="top_ban" style="height:{{isIPX?'88px':'64px'}};">
-  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
+  <image src="../../image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};height: 19.0909px;" mode="widthFix" bindtap="back" referrer="no-referrer|origin|unsafe-url"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">工程项目</text>
 </view>
 
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
+}