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

 Conflicts:

	pages/inCome/inCome.wxml

pages/inCome/inCome.js

@@ -32,11 +32,16 @@ Page({
     qtPics:[],  //其他图片列表数据
     //收入时间弹窗显隐
     srShow:false,
-    minDate: new Date(2018, 0, 1).getTime(),
-    maxDate: new Date(2025, 0, 31).getTime(),
+    minDate: new Date(2021, 6, 1).getTime(),
+    maxDate: new Date(2023, 0, 31).getTime(),
     crzhShow:false,
-    accountListOptions:[] //存入账户类型选项
+    accountListOptions:[], //存入账户类型选项
+    crlxShow:false, //收入类型弹窗显隐
   },
+  onCancelcrlx(){
+    this.setData({crlxShow:false,})
+  },
+  oncrlxShow(){ this.setData({crlxShow:true})},
   onCancelcrzh(){
     this.setData({crzhShow:false})
   },
@@ -84,8 +89,10 @@ Page({
     this.setData({showHt:true})
   },
   bindPickerChange (e) {
-    let obj = this.data.incomeTypeOptions[e.detail.value];
+    let obj =  e.detail.value;
+
     this.setData({
+      crlxShow:false,
       'formData.incomeType':obj.dictValue,
       incomeTypeText:obj.dictLabel
     })
@@ -111,13 +118,9 @@ Page({
    /**
    * 生命周期函数--监听页面显示
    */
-   onReady: function () {
+  onReady: function () {
     let that = this;
-    //初始化收入时间
-    this.setData({
-      'formData.accountDate':UTIL.formatDate(new Date())
-    })
-
+ 
     //获取收入单位
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {
@@ -326,6 +329,11 @@ Page({
       }
     })
    
+    },
+    onChange(event){
+      this.setData({
+        [event.currentTarget.dataset.value]: event.detail,
+      })
     },
     imgPreviewImage(e){
      

pages/inCome/inCome.json

@@ -1,22 +1,14 @@
 {
-  "navigationStyle": "custom",
   "usingComponents": {
-    "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index",
+
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-tag": "@vant/weapp/tag/index",
     "van-icon": "@vant/weapp/icon/index",
-    "van-steps": "@vant/weapp/steps/index",
-    "van-button": "@vant/weapp/button/index",
-    "van-radio": "@vant/weapp/radio/index",
-    "van-radio-group": "@vant/weapp/radio-group/index",
     "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-dialog": "@vant/weapp/dialog/index",
-    "van-collapse": "@vant/weapp/collapse/index",
-    "van-collapse-item": "@vant/weapp/collapse-item/index"
+    "van-calendar": "@vant/weapp/calendar/index"
+
+
   }
 }

pages/inCome/inCome.wxml

@@ -9,8 +9,16 @@
   <view class="top-tit">收入单位</view>
   <view class="top-title">{{bookName}}</view>
 </view>
-<text class="title">基础信息</text>
+<view class="title">
+  <text>基础信息</text>
+</view>
 <view class="main-box table-box">
+
+      <van-field readonly  label="收入时间" value="{{formData.accountDate }}"
+        placeholder="请选择收入时间" border="{{ false }}" input-align="right" is-link arrow-direction	="down"
+        bindtap="onsrDate"  required="{{true}}"
+      />
+      <van-calendar
       <view class="flex-block">
         <text class="rules">收入时间</text>
         <view class="wrap" bindtap="onsrDate" >
@@ -93,66 +101,11 @@
       
       </view>
 </view>
-
-<view class="main-box table-box" style="margin-top: 15px;">
-  <van-cell>
-    <!-- <view slot="icon">
-      <van-icon class-prefix="my-icon" name="extra" />
-    </view> -->
-    <view slot="title">
-      <view class="van-cell-text">附件<van-tag type="danger" style="margin-left: 10px;">可拍照</van-tag></view>
-    </view>
-    <view>
-      <view class="van-cell-text">总数<van-tag round color="#5CAE77" plain style="margin-left: 10px;"> {{form.transfers[index].fileNum?form.transfers[index].fileNum:0}}张 </van-tag></view>
-    </view>
-  </van-cell>
-  <view class="fj-box">
-    <view class="fj-li">
-      <view>
-        <text>收\n据</text>
-      </view>
-      <view class="img_box">
-        <view class="img_list" wx:for="{{sjPics}}" wx:for-index="index" wx:key="index">
-          <image class="img_li" src="{{item.file}}"bindlongpress="bindlongpressimg" data-status="sjPics" bindtap="imgPreviewImage" data-id='{{index}}'></image>
-          <van-icon name="/image/apply/img_delete.png" data-id="{{index}}" size="20px" data-status="sjPics" bindtap="deleteimg" />
-        </view>
-        <view class="img_list">
-          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadSjPics"></image>
-        </view>
-      </view>
-    </view>
-    <view class="fj-li">
-      <view>
-        <text>发\n票</text>
-      </view>
-      <view class="img_box">
-
-        <view class="img_list" wx:for="{{fpPics}}" wx:for-index="index" wx:key="index">
-          <image class="img_li" src="{{item.file}}" data-status="fpPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
-          <van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="fpPics"  bindtap="deleteimg" />
-        </view>
-        <view class="img_list">
-          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadFpPics"></image>
-        </view>
-      </view>
-    </view>
-    <view class="fj-li">
-      <view>
-        <text>其\n他</text>
-      </view>
-      <view class="img_box">
-        <view class="img_list" wx:for="{{qtPics}}" wx:for-index="index" wx:key="index">
-          <image class="img_li" src="{{item.file}}"  data-status="qtPics" bindtap="imgPreviewImage" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
-          <van-icon name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics" bindtap="deleteimg" />
-        </view>
-        <view class="img_list">
-          <image class="img_li img_add" src="/image/apply/fj_upload.png" data-index="{{index}}" bindtap="uploadQtPics"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- <view style="margin:10px 0 5px;" class="flex-block">
+<view class="title">
+  <text>附件</text>
+</view>
+<view class="main-box table-box">
+  <view style="margin:10px 0 5px;" class="flex-block">
         <text class="fjLable">收据</text> 
         <view class='content'>
           <view class='img-box'>
@@ -195,7 +148,7 @@
             <view class='img-list'>
               <block wx:for="{{qtPics}}"  wx:for-index="index" wx:key="index">
                 <view class='img-item'>
-                  <van-icon class="close-ico" name="/image/apply/img_delete.png" size="20px" data-id="{{index}}" data-status="qtPics"  bindtap="deleteimg"  />
+                  <van-icon class="close-ico" data-id="{{index}}" name="/image/apply/img_delete.png" size="20px" data-status="qtPics"  bindtap="deleteimg"  />
                   <image src='{{item.file}}'  data-status="qtPics" bindtap="imgPreviewImage" class="imagea" bindlongpress="bindlongpressimg" data-id='{{index}}'></image>
                 </view>
               </block>
@@ -205,18 +158,11 @@
             </view>
           </view>
         </view>
-  </view> -->
-</view>
-
-<view class="bottom">
-  <!-- <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view> -->
-  <view class="btn1" data-code="1" bindtap="swichAccounting">暂存</view>
-  <view class="btn2" data-code="2" bindtap="swichAccounting">提交</view>
+  </view>
 </view>
-
-<!-- <view class="main-box table-box" style="margin-top: 30rpx;">
+<view class="main-box table-box" style="margin-top: 30rpx;">
     <view class="btn flex-block">
         <button type="primary" data-code="1"  bindtap="swichAccounting" plain="true">暂存</button>
         <button type="primary" data-code="2" bindtap="swichAccounting">提交</button>
     </view>
-</view> -->
+</view>