优化专项附加详情

wangyu
pages/main/addtionalreduce/additiondetail/additiondetail.js
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
pages/main/addtionalreduce/lookandupdate/lookandupdate.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.js
查看文件 @13659c5
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.js
查看文件 @13659c5
 // pages/main/addtionalreduce/additiondetail/additiondetail.js
+var format = require('../../../../utils/util.js');
 Page({
   /**
@@ -13,6 +14,10 @@ Page({
       "medical_fund": "大病医疗",
       "house_fund": "住房"
     },
+    reducetype: {
+      "month": "月",
+      "year": "年"
+    },
     datas:{}
   },
@@ -22,15 +27,51 @@ Page({
   onLoad: function (options) {
     var that = this
     console.log("options", options);
+    this.handleData(options.datas)
     this.setData({
-      cur_status: options.status,
-      datas: JSON.parse(options.datas)
+      cur_status: options.status
     })
     wx.setNavigationBarTitle({
       title: that.data.additiontitle[options.status],
     })
   },
+  handleData: function (data){
+    var newData = JSON.parse(data);
+   
+    if (newData && newData.length>0){
+      if (newdata.children_birthday && newdata.children_birthday > 0) {
+        newdata.children_birthday_new = format.formatTime_date(newdata.children_birthday)
+      }
+      if (newdata.spouse_birthday && newdata.spouse_birthday > 0) {
+        newdata.spouse_birthday_new = format.formatTime_date(newdata.spouse_birthday)
+      }
+      if (newdata.education_start && newdata.education_start > 0) {
+        newdata.education_start_new = format.formatTime_date(newdata.education_start)
+      }
+      if (newdata.education_end && newdata.education_end > 0) {
+        newdata.education_end_new = format.formatTime_date(newdata.education_end)
+      }
+
+      if (newdata.birthday && newdata.birthday > 0) {
+        newdata.birthday_new = format.formatTime_date(newdata.birthday)
+      }
+      if (newdata.birthday && newdata.birthday > 0) {
+        newdata.birthday_new = format.formatTime_date(newdata.birthday)
+      }
+      if (newdata.rent_start && newdata.rent_start > 0) {
+        newdata.rent_start_new = format.formatTime_date(newdata.rent_start)
+      }
+      if (newdata.rent_end && newdata.rent_end > 0) {
+        newdata.rent_end_new = format.formatTime_date(newdata.rent_end)
+      }
+    }
+    this.setData({
+      datas: newData
+    })
+    console.log("handleData", this.data.datas)
+  },
+
   /**
    * Lifecycle function--Called when page is initially rendered
    */
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @13659c5
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @13659c5
@@ -6,7 +6,7 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女身份证件类型：</text>
-      <text class='text_right_333'>{{datas.children_id_card_type}}</text>
+      <text class='text_right_333'>{{datas.children_id_card_type=='1'?"身份证":datas.children_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
@@ -21,12 +21,12 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>{{datas.children_birthday}}</text>
+      <text class='text_right_333'>{{datas.children_birthday_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>国籍</text>
-      <text class='text_right_333'>中国</text>
+      <text class='text_right_333'>{{datas.nation}}</text>
     </view>
     <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
     <view style='height:90rpx;width:100%'>
@@ -37,30 +37,30 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女学籍号</text>
-      <text class='text_right_333'>902482958937583</text>
+      <text class='text_right_333'>{{datas.student_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>子女受教育阶段</text>
-      <text class='text_right_333'>{{datas.education_period}}</text>
+      <text class='text_right_333'>{{datas.education_period_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>受教育日期起</text>
-      <text class='text_right_333'>2016-09</text>
+      <text class='text_right_333'>{{datas.education_start_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>受教育日期止</text>
-      <text class='text_right_333'>2022-06</text>
+      <text class='text_right_333'>{{datas.education_end_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度</text>
+      <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
-      <text class='text_right_orange'>￥{{datas.deduction_amount}}/月</text>
+      <text class='text_right_orange'>￥{{datas.deduction_amount}}/reducetype[datas.deduction_type]</text>
     </view>
     <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
     <view style='height:90rpx;width:100%'>
@@ -69,7 +69,7 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶证件类型</text>
-      <text class='text_right_333'>{{datas.spouse_id_card_type}}</text>
+      <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"身份证":datas.spouse_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶身份证件号码</text>
@@ -77,11 +77,11 @@
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>{{datas.spouse_birthday}}</text>
+      <text class='text_right_333'>{{datas.spouse_birthday_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>国籍</text>
-      <text class='text_right_333'>中国</text>
+      <text class='text_right_333'>{{datas.nation}}</text>
     </view>
   </view>
@@ -90,50 +90,50 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>赡养类型：</text>
-      <text class='text_right_333'>独立赡养</text>
+      <text class='text_right_333'>{{datas.support_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>被赡养人姓名：</text>
-      <text class='text_right_333'>实发</text>
+      <text class='text_right_333'>{{datas.supported_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>被赡养人证件类型：</text>
-      <text class='text_right_333'>身份证</text>
+      <text class='text_right_333'>{{datas.id_card_type=='1'?"身份证":datas.id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>被赡养人证件号码：</text>
-      <text class='text_right_333'>92497239127583265721</text>
+      <text class='text_right_333'>{{datas.supported_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>被赡养人出生日期：</text>
-      <text class='text_right_333'>2010-09-09</text>
+      <text class='text_right_333'>{{datas.birthday_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>被赡养人国籍：</text>
-      <text class='text_right_333'>中国</text>
+      <text class='text_right_333'>{{datas.nation}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>与纳税人关系：</text>
-      <text class='text_right_333'>配偶</text>
+      <text class='text_right_333'>{{datas.relationship}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>分摊比例：</text>
-      <text class='text_right_333'>100%</text>
+      <text class='text_right_333'>{{datas.percent}}%</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度</text>
+      <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
-      <text class='text_right_orange'>￥1200/月</text>
+      <text class='text_right_orange'>￥{{datas.deduction_amount}}/reducetype[datas.deduction_type]</text>
     </view>
   </view>
@@ -142,20 +142,20 @@
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>租赁房屋坐落地址：</text>
-      <text class='text_right_333'>北京市 市辖区 朝阳区</text>
+      <text class='text_right_333'>{{datas.house_address}}</text>
     </view>
     <view style='height:90rpx'>
-      <text class='text_right_333'>瑞创国际1101大厦</text>
+      <text class='text_right_333'>{{datas.house_detail_address}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>出租方类型：</text>
-      <text class='text_right_333'>个人</text>
+      <text class='text_right_333'>{{datas.owner_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>出租方名称：</text>
-      <text class='text_right_333'>自如</text>
+      <text class='text_right_333'>{{datas.owner_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
@@ -163,62 +163,62 @@
         <text style='font-size: 15px;color: #777777;line-height:90rpx;'>出租方纳税人识别号：</text>
         <!-- <text style='line-height:24rpx;font-size:24rpx;color:#AEAEAE;'>统一社会信用代码</text> -->
       </view>
-      <text class='text_right_333'>89712839990102</text>
+      <text class='text_right_333'>{{datas.owner_credit_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>证书类型：</text>
-      <text class='text_right_333'>产权证号</text>
+      <text class='text_right_333'>{{datas.certification_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>证书号码：</text>
-      <text class='text_right_333'>902482958937583427252376</text>
+      <text class='text_right_333'>{{datas.certification_no}}</text>
     </view>
     <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>租赁合同编号</text>
-      <text class='text_right_333'>yu9348935743757385</text>
+      <text class='text_right_333'>{{datas.rent_contract_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>租赁期起</text>
-      <text class='text_right_333'>902482958937583427252376</text>
+      <text class='text_right_333'>{{datas.rent_start_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left;margin-right:10rpx'>*</text>
       <text class='text_left'>租赁期止</text>
-      <text class='text_right_333'>yu9348935743757385</text>
+      <text class='text_right_333'>{{datas.rent_end_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除方式</text>
-      <text class='text_right_333'>月度</text>
+      <text class='text_right_333'>{{reducetype[datas.deduction_type]}}度</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>扣除金额</text>
-      <text class='text_right_orange'>￥1200/月</text>
+      <text class='text_right_orange'>￥{{datas.deduction_amount}}/reducetype[datas.deduction_type]</text>
     </view>
     <view style='width:100%;height:20rpx;background:#f9f9f9'></view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶姓名</text>
-      <text class='text_right_333'>西施</text>
+      <text class='text_right_333'>{{datas.spouse_name}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶证件类型</text>
-      <text class='text_right_333'>结婚证</text>
+      <text class='text_right_333'>{{datas.spouse_id_card_type=='1'?"身份证":datas.spouse_id_card_type}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>配偶身份证件号码</text>
-      <text class='text_right_333'>1101101010110</text>
+      <text class='text_right_333'>{{datas.spouse_id_card_no}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>出生日期</text>
-      <text class='text_right_333'>2000年10月1日</text>
+      <text class='text_right_333'>{{datas.birthday_new}}</text>
     </view>
     <view style='height:90rpx;width:100%'>
       <text class='text_left'>国籍</text>
-      <text class='text_right_333'>中国</text>
+      <text class='text_right_333'>{{datas.nation}}</text>
     </view>
   </view>
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @13659c5
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @13659c5
@@ -117,14 +117,27 @@ Page({
       success: function(res) {
         if (res && res.data) {
           console.log("res", res)
-          that.setData({
-            additionInfo: res.data.items
-          })
+          that.handleAddition(res.data)
         }
       }
     })
   },
+  handleAddition: function(data) {
+    var newdata = data.items
+    for (var i = 0; i < newdata.length; i++) {
+      if (newdata[i].education_start && newdata[i].education_start > 0) {
+        newdata[i].education_start = format.formatTime_date(newdata[i].education_start)
+      }
+      if (newdata[i].education_end && newdata[i].education_end > 0) {
+        newdata[i].education_end = format.formatTime_date(newdata[i].education_end)
+      }
+    }
+    this.setData({
+      additionInfo: newdata
+    })
+  },
+
   goaddSupporter: function() {
     wx.navigateTo({
       url: '../adddupporters/adddupporters?id=' + this.data.additionInfo[0].id,
@@ -142,7 +155,6 @@ Page({
   //       title: '暂无可查看资料',
   //     })
   //   }
-
   // },
   showdetail: function(e) {
@@ -168,7 +180,7 @@ Page({
         'content-type': 'application/json',
         "Authorization": Authorization
       },
-      method:"POST",
+      method: "POST",
       success: function(res) {
         if (res && res.data) {
           console.log("res", res)
@@ -182,7 +194,7 @@ Page({
     console.log("goedit", e)
     if (this.data.additionInfo && this.data.additionInfo.length > 0) {
       wx.navigateTo({
-        url: '../addextrainfo/addextrainfo?datas=' + '' + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true' ,
+        url: '../addextrainfo/addextrainfo?datas=' + '' + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
       })
     }
   },
@@ -237,7 +249,7 @@ Page({
       },
       success: function(res) {
         console.log('succ', res)
-        if (res.statusCode < 300) {
+        if (res.statusCode == 200) {
           that.handleData(res.data);
         }
       },
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @13659c5
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @13659c5
@@ -33,7 +33,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -83,7 +83,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -118,7 +118,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -155,7 +155,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
@@ -258,7 +258,7 @@
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.deduction_type}}</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>