优化

env/env.js

@@ -1,18 +1,18 @@
 module.exports = {
     DEV: {
-          URL_PREFIX: 'http://192.168.31.178/api',
-          // URL_PREFIX: 'https://dazu.nongshen.net/api',
+          // URL_PREFIX: 'http://192.168.31.178/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     PRE: {
-          URL_PREFIX: 'http://192.168.31.178:8080/api',
-          // URL_PREFIX: 'https://dazu.nongshen.net/api',
+          // URL_PREFIX: 'http://192.168.31.178:8080/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     PROD: {
-          URL_PREFIX: 'http://192.168.31.178:8080/api',
-          // URL_PREFIX: 'https://dazu.nongshen.net/api',
+          // URL_PREFIX: 'http://192.168.31.178:8080/api',
+          URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     IMGURL: {
-          URL_PREFIX: 'http://192.168.31.178:8080',
-          // URL_PREFIX: 'https://dazu.nongshen.net',
+          // URL_PREFIX: 'http://192.168.31.178:8080',
+          URL_PREFIX: 'https://dazu.nongshen.net',
     }
   }

miniprogram_npm/@vant/weapp/empty/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-empty{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding:32px 0}.van-empty__image{height:160px;width:160px}.van-empty__image:empty{display:none}.van-empty__image__img{height:100%;width:100%}.van-empty__image:not(:empty)+.van-empty__image{display:none}.van-empty__description{color:#969799;font-size:14px;line-height:20px;margin-top:16px;padding:0 60px}.van-empty__description:empty,.van-empty__description:not(:empty)+.van-empty__description{display:none}.van-empty__bottom{margin-top:24px}
+@import '../common/index.wxss';.van-empty{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding:32px 0}.van-empty__image{height:100px;width:100px}.van-empty__image:empty{display:none}.van-empty__image__img{height:100%;width:100%}.van-empty__image:not(:empty)+.van-empty__image{display:none}.van-empty__description{color:#969799;font-size:14px;line-height:20px;margin-top:16px;padding:0 60px}.van-empty__description:empty,.van-empty__description:not(:empty)+.van-empty__description{display:none}.van-empty__bottom{margin-top:24px}

pages/apply/index.js

@@ -77,7 +77,8 @@ swichPaymentApply:function(e){
       accountName:'',
       bankAccountNumber:'',
       status:'N',
-      method:'GET'
+      method:'GET',
+      accountType:102
     }
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {

pages/apply/paymentTemplate/add/add.js

@@ -761,9 +761,42 @@ Page({
               url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id+'&deptId='+res.data.approvalItemTemplate.deptId,
             })
           }
-          if(e.currentTarget.dataset.type != 0){
-            UTIL.showToastNoneIcon('操作成功！');
-            that.back();
+          // if(e.currentTarget.dataset.type != 0){
+          //   wx.showToast({
+          //     title: '保存成功',
+          //     icon: 'success',
+          //     duration: 2000,
+          //     complete(){
+          //       setTimeout(function(){
+          //         that.back();
+          //       },2000)
+          //     }
+          //   })
+          // }
+          if(e.currentTarget.dataset.type == 3){
+            UTIL.httpRequest(API.URL_GET_TOREVIEWSUBMIT+res.data.approvalItemTemplate.id , {method:'POST'}, {
+              success: (res2) => {
+                if (res2.code == API.SUCCESS_CODE) {
+                  wx.showToast({
+                    title: '操作成功',
+                    icon: 'success',
+                    duration: 2000,
+                    complete(){
+                      setTimeout(function(){
+                        that.back();
+                      },2000)
+                    }
+                  })
+                }else{
+                  wx.showToast({
+                    title: '操作失败',
+                    icon: 'success',
+                    duration: 2000
+                  })
+                }
+              }
+            })
+            
           }
         }
       }
@@ -932,6 +965,10 @@ Page({
       that.back()
     }
   },
+  goSubmitUp(e){
+    var that = this ;
+    
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/handle/expenditureAudit/expenditureAudit.js

@@ -15,7 +15,9 @@ Page({
   data: {
     isIPX: app.globalData.isIPX,
     active:0,
-    spsxOptions:[]
+    spsxOptions:[],
+    nickName:app.globalData.user,
+    comment:''
   },
 
   /**
@@ -25,7 +27,8 @@ Page({
     var that = this;
     console.log(options);
     that.setData({
-      taskId:options.taskId
+      taskId:options.taskId,
+      pageType:options.type
     })
     UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
       success: (res) => {
@@ -35,6 +38,7 @@ Page({
             ["form.approvalItemTemplate.submitDate"]:UTIL.js_date_time(new Date()),
             ["form.approvalItemTemplate.submitter"]:res.user.nickName,
             ["form.approvalItemTemplate.telephone"]:res.user.phonenumber,
+            nickName:res.user.nickName
           })
 
         }
@@ -244,11 +248,12 @@ Page({
   },
   goDis(){
     var that = this ;
+    console.log()
     let data = {
       taskId:that.data.taskId,
       instanceId:that.data.instanceId,
       variables:JSON.stringify({
-        comment:'驳回',
+        comment:that.data.comment == '' ? '驳回':that.data.comment,
         pass:false,
       }),
       method:'POST'
@@ -256,9 +261,25 @@ Page({
     UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE , data, {
       success: (res) => {
         console.log(res);
-        // that.setData({
-        //   spsxOptions:res.data.processSchedule.spsx
-        // })
+        if (res.code == API.SUCCESS_CODE) {
+          wx.showToast({
+            title: '审批成功',
+            icon: 'success',
+            duration: 2000,
+            complete(){
+              setTimeout(function(){
+                that.back();
+              },2000)
+            }
+          })
+        }else{
+          wx.showToast({
+            title: '操作失败',
+            icon: 'error',
+            duration: 2000
+          })
+        }
+        
       }
     })
   },
@@ -268,19 +289,42 @@ Page({
       taskId:that.data.taskId,
       instanceId:that.data.instanceId,
       variables:JSON.stringify({
-        "comment":'同意',
+        "comment":that.data.comment == '' ? '同意':that.data.comment,
         "pass":true,
-      })
+      }),
+      method:'POST'
     };
     UTIL.httpRequest(API.URL_GET_PROCESSCOMPLETE ,data, {
       success: (res) => {
         console.log(res);
-        // that.setData({
-        //   spsxOptions:res.data.processSchedule.spsx
-        // })
+        if (res.code == API.SUCCESS_CODE) {
+          wx.showToast({
+            title: '审批成功',
+            icon: 'success',
+            duration: 2000,
+            complete(){
+              setTimeout(function(){
+                that.back();
+              },2000)
+            }
+          })
+        }else{
+          wx.showToast({
+            title: '操作失败',
+            icon: 'error',
+            duration: 2000
+          })
+        }
       }
     })
   },
+  commentInput(e){
+    console.log(e);
+    var that = this;
+    that.setData({
+      comment:e.detail.value
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/handle/expenditureAudit/expenditureAudit.wxml

@@ -6,7 +6,7 @@
 <view class="pure_top" style="top:{{isIPX?'88px':'64px'}};"></view>
 <view class="main-box top-box" style="margin-top:{{isIPX?'100px':'75px'}};">
   <text class="box-title">审批事项</text>
-  <input class="input_tit" placeholder="请输入审批事项" value="{{form.approvalItemTemplate.approvalItems}}" bindinput="bindKeyInput"/>
+  <input class="input_tit" disabled placeholder="请输入审批事项" value="{{form.approvalItemTemplate.approvalItems}}" bindinput="bindKeyInput"/>
   <text>提交单位：{{form.approvalItemTemplate.submitCompany}}</text>
   <text>提交日期：{{form.approvalItemTemplate.submitDate}}</text>
   <text>提  交  人：{{form.approvalItemTemplate.submitter}}</text>
@@ -166,7 +166,7 @@
     <view class="steps-tit">审批流程</view>
     <van-row wx:for="{{spsxOptions}}" wx:key="index">
       <van-col span="3">
-        <view class="index">{{index+1}}</view>
+        <view class="index {{(item.approverStatus != null || item.assigneeName==nickName) ? 'active':'' }}">{{index+1}}</view>
         <!-- :class="{'indexCenter':index==0 ? false : true}" -->
         <block wx:if="{{index==0}}">
           <view class="indexBorder">
@@ -183,25 +183,43 @@
           </view>
         </block>
       </van-col>
-      <van-col span="21">
-        <van-cell title="{{item.assigneeName}}{{item.deptLabel}}" center="{{true}}" border="{{false}}">
-          <view class="agree" wx:if="{{item.type=='1'}}">{{ item.comment }}</view>
-          <view class="in" wx:if="{{item.type=='2'}}">{{ item.comment }}</view>
-          <view class="disagree" wx:if="{{item.type=='3'}}">{{ item.comment }}</view>
+      <van-col span="21" style="height: 77px;">
+        <van-cell center="{{true}}" border="{{false}}">
+          <view slot="title" class="cellTit">
+            <text>{{item.assigneeName}}</text>
+            <text>{{item.deptLabel}}</text>
+          </view>
+          <view class="agree" wx:if="{{item.approverStatus=='true'}}">同意</view>
+          <view class="in" wx:elif="{{item.assigneeName==nickName && pageType!='see'}}">审核中</view>
+          <view class="disagree" wx:elif="{{item.approverStatus=='false'}}">驳回</view>
         </van-cell>
 
-        <van-cell center border="{{false}}">
-          <view slot="title">
-            <view style="color: #999999;">{{ item.durationInMillis }}</view>
+        <view wx:if="{{item.assigneeName==nickName && pageType!='see'}}">
+          <input class="input_tit" value="{{comment}}" placeholder="意见输入" bindinput="commentInput" style="margin-top: 10px;margin-bottom: 0;"/>
+          <!--  -->
+        </view>
+
+        <van-cell wx:elif="{{item.approverStatus!=null}}" center border="{{false}}">
+          <view slot="title" style="margin-top: 10px;">
+            <view style="color: #999999;line-height: 32px;">{{ item.comment }}</view>
           </view>
-          <view style="color: #999999;font-size: 12px;">{{ item.time.substr(0,10) }}</view>
+          <view style="color: #999999;font-size: 12px;margin-top: 10px;line-height: 32px;">{{ sub.times(item.time) }}</view>
         </van-cell>
+
       </van-col>
     </van-row>
   </view>
 </view>
 </block>
-<view class="bottom">
+<view class="bottom" wx:if="{{pageType!='see'}}">
   <button type="warn" plain class="btnDis" bindtap="goDis">驳回</button>
   <button type="primary" class="btnAgree" bindtap="goAgree">同意</button>
 </view>
+
+<wxs module="sub">
+  var times = function(time){
+    console.log(time)
+    return time.substring(0,10);
+  }
+  module.exports.times = times;
+</wxs>

pages/handle/expenditureAudit/expenditureAudit.wxss

@@ -203,7 +203,7 @@ text{display: block;}
 
 .steps-box  .van-col{
     position: relative;
-    height: 70px;
+    height: 90px;
   }
   .steps-box  .van-col--21{
     padding: 12PX 0;
@@ -223,7 +223,7 @@ text{display: block;}
     border-radius: 5PX;
   }
   .steps-box  .index{
-    background: #1D6FE9;
+    background: #C9C9C9;
     color: #ffffff;
     text-align: center;
     width: 20PX;
@@ -235,6 +235,10 @@ text{display: block;}
     top: 50%;
     transform: translate(0,-50%);
   }
+  .steps-box  .active{
+    background: #2C8E68;
+  }
+  
   .steps-box  .indexCenter{
     top: 0!important;
   }
@@ -337,4 +341,16 @@ text{display: block;}
   .img_box{
     position: relative;
     width: 100%;
+  }
+  .cellTit{
+    display: flex;
+    justify-content: space-between;
+  }
+  .cellTit text{
+    width: 50%;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-break: break-all;
+    overflow: hidden;
   }

pages/handle/liist.js

@@ -8,6 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    isIPX: app.globalData.isIPX,
     active:"",
     pageTitle:"",
     // 待办列表
@@ -100,19 +101,25 @@ Page({
       orderByColumn:"A.ID_",
       isAsc:"desc",
       systemType:4,
-      method:"GET"
+      method:"GET",
+      taskName:'相关人员审批'
     }
     UTIL.httpRequest(API.URL_GET_TASKLIST,data, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
           this.setData({todoNum:res.total})
-          this.setData({todoList:res.rows})
+          if(res.rows!=null&&res.rows!=""){
+            for(let i = 0;i<res.total;i++){
+              let d = this.dictTranslate(this.data.transferType,res.rows[i].formData.transferType)
+              res.rows[i].formData.transferType =  d
+            }
+            this.setData({todoList:res.rows})
+          }
         }
       },	fail: (res) => {
         console.log(res);
       },
       complete: (res) => {
-        console.log(res);
       }
     })
   },
@@ -123,19 +130,25 @@ Page({
       orderByColumn:"A.ID_",
       isAsc:"desc",
       systemType:4,
-      method:"GET"
+      method:"GET",
+      taskName:'相关人员审批'
     }
     UTIL.httpRequest(API.URL_GET_TASKDONELIST,data, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
           this.setData({doneNum:res.total})
-          this.setData({doneList:res.rows})
+          if(res.rows!=null&&res.rows!=""){
+            for(var index in res.rows){
+              let d = this.dictTranslate(this.data.transferType,res.rows[index].formData.transferType)
+              res.rows[index].formData.transferType =  d
+          } 
+            this.setData({doneList:res.rows})
+          }
         }
       },	fail: (res) => {
         console.log(res);
       },
       complete: (res) => {
-        console.log(res);
       }
     })
   },
@@ -146,21 +159,43 @@ Page({
       transferType:"1",
       status:"5",
       method:"GET",
-      capitalExpenditureType:(this.data.index+1)
+      applyUserName:this.data.userInfoObj.nickName
     }
     UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
       success: (res) => {
+        console.log(res);
         if (res.code == API.SUCCESS_CODE) {
-          console.log(res);
           let a = this.data.yfqNum+res.total
           this.setData({yfqNum:a})
-          this.setData({yfqList:res.rows})
+          let b = this.data.yfqList
+          this.setData({yfqList:res.rows.concat(b)})
         }
       },	fail: (res) => {
-        console.log(res);
       },
       complete: (res) => {
+      }
+    })
+  },
+  getTransferList1:function(e){
+    let data = {
+      // pageNum:1,
+      // pageSize:10,
+      transferType:"1",
+      auditStatus:"3",
+      method:"GET"
+    }
+    UTIL.httpRequest(API.URL_GET_TRANSFERLIST,data, {
+      success: (res) => {
         console.log(res);
+        if (res.code == API.SUCCESS_CODE) {
+          let a = this.data.yfqNum+res.total
+          this.setData({yfqNum:a})
+          let b = this.data.yfqList
+          this.setData({yfqList:res.rows.concat(b)})
+        }
+      },	fail: (res) => {
+      },
+      complete: (res) => {
       }
     })
   },
@@ -223,6 +258,16 @@ Page({
       url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
     })
   },
+  gosee:function(e){
+    wx.navigateTo({
+      url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
+    })
+  },
+  goUpdate(e){
+    wx.navigateTo({
+      url: '/pages/apply/paymentTemplate/add/add?id='+e.currentTarget.dataset.id,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/handle/liist.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-empty": "@vant/weapp/empty/index"
+  }
 }

pages/handle/liist.wxml

@@ -32,63 +32,67 @@
     </view> -->
 </view>
 <scroll-view scroll-y="true" wx-if="{{active==1}}" style="height: {{wrokScrollHeight}}px;"> 
-    <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="index">
+    <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="index" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="up" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
-                    <view class="name">{{item.formData.payer}}</view>
+                    <view class="name">{{item.formData.approvalItems}}</view>
                     <!-- <view class="state">待审</view> -->
-                    <view class="time">{{item.formData.applyDate}}</view>
+                    <view class="time">{{item.formData.applyTime}}</view>
                 </view>
                 <view class="process_pay">
                     <view class="describe">
                         <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.formData.remark}}</text>
+                        <text class="textLimit">{{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}</text>
                     </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
+                    <view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
                 </view>
             </view> 
+            <van-empty wx:if="{{todoNum == 0}}" description="暂无待办数据" />
         </view>
-        
 </scroll-view>
 <scroll-view scroll-y="true" wx-if="{{active==2}}" style="height: {{wrokScrollHeight}}px;"> 
-    <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="index">
+    <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="index" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
-                    <view class="name">{{item.formData.payer}}</view>
+                    <view class="name">{{item.formData.approvalItems}}</view>
                     <!-- <view class="state">已审</view> -->
-                    <view class="time">{{item.formData.applyDate}}</view>
+                    <view class="time">{{item.formData.applyTime}}</view>
                 </view>
                 <view class="process_pay">
                     <view class="describe">
                         <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.formData.remark}}</text>
+                        <text class="textLimit">{{item.formData.activityBusinessType=='35'?'现金转账':'银行转账'}}</text>
                     </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.formData.expenditureAmount}}</view>
+                    <view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
                 </view>
             </view> 
+            <van-empty wx:if="{{doneNum == 0}}" description="暂无已办数据" />
         </view>
 </scroll-view>
 <scroll-view scroll-y="true" wx-if="{{active==3}}" style="height: {{wrokScrollHeight}}px;"> 
-    <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="index">
+    <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="index" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="{{item.status == '1'?'gosee':item.status == '2'?'goUpdate':item.status == '3'?'gosee':''}}">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
-                    <view class="name">{{item.payer}}</view>
-                    <!-- <view class="state">已发起</view> -->
-                    <view class="time">{{item.applyDate}}</view>
+                  <view class="name">
+                    <view class="name_tit">{{item.submitter}}</view>
+                    <view class="{{item.status == '1'?'in':item.status == '2'?'disagree':item.status == '3'?'agree':''}}">{{item.status == '1'?'审核中':item.status == '2'?'已拒绝':item.status == '3'?'已通过':''}}</view>
+                  </view>
+                  <!-- <view class="state">已发起</view> -->
+                  <view class="time">{{item.submitDate}}</view>
                 </view>
                 <view class="process_pay">
                     <view class="describe">
                         <image  class="amount_icon"  src="../../image/index/process_icon.png" mode="aspectFit"></image>
-                        <text class="textLimit">{{item.remark}}</text>
+                        <text class="textLimit">{{item.approvalItems}}</text>
                     </view>
-                    <view class="amount"><text class="unit">￥</text>{{item.expenditureAmount}}</view>
+                    <view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
                 </view>
             </view> 
+            <van-empty wx:if="{{yfqNum == 0}}" description="暂无已发起数据" />
         </view>
-        
 </scroll-view>
 <scroll-view scroll-y="true" wx-if="{{active==4}}" style="height: {{wrokScrollHeight}}px;"> 
     <view class="workflow"  wx:if="{{active=='4'}}" wx:for-item="item" wx:for="{{yzdList}}" wx:key="id" data-id="{{item.id}}" bindtap="godetail">
@@ -106,6 +110,7 @@
                     </view>
                     <view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
                 </view>
-            </view> 
+            </view>
+            <van-empty wx:if="{{yzdNum == 0}}" description="暂无已制单数据" />
         </view>
 </scroll-view>

pages/handle/liist.wxss

@@ -59,13 +59,46 @@
 }
 
 .workflow .process_intro .name{
-  width: 324rpx;
+  width: 390rpx;
   font-size: 34rpx;
   margin-right: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.workflow .process_intro .name .name_tit{
+  width: 290rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.agree{
+  background-color: rgba(92, 174, 119, 0.1);
+  color:#5CAE77 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+.in{
+  background-color: rgba(245, 163, 39, 0.1);
+  color:#F5A327 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
+.disagree{
+  background-color: rgba(233, 0, 0, 0.1);
+  color:#E90000 ;
+  text-align: center;
+  float: right;
+  padding: 2px 5px;
+  border-radius: 5px;
+  font-size: 12px;
+}
 .workflow .process_intro .state{
   width: 93rpx;
   height: 42rpx;

pages/index/index.js

@@ -59,7 +59,6 @@ Page({
         this.getTaskList();
         //查询已办
         this.getTaskDoneList();
-        
         //查询dept
         this.getTreeDept();
     },
@@ -295,8 +294,11 @@ Page({
         success: (res) => {
           if (res.code == API.SUCCESS_CODE) {
             this.setData({provinces:res.data})
-            this.setData({citys:res.data[0].children})
-            this.setData({areas:res.data[0].children[this.data.value[1]].children})
+            if(res.data[0].children){
+              this.setData({citys:res.data[0].children})
+              if(res.data[0].children[this.data.value[1]].children){this.setData({areas:res.data[0].children[this.data.value[1]].children})}
+            }
+            
           }
         }
       })
@@ -473,7 +475,7 @@ Page({
     },
     gosee:function(e){
       wx.navigateTo({
-        url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid,
+        url: '/pages/handle/expenditureAudit/expenditureAudit?id='+e.currentTarget.dataset.id+'&taskId='+e.currentTarget.dataset.taskid+'&type='+e.currentTarget.dataset.type,
       })
     },
     goUpdate(e){

pages/index/index.json

@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "icon-loading":"/component/iconLoading/iconLoading",
-    "pop-up": "/component/pop-up/index"
+    "pop-up": "/component/pop-up/index",
+    "van-empty": "@vant/weapp/empty/index"
   },
   "navigationStyle": "custom"
 }

pages/index/index.wxml

@@ -100,7 +100,7 @@
     </view>
 
     <scroll-view scroll-y="true" style="height: {{wrokScrollHeight}}px;" > 
-        <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" bindtap="gosee">
+        <view class="workflow" wx:if="{{active=='1'}}" wx:for-item="item" wx:for="{{todoList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="up" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
@@ -117,7 +117,7 @@
                 </view>
             </view> 
         </view>
-        <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id">
+        <view class="workflow" wx:if="{{active=='2'}}" wx:for-item="item" wx:for="{{doneList}}" wx:key="id" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
             <!--1-->
             <view class="workflow_list">
                 <view class="process_intro">
@@ -134,9 +134,9 @@
                 </view>
             </view> 
         </view>
-        <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id">
+        <view class="workflow"  wx:if="{{active=='3'}}" wx:for-item="item" wx:for="{{yfqList}}" wx:key="id" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="{{item.status == '1'?'gosee':item.status == '2'?'goUpdate':item.status == '3'?'gosee':''}}">
             <!--1-->
-            <view class="workflow_list" data-id="{{item.id}}" bindtap="{{tem.status == '1'?'in':item.status == '2'?'goUpdate':item.status == '3'?'agree':''}}">
+            <view class="workflow_list">
                 <view class="process_intro">
                     <view class="name">
                       <view class="name_tit">{{item.submitter}}</view>
@@ -171,6 +171,14 @@
                 </view>
             </view> 
         </view>
+
+        <van-empty wx:if="{{todoNum == '0' && active=='1'}}" description="暂无待办数据" />
+
+        <van-empty wx:if="{{doneNum == 0 && active=='2'}}" description="暂无已办数据" />
+
+        <van-empty wx:if="{{yfqNum == 0 && active=='3'}}" description="暂无已发起数据" />
+
+        <van-empty wx:if="{{yzdNum == 0 && active=='4'}}" description="暂无已制单数据" />
     </scroll-view>
     <pop-up visible="{{visible}}" onClose="closePopUp">
         <view slot="content">

project.private.config.json

@@ -79,5 +79,5 @@
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "WXMB",
-  "libVersion": "2.23.3"
+  "libVersion": "2.23.4"
 }

utils/API.js

@@ -131,6 +131,11 @@ const URL_GET_GETPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getProcessSchedu
 //审批流办理
 const URL_GET_PROCESSCOMPLETE = `${URL_PREFIX}/activiti/process/mobileComplete`;
 
+//复核
+const URL_GET_TOREVIEWSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/toReviewSubmit/`;
+
+
+
 /****************接口地址end****************/
 
 export {
@@ -187,5 +192,6 @@ export {
     URL_GET_APPROVALITEMS,
     URL_GET_REMOVEAPPROVAL,
     URL_GET_GETPROCESS,
-    URL_GET_PROCESSCOMPLETE
+    URL_GET_PROCESSCOMPLETE,
+    URL_GET_TOREVIEWSUBMIT
 }