diff --git a/pages/bank/add/add.js b/pages/bank/add/add.js
index 15f82e7..07475f3 100644
--- a/pages/bank/add/add.js
+++ b/pages/bank/add/add.js
@@ -16,45 +16,61 @@ Page({
       bankType: "", //所属银行 必填
       bankDeposit: "", //开户行 必填
       payeePaymentLines: "", //联行号 //必填
+      
     },
+    status:0,
     id:"",
-    bankTypeOptions:[]
+    bankTypeOptions:[],
+    bankTypeindex:''
   },
   back:function(){
     wx.navigateBack({
       delta: 1
     })
   },
+  onConfirmbankType (e) {
+    let obj =  e.detail.value;
+    this.setData({
+      'form.bankType':this.data.bankTypeOptions[obj].dictValue,
+      'bankTypeindex':obj
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
     if(options.id!=null&&options.id!=""){
+      let that = this
       this.setData({id:options.id})
       UTIL.httpRequest(API.URL_GET_DEPOSITDETAIL + this.data.id, {method:'GET'}, {
         success: (res) => {
+          this.setData({'form':res.data})
           UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
             success: (r) => {
-              this.setData({
-                bankTypeOptions:r.data
-              });
-              console.log(this.data.bankTypeOptions)
-              this.data.bankTypeOptions.map(rr => {
-                if(rr.dictValue == res.data.bankType){
-                  res.data.bankTypeText = rr.dictLabel
-                  this.setData({'form':res.data});
-                }
-              })
+              if(r.data.length>0){
+                that.setData({
+                  bankTypeOptions:r.data,
+                })
+                r.data.map((rr,ind) => {
+                     if(rr.dictValue == res.data.bankType){
+                       that.setData({'bankTypeindex':ind})
+                     }
+                 })
+              }
             }
           })
         }
       })
     }else{
+      let that = this
       UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
         success: (r) => {
-          this.setData({
-            bankTypeOptions:r.data
-          });
+          if(r.data.length>0){
+            that.setData({
+              bankTypeOptions:r.data,
+              'form.bankType':r.data[0].dictValue
+            })
+          }
         }
       })
     }
@@ -125,7 +141,7 @@ Page({
     })
   },
   goSubmit(){
-    console.log(this.data.form)
+
     if(this.data.form.sheng===''||this.data.form.sheng==null){ //省
       UTIL.showToastNoneIcon('请填写省！');
       return false;
@@ -141,7 +157,8 @@ Page({
     }else if(this.data.form.payeePaymentLines === ''||this.data.form.payeePaymentLines==null){//联行号
       UTIL.showToastNoneIcon('请输入联行号！');
       return false;
-    }else{
+    }else if(this.data.status=='0'){
+      this.setData({'status':1})
       var that = this;
       that.data.form.method = 'POST';
       if(that.data.form.id==""||that.data.form.id==null){
@@ -157,6 +174,18 @@ Page({
                 delta:1
               })
             },2000)
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }else{
@@ -172,6 +201,18 @@ Page({
                 delta:1
               })
             },2000)
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }
diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml
index 414f5c7..be5f7a9 100644
--- a/pages/bank/add/add.wxml
+++ b/pages/bank/add/add.wxml
@@ -3,22 +3,20 @@
   <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
   <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}开户行</text>
 </view>
-<view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
+<view class="main-box table-box table-boxs" style="margin-top:{{isIPX?'100px':'75px'}};">
 
     <van-field label="省" value="{{ form.sheng }}" placeholder="请输入省" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.sheng"/>
     <van-field label="市" value="{{ form.shi }}" placeholder="请输入市" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.shi"/>
-    <van-popup show="{{showBankType}}" round position="bottom"  bind:close="closeBox" data-name="showBankType">
-      <van-picker
-        columns="{{bankTypeOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirm"
-        data-name="showBankType"
-        data-value="form.bankType"
-      />
-    </van-popup>
-    <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" readonly placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/>
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>所属银行</view>
+            <picker bindchange="onConfirmbankType" value="{{bankTypeindex}}" range="{{bankTypeOptions}}" range-key="{{'dictLabel'}}">
+                <view class="picker">
+                    {{bankTypeOptions[bankTypeindex].dictLabel?bankTypeOptions[bankTypeindex].dictLabel:"选择所属银行"}}
+                    <van-icon name="arrow-down" />
+                </view>
+            </picker>
+        </view>
+    <!-- <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" readonly placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/> -->
     <van-field label="开户行" value="{{ form.bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" required  data-formname="form.bankDeposit" />
     <van-field label="联行号" value="{{ form.payeePaymentLines }}" type="number" placeholder="请输入联行号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
   </view>
diff --git a/pages/bank/add/add.wxss b/pages/bank/add/add.wxss
index af85688..2a70dc8 100644
--- a/pages/bank/add/add.wxss
+++ b/pages/bank/add/add.wxss
@@ -56,4 +56,9 @@
   padding: 8px 0px;
   background-image: linear-gradient(to right, #2C8E68, #5CAE77);
   color: #fff;
+}
+.table-boxs>view{
+  display: flex;
+  justify-content: space-between;
+  line-height: 100rpx;
 }
\ No newline at end of file
diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js
index e391d09..c3a5930 100644
--- a/pages/bankDraft/add/add.js
+++ b/pages/bankDraft/add/add.js
@@ -29,13 +29,15 @@ Page({
     showBtn:true,
     showStartTime:false,
     showEndTime:false,
+    orderTypeindex:0,
+    orderStatusindex:0,
+    status:0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log(options)
     if(options.id!=null&&options.id!=""){
       let that = this
       this.setData({id:options.id})
@@ -44,32 +46,35 @@ Page({
           if(res.data.orderStatus!='1'){
               this.setData({'showBtn':false});
           }
+          this.setData({'form':res.data})
           //汇票类型
           UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, {
-            success: (rr) => {
-              this.setData({
-                orderTypeOptions:rr.data
-              });
-              this.data.orderTypeOptions.map(r => {
-                if(r.dictValue == res.data.orderType){
-                    res.data.orderTypeText = r.dictLabel
-                    that.setData({'form':res.data});
-                }
-              })
+            success: (r) => {
+              if(r.data.length>0){
+                that.setData({
+                  orderTypeOptions:r.data,
+                })
+                r.data.map((rr,ind) => {
+                     if(rr.dictValue == res.data.orderType){
+                       that.setData({'orderTypeindex':ind})
+                     }
+                 })
+              }
             }
           })
           //汇票状态
           UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_status', {method:'GET'}, {
-            success: (rr) => {
-              this.setData({
-                orderStatusOptions:rr.data
-              });
-              this.data.orderStatusOptions.map(r => {
-                if(r.dictValue == res.data.orderStatus){
-                    res.data.orderStatusText = r.dictLabel
-                    that.setData({'form':res.data});
-                }
-              })
+            success: (r) => {
+              if(r.data.length>0){
+                that.setData({
+                  orderStatusOptions:r.data,
+                })
+                r.data.map((rr,ind) => {
+                     if(rr.dictValue == res.data.orderStatus){
+                       that.setData({'orderStatusindex':ind})
+                     }
+                 })
+              }
             }
           })
         }
@@ -112,20 +117,27 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    let that = this
     //汇票类型
     UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_type', {method:'GET'}, {
       success: (res) => {
-        this.setData({
-          orderTypeOptions:res.data
-        });
+        if(res.data.length>0){
+          that.setData({
+            orderTypeOptions:res.data,
+            'form.orderType':res.data[0].dictValue
+          })
+        }
       }
     })
     //汇票状态
     UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'order_status', {method:'GET'}, {
       success: (res) => {
-        this.setData({
-          orderStatusOptions:res.data
-        });
+        if(res.data.length>0){
+          that.setData({
+            orderStatusOptions:res.data,
+            'form.orderStatus':res.data[0].dictValue
+          })
+        }
       }
     })
   },
@@ -142,17 +154,23 @@ Page({
     })
   },
   closeBox(even){
-    console.log(even.currentTarget.dataset.name);
     this.setData({
       [even.currentTarget.dataset.name]:false
     })
   },
-  onConfirmOrderType(event) {
+  onConfirmorderType (e) {
+    let obj =  e.detail.value;
     this.setData({
-      [event.currentTarget.dataset.name]: false,
-      [event.currentTarget.dataset.value]: event.detail.value.dictValue,
-      [event.currentTarget.dataset.value+'Text']: event.detail.value.dictLabel,
-    });
+      'form.orderType':this.data.orderTypeOptions[obj].dictValue,
+      'orderTypeindex':obj
+    })
+  },
+  onConfirmorderStatus (e) {
+    let obj =  e.detail.value;
+    this.setData({
+      'form.orderStatus':this.data.orderStatusOptions[obj].dictValue,
+      'orderStatusindex':obj
+    })
   },
   goSubmit(){
     if(this.data.form.orderNum===''||this.data.form.orderNum==null){ //汇票号码
@@ -182,7 +200,8 @@ Page({
     }else if(this.data.form.orderStatus === ''||this.data.form.orderStatus==null){//联行号
       UTIL.showToastNoneIcon('汇票状态不能为空！');
       return false;
-    }else{
+    }else if(this.data.status=='0'){
+      this.setData({'status':1})
       var that = this;
       that.data.form.method = 'POST';
       if(that.data.form.id==""||that.data.form.id==null){
@@ -198,6 +217,18 @@ Page({
                 },2000)
               }
             })
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }else{
@@ -213,6 +244,18 @@ Page({
                 },2000)
               }
             })
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }
diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml
index 60fc3db..8beac01 100644
--- a/pages/bankDraft/add/add.wxml
+++ b/pages/bankDraft/add/add.wxml
@@ -6,8 +6,16 @@
 <view class="main-box table-box table-boxs" style="margin-top:{{isIPX?'100px':'75px'}};">
 
     <van-field label="汇票号码" value="{{ form.orderNum }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderNum"/>
-
-    <van-popup show="{{showOrderType}}" round position="bottom"  bind:close="closeBox" data-name="showOrderType">
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>汇票类型</view>
+            <picker bindchange="onConfirmorderType" value="{{orderTypeindex}}" range="{{orderTypeOptions}}" range-key="{{'dictLabel'}}">
+                <view class="picker">
+                    {{orderTypeOptions[orderTypeindex].dictLabel?orderTypeOptions[orderTypeindex].dictLabel:"选择汇票类型"}}
+                    <van-icon name="arrow-down" />
+                </view>
+            </picker>
+        </view>
+    <!-- <van-popup show="{{showOrderType}}" round position="bottom"  bind:close="closeBox" data-name="showOrderType">
       <van-picker
         columns="{{orderTypeOptions}}"
         show-toolbar
@@ -18,7 +26,7 @@
         data-value="form.orderType"
       />
     </van-popup>
-    <van-field label="汇票类型" value="{{ form.orderTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderType" is-link arrow-direction	="down" bindtap="openBox" data-name="showOrderType"/>
+    <van-field label="汇票类型" value="{{ form.orderTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderType" is-link arrow-direction	="down" bindtap="openBox" data-name="showOrderType"/> -->
 
     <van-field label="出票金额" value="{{ form.orderAmount }}" type="digit" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderAmount"/>
     
@@ -40,18 +48,15 @@
               </view>
           </picker>
       </view>
-    <van-popup show="{{showOrderStatus}}" round position="bottom"  bind:close="closeBox" data-name="showOrderStatus">
-      <van-picker
-        columns="{{orderStatusOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirmOrderType"
-        data-name="showOrderStatus"
-        data-value="form.orderStatus"
-      />
-    </van-popup>
-    <van-field label="汇票状态" value="{{ form.orderStatusText }}" readonly placeholder="汇票状态" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderStatus" is-link arrow-direction	="down"  bindtap="openBox" data-name="showOrderStatus"/>
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>汇票状态</view>
+            <picker bindchange="onConfirmorderStatus" value="{{orderStatusindex}}" range="{{orderStatusOptions}}" range-key="{{'dictLabel'}}">
+                <view class="picker">
+                    {{orderStatusOptions[orderStatusindex].dictLabel?orderStatusOptions[orderStatusindex].dictLabel:"选择汇票状态"}}
+                    <van-icon name="arrow-down" />
+                </view>
+            </picker>
+        </view>
     <van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right"  data-value="form.remark"/>
   </view>
   <view class="bottom" wx:if="{{showBtn}}">
diff --git a/pages/contract/add/add.js b/pages/contract/add/add.js
index 7d5df95..1e3c68e 100644
--- a/pages/contract/add/add.js
+++ b/pages/contract/add/add.js
@@ -41,6 +41,8 @@ Page({
     biddingWayOptions: [],
     // 招标类型字典
     biddingTypeOptions: [],
+
+    status:0,
   },
   back:function(){
     wx.navigateBack({
@@ -193,7 +195,8 @@ Page({
     }else if(this.data.form.contractionStatus === ''||this.data.form.contractionStatus==null){//合同状态
       UTIL.showToastNoneIcon('单价不能为空！');
       return false;
-    }else{
+    }else if(this.data.status=='0'){
+      this.setData({'status':1})
       if(this.data.form.id!=null&&this.data.form.id!=""){
         let data = this.data.form;
         data.method = "POST";
@@ -209,6 +212,18 @@ Page({
                 }else{
                   UTIL.showToastNoneIcon('修改失败');
                 }
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }else{
@@ -226,6 +241,18 @@ Page({
           }else{
             UTIL.showToastNoneIcon('新增失败');
           }
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }
@@ -345,10 +372,10 @@ Page({
                      biddingTypeOptions:r.data,
                    })
                    r.data.map((rr,ind) => {
-                    if(rr.dictValue == res.data.biddingType){
-                       that.setData({'biddingTypeindex':ind})
-                    }
-                })
+                        if(rr.dictValue == res.data.biddingType){
+                          that.setData({'biddingTypeindex':ind})
+                        }
+                    })
                  }
                }
              })
diff --git a/pages/contract/add/add.wxml b/pages/contract/add/add.wxml
index 7f78cb8..7753a56 100644
--- a/pages/contract/add/add.wxml
+++ b/pages/contract/add/add.wxml
@@ -122,7 +122,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>数量/面积</text>
             </view>
             <view>
-                <input type="text" value="{{form.num}}" bindinput="bindNewInput" type="digit" data-name="form.num" type="number" placeholder="数量/面积" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.num}}" bindinput="bindNewInput" type="digit" data-name="form.num" placeholder="数量/面积" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -251,7 +251,7 @@
             <view class="section__title"><text style="color:red;margin-right: 22rpx;"></text>招标日期</view>
             <picker mode="date" value="{{form.biddingDate}}" fields="day" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmBiddingDate">
                 <view class="picker">
-                    {{form.biddingDate?form.biddingDate:'招标日期'}}
+                    {{form.biddingDate?form.biddingDate:'未选择'}}
                 </view>
             </picker>
         </view>
@@ -292,7 +292,7 @@
             <view class="section__title"><text style="color:red;margin-right: 22rpx;"></text>审核时间</view>
             <picker mode="date" value="{{form.reviewTime}}" fields="day" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmReviewTime">
                 <view class="picker">
-                    {{form.reviewTime?form.reviewTime:'审核时间'}}
+                    {{form.reviewTime?form.reviewTime:'未选择'}}
                 </view>
             </picker>
         </view>
diff --git a/pages/contractAssets/fixedAssets.js b/pages/contractAssets/fixedAssets.js
index 965a68e..64b77f3 100644
--- a/pages/contractAssets/fixedAssets.js
+++ b/pages/contractAssets/fixedAssets.js
@@ -25,7 +25,8 @@ Page({
     showPopup:false,
     fileEvent:{},
     itemId:"",
-    assetTypeOptions:[]
+    assetTypeOptions:[],
+    status:0,
   },
   goAdd(){
     wx.navigateTo({
@@ -150,7 +151,9 @@ Page({
     this.getList();
   },
   goUpdate(e){
-    let data = e.currentTarget.dataset.item;
+      if(this.data.status=='0'){
+      this.setData({'status':1})
+        let data = e.currentTarget.dataset.item;
         data.method = "POST";
         data.assetTable = "t_asset_permanent"
         data.assetId = e.currentTarget.dataset.item.id
@@ -163,15 +166,17 @@ Page({
         success: (res) => {
           if(res.code == 200){
           UTIL.showToastNoneIcon(res.msg);
+          this.setData({'status':0})
           wx.navigateBack({
             delta: 1
           })
         }else{
           UTIL.showToastNoneIcon(res.msg);
+          this.setData({'status':0})
         }
         }
       })
-  
+    }
   },
   delete(e){
     UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
diff --git a/pages/fixedAssets/add/add.js b/pages/fixedAssets/add/add.js
index d5ad435..0fb62a6 100644
--- a/pages/fixedAssets/add/add.js
+++ b/pages/fixedAssets/add/add.js
@@ -28,6 +28,7 @@ Page({
         expectedYears:1,
         depreciationYears:0,
         depreciationValue:0,
+        perYearDepreciationValue:0,
     },
     assetTypeindex:'0',
     operationTypendex:'0',
@@ -57,6 +58,8 @@ Page({
    sysYesNoOptions: [],
    //单位字段
    unitOptions:[],
+
+   status:0,
   },
   back:function(){
     wx.navigateBack({
@@ -113,9 +116,10 @@ Page({
     })
   },
   onConfirmIsMin (e) {
+    console.log(e);
     let obj =  e.detail.value;
     this.setData({
-      'form.isMin':this.data.isMinOptions[obj].dictValue,
+      'form.isMin':this.data.sysYesNoOptions[obj].dictValue,
       'isMinindex':obj
     })
   },
@@ -129,7 +133,7 @@ Page({
   onConfirmIsFormAsset (e) {
     let obj =  e.detail.value;
     this.setData({
-      'form.isFormAsset':this.data.isFormAssetOptions[obj].dictValue,
+      'form.isFormAsset':this.data.sysYesNoOptions[obj].dictValue,
       'isFormAssetindex':obj
     })
   },
@@ -199,7 +203,8 @@ Page({
     }else if(this.data.form.depreciationType == ''||this.data.form.depreciationType==null){//已结款
       UTIL.showToastNoneIcon('折旧方式不能为空！');
       return false;
-    }else{
+    }else if(this.data.status == '0'){
+      this.setData({'status':'1'})
       if(this.data.form.id!=null&&this.data.form.id!=""){
         let data = this.data.form;
         data.method = "POST";
@@ -214,7 +219,20 @@ Page({
                   },2000)
                 }else{
                   UTIL.showToastNoneIcon('修改失败');
+                  this.setData({'status':'0'})
                 }
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }else{
@@ -231,7 +249,20 @@ Page({
             },2000)
           }else{
             UTIL.showToastNoneIcon(res.msg);
+            this.setData({'status':'0'})
           }
+          },
+          fail: function (response) {
+            if (typeof fail === FUNCTION_TEXT) {
+              fail(handleFail(response));
+            } else {
+              showToastNoneIcon(API.MSG_FAIL_HTTP);
+            }
+            this.setData({'status':0})
+          },
+          complete: function (response) {
+            this.setData({'status':0})
+            wx.hideNavigationBarLoading();
           }
         })
       }
diff --git a/pages/fixedAssets/add/add.wxml b/pages/fixedAssets/add/add.wxml
index 5a75db7..4c76a45 100644
--- a/pages/fixedAssets/add/add.wxml
+++ b/pages/fixedAssets/add/add.wxml
@@ -14,7 +14,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>资产编码</text>
             </view>
             <view>
-                <input type="text" value="{{form.code}}" bindinput="bindNewInput" data-name="form.code" placeholder="请输入资产编码"  style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.code}}" bindinput="bindNewInput" data-name="form.code" placeholder="资产编码"  style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -22,7 +22,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>资产名称</text>
             </view>
             <view>
-                <input type="text" value="{{form.name}}" bindinput="bindNewInput" data-name="form.name" placeholder="请输入资产名称" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.name}}" bindinput="bindNewInput" data-name="form.name" placeholder="资产名称" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
@@ -65,7 +65,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>坐落位置</text>
             </view>
             <view>
-                <input type="text" value="{{form.location}}" bindinput="bindNewInput" data-name="form.location" placeholder="请输入坐落位置" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.location}}" bindinput="bindNewInput" data-name="form.location" placeholder="坐落位置" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -73,7 +73,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>规格型号</text>
             </view>
             <view>
-                <input type="text" value="{{form.specification}}" bindinput="bindNewInput" data-name="form.specification" placeholder="请输入规格型号" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.specification}}" bindinput="bindNewInput" data-name="form.specification" placeholder="规格型号" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -81,7 +81,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>供应商</text>
             </view>
             <view>
-                <input type="text" value="{{form.supplier}}" bindinput="bindNewInput" data-name="form.supplier" placeholder="请输入供应商" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.supplier}}" bindinput="bindNewInput" data-name="form.supplier" placeholder="供应商" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
diff --git a/pages/project/add/add.js b/pages/project/add/add.js
index 7c4d3bc..27c9c1e 100644
--- a/pages/project/add/add.js
+++ b/pages/project/add/add.js
@@ -13,7 +13,9 @@ Page({
     showEndTime:false,
     ynProjcetStatusOptions:[],
     form:{},
-    id:""
+    id:"",
+    ynProjcetStatusindex:0,
+    status:0,
   },
 
   /**
@@ -25,28 +27,34 @@ Page({
       this.setData({id:options.id})
       UTIL.httpRequest(API.URL_GET_PROJECTGET + this.data.id, {method:'GET'}, {
         success: (res) => {
-          //汇票类型
+          this.setData({'form':res.data})
+
           UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, {
-            success: (rr) => {
-              this.setData({
-                ynProjcetStatusOptions:rr.data
-              });
-              this.data.ynProjcetStatusOptions.map(r => {
-                if(r.dictValue == res.data.ynProjcetStatus){
-                    res.data.ynProjcetStatusText = r.dictLabel
-                    that.setData({'form':res.data});
-                }
-              })
+            success: (r) => {
+              if(r.data.length>0){
+                that.setData({
+                  ynProjcetStatusOptions:r.data,
+                })
+                r.data.map((rr,ind) => {
+                     if(rr.dictValue == res.data.ynProjcetStatus){
+                       that.setData({'ynProjcetStatusindex':ind})
+                     }
+                 })
+              }
             }
           })
         }
       })
     }else{
+      let that = this
       UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'yn_projcet_status', {method:'GET'}, {
-        success: (res) => {
-          this.setData({
-            ynProjcetStatusOptions:res.data
-          });
+        success: (r) => {
+          if(r.data.length>0){
+            that.setData({
+              ynProjcetStatusOptions:r.data,
+              'form.ynProjcetStatus':r.data[0].dictValue
+            })
+          }
         }
       })
     }
@@ -60,6 +68,13 @@ Page({
     let data = this.getNewDate(new Date(e.detail.value));
     this.setData({'form.endTime':data});
   },
+  onConfirmynProjcetStatus (e) {
+    let obj =  e.detail.value;
+    this.setData({
+      'form.ynProjcetStatus':this.data.ynProjcetStatusOptions[obj].dictValue,
+      'ynProjcetStatusindex':obj
+    })
+  },
   getNewDate(date){
     //date是传过来的时间戳，注意需为13位，10位需*1000
     //也可以不传,获取的就是当前时间
@@ -122,7 +137,8 @@ Page({
     }else if(this.data.form.ynProjcetStatus === ''||this.data.form.ynProjcetStatus==null){//工程状态
       UTIL.showToastNoneIcon('工程状态不能为空！');
       return false;
-    }else{
+    }else if(this.data.status=='0'){
+      this.setData({'status':1})
       var that = this ;
     let data = that.data.form;
     data.method = 'POST';
@@ -139,6 +155,18 @@ Page({
               delta:1
             })
           },2000)
+        },
+        fail: function (response) {
+          if (typeof fail === FUNCTION_TEXT) {
+            fail(handleFail(response));
+          } else {
+            showToastNoneIcon(API.MSG_FAIL_HTTP);
+          }
+          this.setData({'status':0})
+        },
+        complete: function (response) {
+          this.setData({'status':0})
+          wx.hideNavigationBarLoading();
         }
       })
     }else{
@@ -154,6 +182,18 @@ Page({
               delta:1
             })
           },2000)
+        },
+        fail: function (response) {
+          if (typeof fail === FUNCTION_TEXT) {
+            fail(handleFail(response));
+          } else {
+            showToastNoneIcon(API.MSG_FAIL_HTTP);
+          }
+          this.setData({'status':0})
+        },
+        complete: function (response) {
+          this.setData({'status':0})
+          wx.hideNavigationBarLoading();
         }
       })
     }
diff --git a/pages/project/add/add.wxml b/pages/project/add/add.wxml
index 0f8b308..61e7181 100644
--- a/pages/project/add/add.wxml
+++ b/pages/project/add/add.wxml
@@ -26,19 +26,15 @@
     <van-field label="合共价款（元）" value="{{ form.projectAmount }}" type="digit" placeholder="合共价款（元）" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectAmount"/>
 
 
-    <van-popup show="{{showYnProjcetStatus}}" round position="bottom"  bind:close="closeBox" data-name="showYnProjcetStatus">
-      <van-picker
-        columns="{{ynProjcetStatusOptions}}"
-        show-toolbar
-        value-key="dictLabel"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirmYn"
-        data-name="showYnProjcetStatus"
-        data-value="form.ynProjcetStatus"
-      />
-    </van-popup>
-    <van-field label="工程状态" value="{{ form.ynProjcetStatusText }}" placeholder="工程状态" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.ynProjcetStatus" is-link arrow-direction	="down" bindtap="openBox" data-name="showYnProjcetStatus"/>
-
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>工程状态</view>
+            <picker bindchange="onConfirmynProjcetStatus" value="{{ynProjcetStatusindex}}" range="{{ynProjcetStatusOptions}}" range-key="{{'dictLabel'}}">
+                <view class="picker">
+                    {{ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel?ynProjcetStatusOptions[ynProjcetStatusindex].dictLabel:"选择所属银行"}}
+                    <van-icon name="arrow-down" />
+                </view>
+            </picker>
+        </view>
     <van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.remark"/>
   </view>
   <view class="bottom">