From 9cf6df36cc59de22a36dbff5df70b32d0a26565f Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Tue, 31 May 2022 14:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 image/apply/icon_end.png           | Bin 0 -> 794 bytes
 pages/Bookkeeping/Bookkeeping.js   |  18 +++++++++++------
 pages/apply/approval/approval.js   |  31 ++++++++++++++++++-----------
 pages/apply/approval/approval.wxml |   2 +-
 4 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 image/apply/icon_end.png

diff --git a/image/apply/icon_end.png b/image/apply/icon_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9c2d6669d53072f77dfc53197d62025d8b23542
GIT binary patch
literal 794
zcmV+#1LgdQP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00004b3#c}2nYxW
zd<bNS0008fNkl<ZNK2hoQBoQ~5Pb^)D<&1zM6LV@CkUJXI6=q>)DwUw2suIE1bPGT
z1i%Tz6M%n7Oax77B1XvT34^o43~Z&VC>FM7Ucc8p-4kGqjezVu@Sbj!00{Y=pD*dp
zfH9xj8^GxnFkH12*ShTzC_Mrn=}=l1jJzjkHwk>&;kV1*3G@YM@I^HafbGL|ja}f#
z@&D6blqsZ4t+*_Ffe1Uw`GInZw8|okz5;#z_s+M$vwR*wCZk@@uCMW@FYay=u(v>Y
z3CJf`5Qf;SR<T*DL7q*U4u|-4a)P^N6SMIm_=O9>ngpvY7)j!%K*x?v7;JSqD*C%d
z1HapC$mU}5ZlhAc^MeD$a#Sum8B($WbJkbVkxiEmMH5Ja+@GG}C)v0n7XL&xi#KOy
zitSaQumq+h4CI_lfPo1ji?#;?2*?d1_L=wz<76&}Nw<r1v54<{wu4FoxqxhHWb@hF
z>_xq<B>6#kd`wJ`QK^JSO1jODNPNrnrjgZ=04>S3!^DcSEOMC*qN`5@xWBJhSwOwO
zE@{clYicgeI`OuwS}tK?mbhN)$W>o}$n42dTr3-X3znOPkBPZ{cQ#WM_`sY+0*nh3
z2Sher1r+H9F8Xmnv>FcS&Yi`et4E3<E{L#^Vvr7UX>}0hrspqjR?ii+4qGjCPVB_n
z)u_*&v?FJEdk?I%8YUJjigh3YnqhlNv0`0kPaRls^0pvW&V&_sb9lJ&;J!LOMw;wh
z0f}sEtR)4ss;P#IRG8f|Uk|<B;@n8lq}Xy^GB46}$84~!u@Pyib5_o&s>TEpEG;Rq
zw--sx^y1>*m|zgG#)Mw&lF-~)I(3pCG3jlt&Y}IaWcqjH_|Hdq+a4Kqg{}K7AROft
z?<hBz{rBa>oT`x)<cn^8-KxiBCoB>iIWkRMdwTD6+IfC~tnjzKK<dlOxp9GPue(70
Y1q11FiP^;jxc~qF07*qoM6N<$g0IMI{{R30

literal 0
HcmV?d00001

diff --git a/pages/Bookkeeping/Bookkeeping.js b/pages/Bookkeeping/Bookkeeping.js
index cf3a939..718f8d4 100644
--- a/pages/Bookkeeping/Bookkeeping.js
+++ b/pages/Bookkeeping/Bookkeeping.js
@@ -15,7 +15,8 @@ Page({
     flowList:[],
     showProjectFundType:false,
     checkedStatusText:'未提交',
-    checkedStatus:'1'
+    checkedStatus:'1',
+    incomeExpensesType:'1'
   },
 
   /**
@@ -54,8 +55,8 @@ Page({
       pageNum:'1',
       pageSize:'999',
       accountType:'',
-      checkedStatus:'1',
-      incomeExpensesType:'1',
+      checkedStatus:that.data.checkedStatus,
+      incomeExpensesType:that.data.incomeExpensesType,
     }
     UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data ,{
       success: (res) => {
@@ -81,8 +82,8 @@ Page({
       pageNum:'1',
       pageSize:'999',
       accountType:'',
-      checkedStatus:'1',
-      incomeExpensesType:'2',
+      checkedStatus:that.data.checkedStatus,
+      incomeExpensesType:that.data.incomeExpensesType,
     }
     UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data2 ,{
       success: (res) => {
@@ -109,7 +110,12 @@ Page({
   },
   switchTab(e){
     var that = this;
-    this.setData({showGroup:e.currentTarget.dataset.gid,result:[],result2:[]})
+    this.setData({
+      showGroup:e.currentTarget.dataset.gid,
+      result:[],
+      result2:[],
+      incomeExpensesType:e.currentTarget.dataset.gid == true?'1':'2',
+    })
     if(e.currentTarget.dataset.gid){
       //收入事项
       let data = {
diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
index a2e8017..6d61ba4 100644
--- a/pages/apply/approval/approval.js
+++ b/pages/apply/approval/approval.js
@@ -41,22 +41,22 @@ Page({
     if(options.type == 'template'){
       let list = [];
       let array =  JSON.parse(options.applyOptions).approvalTemplateDetailList;
-      console.log(JSON.parse(options.applyOptions));
+      let indexList ;
       UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, {
         success: (res2) => {
           JSON.parse(options.applyOptions).approvalTemplateDetailList.map((rr,index )=> {
-            console.log(rr);
-            console.log(JSON.parse(options.applyOptions).approvalTemplateDetailList);
-            console.log(rr.nickName == res2.user.nickName);
-            console.log(index);
             if(rr.nickName == res2.user.nickName){
-              array.splice(index,1);
+              indexList = index ;
             }else{
               list.push(rr.userId+"")
             }
           })
+
+          array.splice(indexList,1)
+
+          console.log(array);
           array.map((rrr,index)=>{
-            array.name = index+1
+            rrr.name = index+1
           })
           this.setData({
             templateDetailList:array,
@@ -242,15 +242,22 @@ Page({
             success: (res) => {
               if (res.code == API.SUCCESS_CODE) {
                 let list = [];
-                res.data.map((rr,index) => {
-                  if(rr.nickName == res2.user.nickName){
-                    res.data.splice(index,1);
+                console.log(res);
+                let index ;
+                for (let i = 0; i < res.data.length; i++) {
+                  const element = res.data[i];
+                  if(element.nickName == res2.user.nickName){
+                    // res.data.splice(i,1);
+                    index = i ;
+                  }else{
+                    list.push(element.userId+"")
                   }
-                  list.push(rr.userId+"")
-                })
+                }
+                res.data.splice(index,1)
                 res.data.map((rrr,index)=>{
                   rrr.name = index+1
                 })
+                console.log(list);
                 this.setData({templateDetailList:res.data,result:list});
                 this.closeBox();
               }
diff --git a/pages/apply/approval/approval.wxml b/pages/apply/approval/approval.wxml
index ae16814..6508791 100644
--- a/pages/apply/approval/approval.wxml
+++ b/pages/apply/approval/approval.wxml
@@ -101,7 +101,7 @@
         <van-icon slot="icon" name="https://636c-cloud1-8gya17a31667774d-1310628902.tcb.qcloud.la/icon_mb.png?sign=2a8bbe2cb4d4e0f28a99fddbe042d26c&t=1648620032" class="custom-icon" size="40" style="margin-right: 10px;" />
       </van-cell>
       <view slot="right" class="deleteBox" bindtap='deleteTemplate' data-index="{{index}}" data-id="{{item.id}}">
-        <image src="/image/apply/icon_delete.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
+        <image src="/image/apply/icon_end.png" style="width: 25px;height: 25px;margin: 0 auto;"></image>
       </view>
     </van-swipe-cell>
   </scroll-view>