优化专项附加扣除部分功能

 // pages/main/addtionalreduce/home.js
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
+var format = require('../../../utils/util.js');
 Page({
 
   /**
@@ -12,6 +13,9 @@ Page({
     hascompleted:false,
     additionlist: [],
     complete_item:[],
+    choosed_date: '',
+    show_modal:false,
+    tip_detail:"尊敬的用户您好！2020年度的专项附加扣除申报已经启动，请您及时确认填报信息，确保专项附加扣除能正常享受扣除。",
     declareStatus: {
       "to_declare ": "待申报",
       "declaring": "申报中",
@@ -40,6 +44,10 @@ Page({
    */
   onLoad: function (options) {
     console.log("onLoad");
+    var mydate = new Date();
+    this.setData({
+      choosed_date: mydate.getFullYear() ,
+    })
   },
 
   godeclare: function (e) {
@@ -67,7 +75,7 @@ Page({
   lookandadd: function (e) {
     var str = e.currentTarget.id.split('-')
     var data = this.data.additionlist;
-    console.log("lookandadd", str);
+    console.log("lookandadd", str,data);
 
     wx.navigateTo({
       url: 'lookandupdate/lookandupdate?status=' + data[str[0]].addition_items[str[1]].addition_category + "&employee_status=" + data[str[0]].employee_status + "&legal_entity_id=" + data[str[0]].legal_entity_id + "&legal_entity=" + data[str[0]].legal_entity,
@@ -87,29 +95,32 @@ Page({
   onShow: function () {
     console.log("onShow");
     var that = this
-    wx.showLoading({
-      title: '',
-    })
     this.getAdditionList()
   },
 
+  //获取申报列表
   getAdditionList: function () {
+    wx.showLoading({
+      title: '',
+    })
     var that = this;
     var Authorization = getApp().globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/person-additions',
-      // data: {
-      //   limit: 10,
-      //   offset: 0
-      // },
+      data: {
+        years:that.data.choosed_date
+        // limit: 10,
+        // offset: 0
+      },
       header: {
         'content-type': 'application/json',
         "Authorization": Authorization
       },
       success: function (res) {
         if (res && res.data) {
-          console.log("res", res)
+          console.log("show_modal", !res.data.new_addition_status)
           that.setData({
+            show_modal: !res.data.new_addition_status,
             complete_item: res.data.complete_item,
             additionlist: that.handleData(res.data.items) 
           })
@@ -145,9 +156,64 @@ Page({
         }
       } 
     }
-    console.log('ddddd', items)
+    console.log('items', items)
     return items
   },
+
+  datePickerChange: function (e) {
+    console.log("e", e)
+    var timestamp = Date.parse(new Date(e.detail.value)) / 1000
+    this.setData({
+      choosed_date: format.yearFormString(timestamp) 
+    })
+    this.getAdditionList()
+  }, 
+
+// 暂不确认
+  doNotConfirm:function(){
+    this.setData({
+      show_modal: false
+    })
+  },
+
+// 立即确认
+  doConfirm: function () {
+    this.setData({
+      show_modal: false
+    })
+    this.quickAdd()
+   },
+
+// 一键带入
+  quickAdd:function(){
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/person-additions-update',
+      method:"POST",
+      data: {
+        id_card_no: app.globalData.userInfo?app.globalData.userInfo.id:""
+      },
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        if (res && res.data) {
+          console.log("res", res)
+          that.setData({
+            choosed_date: "2020"
+          })
+          that.getAdditionList()
+        }
+        wx.hideLoading()
+      },
+      complete(res) {
+        console.log(res.data)
+      }
+    })
+  },
+
   /**
    * Lifecycle function--Called when page hide
    */

 <!--pages/main/addtionalreduce/home.wxml-->
 <view class='page'>
-
+  <!-- 新增日期选择器 -->
+  <picker mode="date" fields="year" start="2019-01-01" end="2020-01-01" bindchange="datePickerChange">
+    <view style="height:80rpx;width:280rpx">
+      <text style="line-height:80rpx;margin:0 20rpx;font-size: 28rpx;color: #999;">年份: </text>
+      <text style="line-height:80rpx;font-size: 28rpx;color: #333;">{{choosed_date}} </text>
+      <image style=" width: 24rpx;height: 16rpx;align-items: center;" src="/images/arrow_down.png"></image>
+    </view>
+  </picker>
+  <view style='height:20rpx;background:#F5F5F5'></view>
+  <!-- 新增弹窗 -->
+  <view wx:if="{{show_modal}}" class="mask"></view>
+  <view wx:if="{{show_modal}}" style='top:320rpx;position:absolute;z-index:10;width:650rpx;right:0;left:0;margin:auto;'>
+    <image class='modal_img' src="/images/home_tip.png"></image>
+    <view style="background:white;">
+      <view style='font-size:30rpx;color:#666;padding:20rpx 40rpx'>{{tip_detail}}</view>
+      <view class="divide_line" style="margin-top:40rpx"></view>
+      <view style='height:100rpx;width:100%;display: flex;'>
+        <text class='text_cancel' bindtap='doNotConfirm'>暂不确认</text>
+        <view style='width:1px;background:#e5e5e5;'></view>
+        <text class='text_confirm' bindtap='doConfirm'>立即确认</text>
+      </view>
+    </view>
+  </view>
+  <!-- 数据列表 -->
   <view wx:if="{{additionlist.length>0}}" style='margin-bottom:30rpx;background:#fff'>
-    <view  wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
+    <view wx:for="{{additionlist}}" wx:key="" style='display:flex;flex-direction:column' wx:for-index="idx01" wx:for-item="item">
       <view style='margin:30rpx 44rpx;float:left;display:flex;flex-direction:column'>
         <text class=' text_333_40  float_left'>{{item.legal_entity}}</text>
         <view wx:if="{{item.employee_status!='inactive'&&item.addition_items.length<1&&item.status=='init'}}" class='view_godeclare_wrap' bindtap='godeclare' id='{{idx01}}'>
@@ -17,7 +40,7 @@
         <block wx:for="{{item.addition_items}}" wx:key="" wx:for-item="itemData" wx:for-index="idx02">
           <view wx:if="{{itemData.addition_category!='medical_fund'}}">
             <view style='margin:0 50rpx;background:#e5e5e5;height:2rpx;'></view>
-            <view style='padding:30rpx 40rpx;display:flex;flex-direction:column '  bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>
+            <view style='padding:30rpx 40rpx;display:flex;flex-direction:column ' bindtap='lookandadd' id='{{idx01}}-{{idx02}}'>
               <view style='height:40rpx'>
                 <text class='text_333_32 float_left'>{{additiontitle[itemData.addition_category]}}</text>
                 <text class='text_333_32 float_left' hidden="{{(itemData.addition_category=='continuing_education'||itemData.addition_category=='house_fund')||itemData.count<2}}">（{{itemData.count}}）</text>
@@ -41,7 +64,7 @@
                     </view>
                   </view>
                 </view>
-                <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">  
+                <view wx:for="{{itemData.professions}}" wx:key="" wx:for-item="profession">
                   <view wx:if="{{index==0}}">
                     <text wx:if='{{itemData.professions.length>1}}' style='font-size:28rpx;color:#666'>职业资格继续教育 ({{itemData.professions.length}})</text>
                     <text wx:else style='font-size:28rpx;color:#666'>职业资格继续教育</text>
@@ -108,9 +131,20 @@
     <!-- <view wx:else>
       <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
     </view> -->
-   
+
+  </view>
+  <view wx:if="{{hascompleted&&additionlist.length<1&&choosed_date!=2020}}" style='background:#fff;'>
+        <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
   </view>
-   <view wx:if="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'>
-    <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
+  <view wx:if="{{hascompleted&&additionlist.length<1&&choosed_date==2020}}" style='background:#fef6e9;padding:40rpx 30rpx;display:flex;'>
+    <view style="margin-right:20rpx;margin-top:10rpx">
+      <image style='width:40rpx;height:40rpx;' src='/images/warn_yellow.png'></image>
+    </view>
+    <view >
+      <text style="font-size: 32rpx;color: #2B2B2B;">您还没有填报2020年度的专项附加扣除，点击</text>
+      <text style="font-size: 32rpx;color: #357AEB;" bindtap="quickAdd"> [一键带入] </text>
+      <text style="font-size: 32rpx;color: #2B2B2B;">将2019年度已填报的扣除信息在2020年度继续填报。</text>
     </view>
+
+  </view>
 </view>
\ No newline at end of file

@@ -117,3 +117,43 @@ line-height: 17px;
   line-height: 13px;
   padding: 10rpx 30rpx;
 }
+
+/* 遮罩层 */
+
+.mask {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000;
+  opacity: 0.7;
+  z-index: 10;
+}
+
+.modal_img {
+  width: 650rpx;
+  height: 160rpx;
+  margin: 0 auto;
+  display: block;
+}
+
+.text_cancel {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 36rpx;
+  color: #999;
+  letter-spacing: 0;
+  text-align: center;
+  flex: 1;
+  padding: 30rpx;
+}
+
+.text_confirm {
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-size: 36rpx;
+  color: #108ee9;
+  letter-spacing: 0;
+  text-align: center;
+  flex: 1;
+  padding: 30rpx;
+}