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

pages/bank/add/add.js

@@ -115,7 +115,7 @@ Page({
       [even.currentTarget.dataset.value]:even.detail.value.bankDeposit,
       [even.currentTarget.dataset.value+"Text"]:even.detail.value.bankDeposit,
       [even.currentTarget.dataset.name]:false,
-      ["form.payeePaymentLines"]:even.detail.value.payeePaymentLines
+      ["form.bankDeposit"]:even.detail.value.bankDeposit
     })
   },
   onChange(even){
@@ -160,7 +160,7 @@ Page({
           }
         })
       }else{
-        UTIL.httpRequest(API.URL_GET_DEPOSITUPDATE, that.data.form, {
+        UTIL.httpRequest(API.URL_POST_DEPOSITUPDATE, that.data.form, {
           success: (res) => {
             wx.showToast({
               title: "修改成功！",
@@ -175,7 +175,6 @@ Page({
           }
         })
       }
-
     }
   },
   /**

pages/bank/add/add.wxml

@@ -1,7 +1,7 @@
 <!--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>
-  <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"查看":"新增"}}开户行</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}开户行</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
 
@@ -18,21 +18,10 @@
         data-value="form.bankType"
       />
     </van-popup>
-    <van-field readonly label="所属银行" value="{{ form.bankTypeText }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showBankType"/>
-    <van-popup show="{{showDeposit}}" round position="bottom"  bind:close="closeBox" data-name="showDeposit">
-      <van-picker
-        columns="{{depositOptions}}"
-        show-toolbar
-        value-key="bankDeposit"
-        bind:cancel="closeBox"
-        bind:confirm="onConfirmDeposit"
-        data-name="showDeposit"
-        data-value="form.bankDeposit"
-      />
-    </van-popup>
-    <van-field label="开户行" value="{{ form.bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" required  data-formname="form.bankDepositText" />
-    <van-field label="联行号" value="{{ form.payeePaymentLines }}" placeholder="请输入联行号" border="{{ false }}" bind:change="onChange" input-align="right" required data-formname="form.payeePaymentLines"/>
+    <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>
   <view class="bottom">
-    <view class="btn2" bindtap="goSubmit">确认</view>
+    <view class="btn2" bindtap="goSubmit">保存</view>
   </view>

pages/bank/bank.js

@@ -12,7 +12,9 @@ Page({
     depositList:[],
     bankTypeOptions:[],
     value:"",
-    scrollHeight:''
+    scrollHeight:'',
+    itemId:'',
+    itemIndex:''
   },
   goAdd(){
     wx.navigateTo({
@@ -80,19 +82,32 @@ Page({
     this.onShow()
   },
   delete(e){
-    var that = this;
-    UTIL.httpRequest(API.URL_GET_DEPOSITDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+    this.setData({
+      'itemId':e.currentTarget.dataset.id,
+      'itemIndex':e.currentTarget.dataset.index,
+      "showPopupDel":true
+    });
+  },
+  cancelTemDel:function(e){
+    this.setData({
+      "itemId":"",
+      "itemIndex":"",
+      "showPopupDel":false
+    });
+  },
+  confirmTemDel:function(e){
+    this.setData({
+      "showPopupDel":false
+    });
+    UTIL.httpRequest(API.URL_GET_DEPOSITDELETE+this.data.itemId , {method:'GET'}, {
       success: (res) => {
-        if (res.code == API.SUCCESS_CODE) {
-          that.data.depositList.splice(e.currentTarget.dataset.index, 1);
-          wx.showToast({
-            title: '删除成功！',
-            icon: 'success',
-            duration: 2000
-          })
-          that.setData({
-            depositList : that.data.depositList,
-          })
+        if(res.code==200){
+          let new_list = this.data.depositList
+          new_list.splice(this.data.itemIndex,1)
+          this.setData({'depositList':new_list})
+          UTIL.showToastNoneIcon('删除成功！');
+        }else{
+          UTIL.showToastNoneIcon('删除失败！');
         }
       }
     })

pages/bank/bank.wxml

@@ -9,7 +9,7 @@
     value="{{ value }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入开户行名称"
     clearable
     bind:change="goSearch"
   />
@@ -43,6 +43,8 @@
   </view>
 </van-swipe-cell>
 </scroll-view>
+<modal hidden="{{!showPopupDel}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">  
+</modal>
 <wxs module="iOf">
   var indexOf = function(name,value){
     return name.indexOf(value);

pages/bankDraft/add/add.js

@@ -160,7 +160,7 @@ Page({
       var that = this;
       that.data.form.method = 'POST';
       if(that.data.form.id==""||that.data.form.id==null){
-        UTIL.httpRequest(API.URL_GET_MONEYORDERADD, that.data.form , {
+        UTIL.httpRequest(API.URL_POST_MONEYORDERADD, that.data.form , {
           success: (res) => {
             wx.showToast({
               title: '新增成功',

pages/bankDraft/add/add.wxml

@@ -1,7 +1,7 @@
 <!--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>
-  <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"查看":"新增"}}银行汇票</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}银行汇票</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
 
@@ -20,7 +20,7 @@
     </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.orderAmount }}" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderAmount"/>
+    <van-field label="出票金额" value="{{ form.orderAmount }}" type="digit" placeholder="请选择" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderAmount"/>
     
     <van-field label="付票单位" value="{{ form.billPayUnit }}" placeholder="付票单位" border="{{ false }}" bind:change="onChange" input-align="right" required   data-value="form.billPayUnit" />
     <van-field label="收票单位" value="{{ form.billReceiveUnit }}" placeholder="收票单位" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.billReceiveUnit"/>
@@ -43,9 +43,9 @@
         data-value="form.orderStatus"
       />
     </van-popup>
-    <van-field label="汇票状态" value="{{ form.orderStatusText }}" placeholder="汇票状态" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.orderStatus" is-link arrow-direction	="down"  bindtap="openBox" data-name="showOrderStatus"/>
+    <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"/>
     <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}}">
-    <view class="btn2" bindtap="goSubmit">确认</view>
+    <view class="btn2" bindtap="goSubmit">保存</view>
   </view>

pages/bankDraft/bankDraft.js

@@ -32,9 +32,11 @@ Page({
     value:'',
     pageNums:1,
     showUpload:false,
+    showPopupDel:false,
     uploadOptions:[],
     fileList:[],
     itemId:"",
+    itemIndex:"",
     list:[],
     fileEvent:{},
   },
@@ -105,6 +107,8 @@ Page({
           orderTypeOptions:res.data
         });
         let param = {
+          'orderType':that.data.value1,
+          'orderStatus':that.data.value2,
          'billPayUnit' : this.data.value,
          pageNum:this.data.pageNums,
         pageSize:10,
@@ -129,20 +133,32 @@ Page({
     })
   },
   delete(e){
-    var that = this;
-    UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+    this.setData({
+      'itemId':e.currentTarget.dataset.id,
+      'itemIndex':e.currentTarget.dataset.index,
+      "showPopupDel":true
+    });
+  },
+  cancelTemDel:function(e){
+    this.setData({
+      "itemId":"",
+      "itemIndex":"",
+      "showPopupDel":false
+    });
+  },
+  confirmTemDel:function(e){
+    this.setData({
+      "showPopupDel":false
+    });
+    UTIL.httpRequest(API.URL_GET_MONEYORDERDELETE + this.data.itemId , {method:'GET'}, {
       success: (res) => {
-        if (res.code == API.SUCCESS_CODE) {
-          let list = that.data.moneyorderList
-          list.splice(e.currentTarget.dataset.index, 1); 
-          wx.showToast({
-            title: '删除成功！',
-            icon: 'success',
-            duration: 2000
-          })
-          that.setData({
-            moneyorderList : list,
-          })
+        if(res.code==200){
+          let new_list = this.data.moneyorderList
+          new_list.splice(this.data.index,1)
+          this.setData({'moneyorderList':new_list})
+          UTIL.showToastNoneIcon('删除成功！');
+        }else{
+          UTIL.showToastNoneIcon('删除失败！');
         }
       }
     })
@@ -286,7 +302,7 @@ Page({
     return new Promise((resolve, reject) => {
       wx.uploadFile({
         url: API.URL_GET_UPLOAD,
-        filePath: uploadFile.file.file[0].url,
+        filePath: uploadFile.file.file.url,
         name: 'file',
         header: {
           "Content-Type": "multipart/form-data",//记得设置

pages/bankDraft/bankDraft.wxml

@@ -9,7 +9,7 @@
     value="{{ value }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入付票单位名称"
     clearable
     bind:change="goSearch"
   />
@@ -83,7 +83,7 @@
               </view>
               <view class="img_box">
                 <view class="img_li">
-                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
+                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
                   </van-upload> 
                 </view>
               </view>
@@ -93,4 +93,6 @@
 </van-action-sheet>
 <modal hidden="{{!showPopup}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTem" bindconfirm="confirmTem">  
  
+</modal>
+<modal hidden="{{!showPopupDel}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">  
 </modal>

pages/contract/add/add.js

@@ -141,7 +141,12 @@ Page({
   getNewDate(date){
     //date是传过来的时间戳，注意需为13位，10位需*1000
     //也可以不传,获取的就是当前时间
-    var time = new Date(date);
+    var time
+    if(date){
+       time = new Date(date);
+    }else{
+       time = new Date();
+    }
     var year= time.getFullYear()  //年
     var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
     var day = ("0" + time.getDate()).slice(-2); //日
@@ -196,6 +201,11 @@ Page({
           success: (res) => {
                 if(res.code == 200){
                   UTIL.showToastNoneIcon('修改成功');
+                  setTimeout(function(){
+                    wx.navigateBack({
+                      delta:1
+                    })
+                  },2000)
                 }else{
                   UTIL.showToastNoneIcon('修改失败');
                 }
@@ -207,9 +217,14 @@ Page({
         UTIL.httpRequest(API.URL_POST_CONTRACTADD,data,{
           success: (res) => {
            if(res.code == 200){
-            UTIL.showToastNoneIcon(res.msg);
+            UTIL.showToastNoneIcon('新增成功');
+            setTimeout(function(){
+              wx.navigateBack({
+                delta:1
+              })
+            },2000)
           }else{
-            UTIL.showToastNoneIcon(res.msg);
+            UTIL.showToastNoneIcon('新增失败');
           }
           }
         })
@@ -341,6 +356,13 @@ Page({
       })
     }else{
       let that = this;
+      this.setData({
+        'form.reviewTime':this.getNewDate(),
+        'form.buildingTime':this.getNewDate(),
+        'form.startTime':this.getNewDate(),
+        'form.endTime':this.getNewDate(),
+        'form.biddingDate':this.getNewDate(),
+      })
       //获取收入合同状态
        UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'type_of_contract', {method:'GET'}, {
          success: (res) => {
@@ -391,7 +413,7 @@ Page({
              if(res.data.length>0){
                that.setData({
                 contractionStatusOptions:res.data,
-                 'form.contractionStatus':res.data[1].dictValue
+                 'form.contractionStatus':res.data[0].dictValue
                })
              }
            }

pages/contract/add/add.json

@@ -4,6 +4,7 @@
     "van-field": "@vant/weapp/field/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
-    "van-calendar": "@vant/weapp/calendar/index"
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-icon":"@vant/weapp/icon/index"
   }
 }

pages/contract/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">
@@ -30,6 +30,7 @@
             <picker bindchange="onConfirmAssetType" value="{{assetTypeindex}}" range="{{assetTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择合同类型"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -38,6 +39,7 @@
             <picker bindchange="onConfirmContractionSource" value="{{contractionSourceindex}}" range="{{contractionSourceOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{contractionSourceOptions[contractionSourceindex].dictLabel?contractionSourceOptions[contractionSourceindex].dictLabel:"选择合同来源"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -46,7 +48,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>甲方名称</text>
             </view>
             <view>
-                <input type="text" value="{{form.firstParty}}" bindinput="bindNewInput" data-name="form.firstParty" placeholder="请输入甲方名称" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.firstParty}}" bindinput="bindNewInput" data-name="form.firstParty" placeholder="甲方名称" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -54,7 +56,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>甲方代表</text>
             </view>
             <view>
-                <input type="text" value="{{form.firstPartyDirector}}" bindinput="bindNewInput" data-name="form.firstPartyDirector" placeholder="请输入甲方代表" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.firstPartyDirector}}" bindinput="bindNewInput" data-name="form.firstPartyDirector" placeholder="甲方代表" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -62,7 +64,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>甲方电话</text>
             </view>
             <view>
-                <input type="text" value="{{form.firstPartyPhone}}" bindinput="bindNewInput" data-name="form.firstPartyPhone" placeholder="请输入甲方电话" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.firstPartyPhone}}" bindinput="bindNewInput" data-name="form.firstPartyPhone" placeholder="甲方电话" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -70,7 +72,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>乙方名称</text>
             </view>
             <view>
-                <input type="text" value="{{form.secondParty}}" bindinput="bindNewInput" data-name="form.secondParty" placeholder="请输入乙方名称" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.secondParty}}" bindinput="bindNewInput" data-name="form.secondParty" placeholder="乙方名称" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -78,7 +80,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>乙方代表</text>
             </view>
             <view>
-                <input type="text" value="{{form.secondPartyDirector}}" bindinput="bindNewInput" data-name="form.secondPartyDirector" placeholder="请输入乙方代表" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.secondPartyDirector}}" bindinput="bindNewInput" data-name="form.secondPartyDirector" placeholder="乙方代表" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -86,7 +88,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>乙方电话</text>
             </view>
             <view>
-                <input type="text" value="{{form.secondPartyPhone}}" bindinput="bindNewInput" data-name="form.secondPartyPhone" placeholder="请输入乙方电话" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.secondPartyPhone}}" bindinput="bindNewInput" data-name="form.secondPartyPhone" placeholder="乙方电话" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
@@ -94,6 +96,7 @@
             <picker bindchange="onConfirmCollectionPay" value="{{collectionPayindex}}" range="{{collectionPayOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{collectionPayOptions[collectionPayindex].dictLabel?collectionPayOptions[collectionPayindex].dictLabel:"选择首付款类型"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -102,6 +105,7 @@
             <picker bindchange="onConfirmSettleType" value="{{settleTypeindex}}" range="{{settleTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{settleTypeOptions[settleTypeindex].dictLabel?settleTypeOptions[settleTypeindex].dictLabel:"选择结款方式"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -110,7 +114,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>合同金额</text>
             </view>
             <view>
-                <input type="text" value="{{form.totalAmount}}" bindinput="bindNewInput" data-name="form.totalAmount" placeholder="请输入合同金额" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.totalAmount}}" bindinput="bindNewInput" type="digit" data-name="form.totalAmount" placeholder="合同金额" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -118,7 +122,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>数量/面积</text>
             </view>
             <view>
-                <input type="text" value="{{form.num}}" bindinput="bindNewInput" data-name="form.num" placeholder="请输入数量/面积" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.num}}" bindinput="bindNewInput" type="digit" data-name="form.num" type="number" placeholder="数量/面积" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -134,7 +138,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>单价(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.price}}" bindinput="bindNewInput" data-name="form.price" placeholder="单价(元)" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.price}}" bindinput="bindNewInput" type="digit" data-name="form.price" placeholder="单价(元)" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -142,7 +146,7 @@
                 <text><text style="color:red;margin-right: 10rpx;">*</text>已结款(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.receivedAmount}}" bindinput="bindNewInput" data-name="form.receivedAmount" placeholder="已结款(元)" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.receivedAmount}}" bindinput="bindNewInput" type="digit" data-name="form.receivedAmount" placeholder="已结款(元)" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -150,7 +154,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>下次结款(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.settledAmount}}" bindinput="bindNewInput" data-name="form.settledAmount" placeholder="下次结款(元)" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.settledAmount}}" bindinput="bindNewInput" type="digit" data-name="form.settledAmount" placeholder="下次结款(元)" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
@@ -182,6 +186,7 @@
             <picker bindchange="onConfirmContractionStatus" value="{{contractionStatusindex}}" range="{{contractionStatusOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{contractionStatusOptions[contractionStatusindex].dictLabel?contractionStatusOptions[contractionStatusindex].dictLabel:"选择合同状态"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -206,6 +211,7 @@
             <picker bindchange="onConfirmBiddingWay" value="{{biddingWayindex}}" range="{{biddingWayOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{biddingWayOptions[biddingWayindex].dictLabel?biddingWayOptions[biddingWayindex].dictLabel:"选择招标方式"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -214,7 +220,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>项目编号</text>
             </view>
             <view>
-                <input type="text" value="{{form.itemId}}" bindinput="bindNewInput" data-name="form.itemId" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.itemId}}" bindinput="bindNewInput" placeholder="项目编号" data-name="form.itemId" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -222,7 +228,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>项目名称</text>
             </view>
             <view>
-                <input type="text" value="{{form.itemName}}" bindinput="bindNewInput" data-name="form.itemName" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.itemName}}" bindinput="bindNewInput" placeholder="项目名称" data-name="form.itemName" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -230,7 +236,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>经办人</text>
             </view>
             <view>
-                <input type="text" value="{{form.handleName}}" bindinput="bindNewInput" data-name="form.handleName" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.handleName}}" bindinput="bindNewInput" placeholder="经办人" data-name="form.handleName" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -238,14 +244,14 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>预算金额(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.budget}}" bindinput="bindNewInput" data-name="form.budget" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.budget}}" bindinput="bindNewInput" type="digit" placeholder="预算金额(元)" data-name="form.budget" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
             <view class="section__title"><text style="color:red;margin-right: 22rpx;"></text>招标日期</view>
             <picker mode="date" value="{{form.biddingDate}}" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmBiddingDate">
                 <view class="picker">
-                    {{form.biddingDate}}
+                    {{form.biddingDate?form.biddingDate:'招标日期'}}
                 </view>
             </picker>
         </view>
@@ -254,6 +260,7 @@
             <picker bindchange="onConfirmbiddingType" value="{{biddingTypeindex}}" range="{{biddingTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{biddingTypeOptions[biddingTypeindex].dictLabel?biddingTypeOptions[biddingTypeindex].dictLabel:"选择招标方式"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -262,7 +269,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>中标单位</text>
             </view>
             <view>
-                <input type="text" value="{{form.winBiddingCompany}}" bindinput="bindNewInput" data-name="form.winBiddingCompany" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.winBiddingCompany}}" bindinput="bindNewInput" placeholder="中标单位" data-name="form.winBiddingCompany" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -270,7 +277,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>中标金额(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.winBiddingPrice}}" bindinput="bindNewInput" data-name="form.nawinBiddingPriceme" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.winBiddingPrice}}" bindinput="bindNewInput" type="digit"  placeholder="中标金额(元)" data-name="form.nawinBiddingPriceme" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -278,19 +285,19 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>审核人</text>
             </view>
             <view>
-                <input type="text" value="{{form.reviewer}}" bindinput="bindNewInput" data-name="form.reviewer" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.reviewer}}" bindinput="bindNewInput" placeholder="审核人" data-name="form.reviewer" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
             <view class="section__title"><text style="color:red;margin-right: 22rpx;"></text>审核时间</view>
             <picker mode="date" value="{{form.reviewTime}}" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmReviewTime">
                 <view class="picker">
-                    {{form.reviewTime}}
+                    {{form.reviewTime?form.reviewTime:'审核时间'}}
                 </view>
             </picker>
         </view>
     </view>
 </view>
 <view class="bottom">
-    <view class="btn2" bindtap="goSubmit">确认</view>
+    <view class="btn2" bindtap="goSubmit" wx:if="{{form.contractionStatus==1}}">保存</view>
 </view>

pages/contract/contract.js

@@ -128,12 +128,14 @@ Page({
   delete(e){
     this.setData({
       'itemId':e.currentTarget.dataset.id,
+      'itemIndex':e.currentTarget.dataset.index,
       "showPopupDel":true
     });
   },
   cancelTemDel:function(e){
     this.setData({
       "itemId":"",
+      "itemIndex":"",
       "showPopupDel":false
     });
   },
@@ -145,7 +147,7 @@ Page({
       success: (res) => {
         if(res.code==200){
           let new_list = this.data.list
-          new_list.splice(e.currentTarget.dataset.index,1)
+          new_list.splice(this.data.index,1)
           this.setData({'list':new_list})
           UTIL.showToastNoneIcon('删除成功！');
         }else{
@@ -273,7 +275,7 @@ Page({
     return new Promise((resolve, reject) => {
       wx.uploadFile({
         url: API.URL_GET_UPLOAD,
-        filePath: uploadFile.file.file[0].url,
+        filePath: uploadFile.file.file.url,
         name: 'file',
         header: {
           "Content-Type": "multipart/form-data",//记得设置
@@ -347,8 +349,31 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    console.log(this.data.contractionId);
     if(this.data.contractionId!=""&&this.data.contractionId!=null){
       this.relevanceBack()
+    }else{
+      let _this = this
+    let params = {
+      pageNum:1,
+      pageSize:10,
+      name:this.data.name
+    }
+    UTIL.httpRequest(API.URL_GET_CONTRACTLIST,params,{
+      success: (res) => {
+        if(res.code == 200){
+          res.rows.map((rr,index) => {
+            rr.totalAmount =   Number(rr.totalAmount ).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "") 
+              if(index==(res.rows.length-1)){
+                _this.setData({list:res.rows})  
+              }
+          })
+        }else{
+          UTIL.showToastNoneIcon(res.msg);
+        }
+      }
+    })
     }
   },
 

pages/contract/contract.json

@@ -9,6 +9,7 @@
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-swipe-cell": "@vant/weapp/swipe-cell/index",
     "van-action-sheet": "@vant/weapp/action-sheet/index",
-    "van-upload": "@vant/weapp/uploader/index"
+    "van-upload": "@vant/weapp/uploader/index",
+    "van-icon":"@vant/weapp/icon/index"
   }
 }

pages/contract/contract.wxml

@@ -9,7 +9,7 @@
     value="{{ name }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入合同名称"
     clearable
     bind:change="goSearch"
   />
@@ -24,6 +24,7 @@
         <view style="flex:1;">
             <text wx:if="{{item.contractionStatus=='1'}}" style="text-align: center;float:right;font-size:12px;background:rgb(235, 154, 4,0.2);color:rgb(235, 154, 4);width:50px;line-height: 20px;">正常</text> 
             <text wx:if="{{item.contractionStatus=='2'}}" style="text-align: center;float:right;font-size:12px;background:rgb(235, 4, 4,0.2);color:rgb(235, 4, 4);width:50px;line-height: 20px;">撤销</text>     
+            <text wx:if="{{item.contractionStatus=='3'}}" style="text-align: center;float:right;font-size:12px;background:rgb(235, 4, 4,0.2);color:rgb(235, 4, 4);width:50px;line-height: 20px;">终止</text>  
         </view>
       </view>
       <view>
@@ -53,7 +54,7 @@
       </view>
   </view>
   <view slot="right" class="deleteBox">
-    <view style="flex: 1;height: 100%;display: flex;align-items: center;flex-direction: column;justify-content: center;background-color: rgb(255,0,0,0.2);" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
+    <view style="flex: 1;height: 100%;display: flex;align-items: center;flex-direction: column;justify-content: center;background-color: rgb(255,0,0,0.2);" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete" wx-if="{{item.contractionStatus=='1'}}">
       <view>
         <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;display: block;" ></image>
       </view>
@@ -90,7 +91,7 @@
               </view>
               <view class="img_box">
                 <view class="img_li">
-                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
+                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
                   </van-upload> 
                 </view>
               </view>

pages/fixedAssets/add/add.js

@@ -12,13 +12,14 @@ Page({
     id:null,
     form:{
         reviewTime:'2022-01-01',
-        buildingTime:'2022-01-01',
+        buildTime:'2022-01-01',
         startTime:'2022-01-01',
         endTime:'2022-01-01',
         biddingDate:'2022-01-01',
-        fixedValue:'153:固定资产清理',
-        fixedSubject:'152:累计折旧',
-        depreciationSubject:'541005:管理费用-折旧及修理费',
+        fixedValue:'',
+        fixedSubject:'153:固定资产清理',
+        depreciationSubject:'152:累计折旧',
+        depreciationFeeSubject:'541005:管理费用-折旧及修理费',
         originalValue:0.00,
         quantity:0.00,
         netValue:0.00,
@@ -93,8 +94,8 @@ Page({
   onConfirmAddType (e) {
     let obj =  e.detail.value;
     this.setData({
-      'form.addWay':this.data.addWayOptions[obj].dictValue,
-      'addWayindex':obj
+      'form.addType':this.data.addTypeOptions[obj].dictValue,
+      'addTypeindex':obj
     })
   },
   onConfirmUseType (e) {
@@ -149,7 +150,12 @@ Page({
   getNewDate(date){
     //date是传过来的时间戳，注意需为13位，10位需*1000
     //也可以不传,获取的就是当前时间
-    var time = new Date(date);
+    var time
+    if(date){
+       time = new Date(date);
+    }else{
+       time = new Date();
+    }
     var year= time.getFullYear()  //年
     var month = ("0" + (time.getMonth() + 1)).slice(-2); //月
     var day = ("0" + time.getDate()).slice(-2); //日
@@ -201,6 +207,11 @@ Page({
           success: (res) => {
                 if(res.code == 200){
                   UTIL.showToastNoneIcon('修改成功');
+                  setTimeout(function(){
+                    wx.navigateBack({
+                      delta:1
+                    })
+                  },2000)
                 }else{
                   UTIL.showToastNoneIcon('修改失败');
                 }
@@ -213,6 +224,11 @@ Page({
           success: (res) => {
            if(res.code == 200){
             UTIL.showToastNoneIcon(res.msg);
+            setTimeout(function(){
+              wx.navigateBack({
+                delta:1
+              })
+            },2000)
           }else{
             UTIL.showToastNoneIcon(res.msg);
           }
@@ -392,6 +408,13 @@ Page({
       })
     }else{
       let that = this;
+        this.setData({
+          'form.reviewTime':this.getNewDate(),
+          'form.buildTime':this.getNewDate(),
+          'form.startTime':this.getNewDate(),
+          'form.endTime':this.getNewDate(),
+          'form.biddingDate':this.getNewDate(),
+        })
       //获取资产类别
        UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'asset_type', {method:'GET'}, {
          success: (res) => {

pages/fixedAssets/add/add.json

@@ -4,6 +4,7 @@
     "van-field": "@vant/weapp/field/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-picker": "@vant/weapp/picker/index",
-    "van-calendar": "@vant/weapp/calendar/index"
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-icon":"@vant/weapp/icon/index"
   }
 }

pages/fixedAssets/add/add.wxml

@@ -30,6 +30,7 @@
             <picker bindchange="onConfirmAssetType" value="{{assetTypeindex}}" range="{{assetTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{assetTypeOptions[assetTypeindex].dictLabel?assetTypeOptions[assetTypeindex].dictLabel:"选择资产类别"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -38,14 +39,16 @@
             <picker bindchange="onConfirmOperationType" value="{{operationTypeindex}}" range="{{operationTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{operationTypeOptions[operationTypeindex].dictLabel?operationTypeOptions[operationTypeindex].dictLabel:"选择经营属性"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
         <view class="section">
             <view class="section__title"><text style="color:red;margin-right: 10rpx;">*</text>增加方式</view>
-            <picker bindchange="onConfirmAddType" value="{{addTypeindex}}" range="{{addOptions}}" range-key="{{'dictLabel'}}">
+            <picker bindchange="onConfirmAddType" value="{{addTypeindex}}" range="{{addTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{addTypeOptions[addTypeindex].dictLabel?addTypeOptions[addTypeindex].dictLabel:"选择增加方式"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -86,6 +89,7 @@
             <picker bindchange="onConfirmUseType" value="{{useTypeindex}}" range="{{useTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{useTypeOptions[useTypeindex].dictLabel?useTypeOptions[useTypeindex].dictLabel:"选择使用情况"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -94,6 +98,7 @@
             <picker bindchange="onConfirmAssetStatus" value="{{assetStatusindex}}" range="{{assetStatusOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{assetStatusOptions[assetStatusindex].dictLabel?assetStatusOptions[assetStatusindex].dictLabel:"选择资产状态"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -102,6 +107,7 @@
             <picker bindchange="onConfirmIsMin" value="{{isMinindex}}" range="{{sysYesNoOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{sysYesNoOptions[isMinindex].dictLabel?sysYesNoOptions[isMinindex].dictLabel:"选择单元资产"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -110,6 +116,7 @@
             <picker bindchange="onConfirmIsFormAsset" value="{{isFormAssetindex}}" range="{{sysYesNoOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{sysYesNoOptions[isFormAssetindex].dictLabel?sysYesNoOptions[isFormAssetindex].dictLabel:"选择扶贫资产"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -126,7 +133,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>数量/面积</text>
             </view>
             <view>
-                <input type="text" value="{{form.quantity}}" bindinput="bindNewInput" data-name="form.quantity" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.quantity}}" bindinput="bindNewInput" data-name="form.quantity" type="number" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view class="section">
@@ -134,6 +141,7 @@
             <picker bindchange="onConfirmUnit" value="{{unitindex}}" range="{{unitOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{unitOptions[unitindex].dictLabel?unitOptions[unitindex].dictLabel:"选择计量单位"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -142,7 +150,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>原值(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.originalValue}}" bindinput="bindNewInput" data-name="form.originalValue" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.originalValue}}" bindinput="bindNewInput" type="digit" data-name="form.originalValue" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -150,7 +158,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>净值(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.netValue}}" bindinput="bindNewInput" data-name="form.netValue" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.netValue}}" bindinput="bindNewInput" disabled="{{true}}" data-name="form.netValue" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -158,7 +166,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>残值率 N%</text>
             </view>
             <view>
-                <input type="text" value="{{form.residualsRate}}" bindinput="bindNewInput" data-name="form.residualsRate" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.residualsRate}}" bindinput="bindNewInput" type="digit" data-name="form.residualsRate" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -166,7 +174,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>净残值(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.netSalvage}}" bindinput="bindNewInput" data-name="form.netSalvage" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.netSalvage}}" bindinput="bindNewInput" type="digit" data-name="form.netSalvage" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -174,7 +182,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>资产清理(元)</text>
             </view>
             <view>
-                <input type="text" value="{{form.fixedValue}}" bindinput="bindNewInput" data-name="form.fixedValue" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.fixedValue}}" placeholder="无需输入" bindinput="bindNewInput" disabled="true" data-name="form.fixedValue" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -222,6 +230,7 @@
             <picker bindchange="onConfirmDepreciationType" value="{{depreciationTypeindex}}" range="{{depreciationTypeOptions}}" range-key="{{'dictLabel'}}">
                 <view class="picker">
                     {{depreciationTypeOptions[depreciationTypeindex].dictLabel?depreciationTypeOptions[depreciationTypeindex].dictLabel:"选择折旧方式"}}
+                    <van-icon name="arrow-down" />
                 </view>
             </picker>
         </view>
@@ -230,7 +239,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>预计使用年数</text>
             </view>
             <view>
-                <input type="text" value="{{form.expectedYears}}" bindinput="bindNewInput" data-name="form.expectedYears"  type="digit"  placeholder="(原值-净残值)/预计使用年数" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.expectedYears}}" bindinput="bindNewInput" type="number" data-name="form.expectedYears"  type="digit"  placeholder="(原值-净残值)/预计使用年数" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -246,7 +255,7 @@
                 <text><text style="color:red;margin-right: 22rpx;"></text>已折旧年数</text>
             </view>
             <view>
-                <input type="text" value="{{form.depreciationYears}}" bindinput="bindNewInput" data-name="form.depreciationYears" type="digit" style="text-align: right;margin-top: 20rpx;" />
+                <input type="text" value="{{form.depreciationYears}}" bindinput="bindNewInput" type="number" data-name="form.depreciationYears" type="digit" style="text-align: right;margin-top: 20rpx;" />
             </view>
         </view>
         <view>
@@ -261,5 +270,5 @@
     </view>
 </view>
 <view class="bottom">
-    <view class="btn2" bindtap="goSubmit">确认</view>
+    <view class="btn2" bindtap="goSubmit">保存</view>
 </view>

pages/fixedAssets/fixedAssets.js

@@ -159,49 +159,38 @@ Page({
       url: '/pages/fixedAssets/add/add?id='+e.currentTarget.dataset.id,
     })
   },
+  
   delete(e){
     this.setData({
       'itemId':e.currentTarget.dataset.id,
+      'itemIndex':e.currentTarget.dataset.index,
       "showPopupDel":true
     });
   },
-  // cancelTemDel:function(e){
-  //   this.setData({
-  //     "itemId":"",
-  //     "showPopupDel":false
-  //   });
-  // },
-  // confirmTemDel:function(e){
-  //   this.setData({
-  //     "showPopupDel":false
-  //   });
-  //   UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
-  //     success: (res) => {
-  //       if(res.code==200){
-  //         let new_list = this.data.list
-  //         new_list.splice(e.currentTarget.dataset.index,1)
-  //         this.setData({'list':new_list})
-  //         UTIL.showToastNoneIcon('删除成功！');
-  //       }else{
-  //         UTIL.showToastNoneIcon('删除失败！');
-  //       }
-  //     }
-  //   })
-  // },
-  // delete(e){
-  //   UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + e.currentTarget.dataset.id, {method:'GET'}, {
-  //     success: (res) => {
-  //       if(res.code==200){
-  //         let new_list = this.data.list
-  //         new_list.splice(e.currentTarget.dataset.index,1)
-  //         this.setData({'list':new_list})
-  //         UTIL.showToastNoneIcon('删除成功！');
-  //       }else{
-  //         UTIL.showToastNoneIcon('删除失败！');
-  //       }
-  //     }
-  //   })
-  // },
+  cancelTemDel:function(e){
+    this.setData({
+      "itemId":"",
+      "itemIndex":"",
+      "showPopupDel":false
+    });
+  },
+  confirmTemDel:function(e){
+    this.setData({
+      "showPopupDel":false
+    });
+    UTIL.httpRequest(API.URL_GET_PERMANENTDELETE + this.data.itemId , {method:'GET'}, {
+      success: (res) => {
+        if(res.code==200){
+          let new_list = this.data.list
+          new_list.splice(this.data.index,1)
+          this.setData({'list':new_list})
+          UTIL.showToastNoneIcon('删除成功！');
+        }else{
+          UTIL.showToastNoneIcon('删除失败！');
+        }
+      }
+    })
+  },
   upload(e){
     this.setData({itemId:e.currentTarget.dataset.id});
     this.asyncFun(e.currentTarget.dataset.id)
@@ -279,7 +268,7 @@ Page({
     return new Promise((resolve, reject) => {
       wx.uploadFile({
         url: API.URL_GET_UPLOAD,
-        filePath: uploadFile.file.file[0].url,
+        filePath: uploadFile.file.file.url,
         name: 'file',
         header: {
           "Content-Type": "multipart/form-data",//记得设置

pages/fixedAssets/fixedAssets.wxml

@@ -9,7 +9,7 @@
     value="{{ name }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入固定资产名称"
     clearable
     bind:change="goSearch"
   />
@@ -76,7 +76,7 @@
               </view>
               <view class="img_box">
                 <view class="img_li">
-                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
+                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
                   </van-upload> 
                 </view>
               </view>
@@ -85,4 +85,6 @@
   </scroll-view>
 </van-action-sheet>
 <modal hidden="{{!showPopup}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTem" bindconfirm="confirmTem">  
+</modal>
+<modal hidden="{{!showPopupDel}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">  
 </modal>

pages/project/add/add.wxml

@@ -1,7 +1,7 @@
 <!--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>
-  <text style="top:{{isIPX?'54px':'30px'}};">新增工程项目</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">{{form.id?"":"新增"}}工程项目</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
 
@@ -14,7 +14,7 @@
     <van-field label="竣工日期" value="{{ form.endTime }}" placeholder="竣工日期" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down"  bindtap="openBox" data-name="showEndTime" />
     <van-calendar show="{{ showEndTime }}" bind:close="closeBox"  data-name="showEndTime" bind:confirm="onConfirmTime" data-value="form.endTime" show-confirm="{{ false }}" />
 
-    <van-field label="合共价款（元）" value="{{ form.projectAmount }}" placeholder="合共价款（元）" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectAmount"/>
+    <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">
@@ -30,8 +30,8 @@
     </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"/>
 
-    <van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.remark"/>
+    <van-field label="备注" value="{{ form.remark }}" placeholder="备注" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.remark"/>
   </view>
   <view class="bottom">
-    <view class="btn2" bindtap="goSubmit">确认</view>
+    <view class="btn2" bindtap="goSubmit">保存</view>
   </view>

pages/project/project.js

@@ -21,6 +21,7 @@ Page({
     uploadOptions:[],
     fileList:[],
     itemId:"",
+    itemIndex:"",
     list:[],
     fileEvent:{},
     projectList:[]
@@ -52,7 +53,7 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-this.onShow();
+    this.onShow();
   },
    goSearch(e){
     this.setData({name:e.detail})
@@ -109,20 +110,32 @@ this.onShow();
     })
   },
   delete(e){
-    var that = this;
-    UTIL.httpRequest(API.URL_GET_PROJECTDELETE + e.currentTarget.dataset.id, {method:'GET'},{
+    this.setData({
+      'itemId':e.currentTarget.dataset.id,
+      'itemIndex':e.currentTarget.dataset.index,
+      "showPopupDel":true
+    });
+  },
+  cancelTemDel:function(e){
+    this.setData({
+      "itemId":"",
+      "itemIndex":"",
+      "showPopupDel":false
+    });
+  },
+  confirmTemDel:function(e){
+    this.setData({
+      "showPopupDel":false
+    });
+    UTIL.httpRequest(API.URL_GET_PROJECTDELETE + this.data.itemId , {method:'GET'}, {
       success: (res) => {
-        if (res.code == API.SUCCESS_CODE) {
-          let list = that.data.projectList
-          list.splice(e.currentTarget.dataset.index, 1); 
-          wx.showToast({
-            title: '删除成功！',
-            icon: 'success',
-            duration: 2000
-          })
-          that.setData({
-            projectList : list,
-          })
+        if(res.code==200){
+          let new_list = this.data.projectList
+          new_list.splice(this.data.index,1)
+          this.setData({'projectList':new_list})
+          UTIL.showToastNoneIcon('删除成功！');
+        }else{
+          UTIL.showToastNoneIcon('删除失败！');
         }
       }
     })
@@ -261,7 +274,7 @@ this.onShow();
     return new Promise((resolve, reject) => {
       wx.uploadFile({
         url: API.URL_GET_UPLOAD,
-        filePath: uploadFile.file.file[0].url,
+        filePath: uploadFile.file.file.url,
         name: 'file',
         header: {
           "Content-Type": "multipart/form-data",//记得设置

pages/project/project.wxml

@@ -9,7 +9,7 @@
     value="{{ name }}"
     shape="round"
     background="transparent"
-    placeholder="请输入搜索关键词"
+    placeholder="请输入工程项目名称"
     clearable
     bind:change="goSearch"
   />
@@ -44,11 +44,21 @@
       </view>
   </view>
   <view slot="right" class="deleteBox">
-    <view style="flex: 1;height: 100%;display: flex;align-items: center;background-color: rgb(255,0,0,0.4);" bindtap="delete">
-      <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" ></image>
+    <view style="flex: 1;height: 100%;display: flex;align-items: center;flex-direction: column;justify-content: center;background-color: rgb(255,0,0,0.2);" data-id="{{item.id}}" data-index="{{index}}" bindtap="delete">
+      <view>
+        <image src="../../image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;display: block;" ></image>
+      </view>
+      <view>
+        <text style="color:red">删除</text>
+      </view>
     </view>
-    <view style="flex: 1;height: 100%;display: flex;align-items: center;background-color: rgb(98,173,102,0.4);" bindtap="upload">
-      <image src="../../image/icon/upload_icon.png" style="width: 25px;height: 25px;margin: 0 auto;" data-id="{{item.id}}" data-index="{{index}}" ></image>
+    <view style="flex: 1;height: 100%;display: flex;align-items: center;flex-direction: column;justify-content: center;background-color: rgb(98,173,102,0.2);" data-id="{{item.id}}" data-index="{{index}}" bindtap="upload">
+      <view>
+        <image src="../../image/icon/upload_icon.png" style="width: 25px;height: 25px;margin: 0 auto;display: block;"  ></image>
+      </view>
+      <view>
+        <text style="color: #62AD66;">附件</text>
+      </view>
     </view>
   </view>
 </van-swipe-cell>
@@ -62,7 +72,7 @@
               </view>
               <view class="img_box">
                 <view class="img_li">
-                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" multiple="{{true}}" data-idx="{{index}}">
+                  <van-upload file-list="{{ item.list }}" bind:after-read="afterRead" bind:delete="deleteImg" bind:click-preview="lookDown" data-idx="{{index}}">
                   </van-upload> 
                 </view>
               </view>
@@ -72,4 +82,6 @@
 </van-action-sheet>
 <modal hidden="{{!showPopup}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTem" bindconfirm="confirmTem">  
  
+</modal>
+<modal hidden="{{!showPopupDel}}" title="是否删除？" confirm-text="是" cancel-text="否" bindcancel="cancelTemDel" bindconfirm="confirmTemDel">  
 </modal>