支付申请

pages/apply/paymentTemplate/add/add.js

@@ -674,6 +674,7 @@ Page({
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
           for (let j = 0; j < res.data.transfers.length; j++) {
+            if(that.data.form.transfers[j].fileForm == undefined){continue;}
             for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
               that.data.form.transfers[j].fileForm[i].tableId = res.data.transfers[j].id
               const element = that.data.form.transfers[j].fileForm[i];
@@ -689,11 +690,7 @@ Page({
                 formData:element,
                 success (response){
                   console.log(res);
-                  if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
-                    wx.navigateTo({
-                      url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
-                    })
-                  }
+                  
                 },
                 fail(res){
                   console.log(res)
@@ -701,6 +698,16 @@ Page({
               })
             }
           }
+
+          if(e.currentTarget.dataset.type == 0){
+            wx.navigateTo({
+              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();
+          }
         }
       }
     })

pages/apply/paymentTemplate/paymentTemplate.js

@@ -54,7 +54,9 @@ Page({
     UTIL.httpRequest(API.URL_GET_SAVE, that.data.form, {
       success: (res) => {
         if (res.code == API.SUCCESS_CODE) {
+          console.log(that.data.form);
           for (let j = 0; j < res.data.transfers.length; j++) {
+            if(that.data.form.transfers[j].fileForm == undefined){continue;}
             for (let i = 0; i < that.data.form.transfers[j].fileForm.length; i++) {
               that.data.form.transfers[j].fileForm[i].tableId =  res.data.transfers[j].id
               const element = that.data.form.transfers[j].fileForm[i];
@@ -70,23 +72,24 @@ Page({
                 formData:element,
                 success (response){
                   console.log(res);
-                  if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type == 0){
-                    wx.navigateTo({
-                      url: '/pages/apply/approval/approval?id='+res.data.approvalItemTemplate.id,
-                    })
-                  }
-                  if((j+1) == that.data.form.transfers.length && (i+1) == that.data.form.transfers[j].fileForm.length && e.currentTarget.dataset.type != 0){
-                    UTIL.showToastNoneIcon('操作成功！');
-                    that.back();
-                  }
+                  
                 },
                 fail(res){
                   console.log(res)
                 }
               })
             }
-           }
-          
+          }
+
+          if(e.currentTarget.dataset.type == 0){
+            wx.navigateTo({
+              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();
+          }
         }
       }
     })

pages/index/index.wxss

@@ -208,7 +208,7 @@
   position: absolute;
   line-height: 30rpx;
   padding:0 10rpx;
-  border-radius: 50%;
+  border-radius: 50px;
   top: -10rpx;
   right: -10rpx;
 }