Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat

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'}};">

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>
 

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'}};">

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>
 

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;

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;" />

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>
 

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>
 

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){

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>

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>
 

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'}};">

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>
 

pages/project/project.wxss

@@ -345,4 +345,4 @@ text{display: block;}
 }
 .van-icon-description{
   font-size: 60px;
-}
+}