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

 Conflicts:

	pages/bankDraft/add/add.js

	pages/bankDraft/add/add.wxml

pages/bankDraft/add/add.json

@@ -14,6 +14,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-datetime-picker": "@vant/weapp/datetime-picker/index"
   }
 }

pages/bankDraft/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;
 }

pages/contract/add/add.wxml

@@ -249,9 +249,9 @@
         </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">
+            <picker mode="date" value="{{form.biddingDate}}" fields="day" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmBiddingDate">
                 <view class="picker">
-                    {{form.biddingDate?form.biddingDate.substring(0,9):'招标日期'}}
+                    {{form.biddingDate?form.biddingDate:'招标日期'}}
                 </view>
             </picker>
         </view>
@@ -290,9 +290,9 @@
         </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">
+            <picker mode="date" value="{{form.reviewTime}}" fields="day" start="{{ minDate }}" end="{{ maxDate }}" bindchange="onConfirmReviewTime">
                 <view class="picker">
-                    {{form.reviewTime?form.reviewTime.substring(0,9):'审核时间'}}
+                    {{form.reviewTime?form.reviewTime:'审核时间'}}
                 </view>
             </picker>
         </view>

pages/contract/contract.js

@@ -116,6 +116,11 @@ Page({
     this.getList();
   },
   goUpdate(e){
+    this.setData({
+      "itemId":"",
+      "itemIndex":"",
+      "contractionId":""
+    });
     wx.navigateTo({
       url: '/pages/contract/add/add?id='+e.currentTarget.dataset.id,
     })
@@ -147,7 +152,7 @@ Page({
       success: (res) => {
         if(res.code==200){
           let new_list = this.data.list
-          new_list.splice(this.data.index,1)
+          new_list.splice(this.data.itemIndex,1)
           this.setData({'list':new_list})
           UTIL.showToastNoneIcon('删除成功！');
         }else{
@@ -349,7 +354,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    console.log(this.data.contractionId);
     if(this.data.contractionId!=""&&this.data.contractionId!=null){
       this.relevanceBack()
     }else{

pages/project/add/add.js

@@ -52,7 +52,29 @@ Page({
     }
     
   },
-
+  onConfirmStartTime(e){
+    let data = this.getNewDate(new Date(e.detail.value));
+    this.setData({'form.startTime':data});
+  },
+  onConfirmEndTime(e){
+    let data = this.getNewDate(new Date(e.detail.value));
+    this.setData({'form.endTime':data});
+  },
+  getNewDate(date){
+    //date是传过来的时间戳，注意需为13位，10位需*1000
+    //也可以不传,获取的就是当前时间
+    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); //日
+    var mydate = year + "-" + month + "-" + day;
+    return mydate
+  },
   back:function(){
     wx.navigateBack({
       delta: 1

pages/project/add/add.wxml

@@ -3,17 +3,26 @@
   <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.projectName }}" placeholder="项目名称" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectName"/>
     <van-field label="合同承建方" value="{{ form.projectContractor }}" placeholder="合同承建方" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectContractor"/>
-
-    <van-field readonly label="开工日期" value="{{ form.startTime }}" placeholder="开工日期" border="{{ false }}" bind:change="onChange" input-align="right" required is-link arrow-direction	="down" bindtap="openBox" data-name="showStartTime"/>
-    <van-calendar show="{{ showStartTime }}" bind:close="closeBox"  data-name="showStartTime" bind:confirm="onConfirmTime" data-value="form.startTime" show-confirm="{{ false }}" />
-
-    <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 }}" />
-
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>开工日期</view>
+          <picker mode="date" value="{{form.startTime}}"  bindchange="onConfirmStartTime">
+              <view class="picker">
+                  {{form.startTime?form.startTime:'开工日期'}}
+              </view>
+          </picker>
+      </view>
+    <view class="section" style="margin-top: -28rpx;">
+          <view class="section__title"><text style="color:red;margin-right: 8rpx;">*</text>竣工日期</view>
+          <picker mode="date" value="{{form.endTime}}"  bindchange="onConfirmEndTime">
+              <view class="picker">
+                  {{form.endTime?form.endTime:'竣工日期'}}
+              </view>
+          </picker>
+      </view>
     <van-field label="合共价款（元）" value="{{ form.projectAmount }}" type="digit" placeholder="合共价款（元）" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.projectAmount"/>
 
 

pages/project/add/add.wxss

@@ -59,4 +59,9 @@
 }
 .van-field__label {
   width: max-content;
+}
+.table-boxs>view{
+  display: flex;
+  justify-content: space-between;
+  line-height: 100rpx;
 }