From 4c2a2727488b0a72b8ced6d825fd968861444b94 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Sat, 16 Apr 2022 19:45:17 +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

---
 pages/apply/approval/approval.js                  |  2 +-
 pages/apply/paymentTemplate/paymentTemplate.wxml  |  2 +-
 pages/apply/paymentTemplate/paymentTemplate.wxss  | 11 ++++-------
 pages/handle/expenditureAudit/expenditureAudit.js |  3 ++-
 pages/payee/index.js                              |  1 +
 utils/API.js                                      |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
index af6d625..c3930b1 100644
--- a/pages/apply/approval/approval.js
+++ b/pages/apply/approval/approval.js
@@ -477,7 +477,7 @@ Page({
               icon:"success"
             })
             setTimeout(function(){
-              wx.switchTab({
+              wx.reLaunch({
                 url: '/pages/index/index'
               })
             },2000)
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml
index 6aac790..df8182c 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxml
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxml
@@ -21,7 +21,7 @@
       <text class="title">事项{{item.num}}</text>
       <view class="top-box">
         <text>支出金额</text>
-        <view class="money_box">￥<input class="input_money" readonly placeholder="金额" placeholder-style="color:#E90000;" value="{{item.expenditureAmount}}"/></view>
+        <view class="money_box">￥<input class="input_money" disabled placeholder="金额" placeholder-style="color:#E90000;" value="{{item.expenditureAmount}}"/></view>
         <van-cell-group border="{{ false }}">
           <van-cell title="{{item.remark}}" border="{{ false }}" >
             <view slot="icon" style="width: 15%;">事由：</view>
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxss b/pages/apply/paymentTemplate/paymentTemplate.wxss
index 5483208..7a51f55 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxss
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxss
@@ -61,22 +61,19 @@ text{display: block;}
   box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
 }
 
-.van-collapse-item .van-cell{
-  width: 94%;
-  margin: 0 auto;
-}
-.van-collapse-item .van-cell .tit_box{
+.van-collapse-item {
   background: #ffffff;
     padding: 20px;
     /* width: 94%; */
     margin: 0 auto;
     border-radius: 10px;
     box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.16);
-}
-.van-collapse-item__content{
     width: 94%;
     margin: 0 auto;
 }
+.van-collapse-item__content{
+  padding: 0!important;
+}
 .top-box text{
   margin-bottom: 15px;
 }
diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js
index d5320c2..0b618ab 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.js
+++ b/pages/handle/expenditureAudit/expenditureAudit.js
@@ -248,8 +248,9 @@ Page({
         that.setData({instanceId:res.data.instanceId})
       }
     })
+    console.log(that.data.instanceId)
     // 查询现金审批事项流转进度
-    UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+options.id , {method:'GET'}, {
+    UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+that.data.instanceId , {method:'GET'}, {
       success: (res) => {
         console.log(res);
         if(res.data.processSchedule.spsx){
diff --git a/pages/payee/index.js b/pages/payee/index.js
index d032c0e..7741933 100644
--- a/pages/payee/index.js
+++ b/pages/payee/index.js
@@ -19,6 +19,7 @@ Page({
    */
   onLoad(options) {
     console.log(options)
+    // 可优化：数据请求放到  onload中   新增后在子页面修改父页面数据
     var that = this;
     that.setData({
       isPeers:options.isPeers,//是否同行
diff --git a/utils/API.js b/utils/API.js
index 3cc75a0..ea3243a 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -82,7 +82,7 @@ const URL_GET_TEMPLATEDETAIL = `${URL_PREFIX}/service/templateDetail/list`;
 //根据系统组织机构id查询所在乡镇
 const URL_GET_TOWNINFOBYDEPTID = `${URL_PREFIX}/system/dept/getTownInfoByDeptId/`;
 //根据条件查询用户信息
-const URL_GET_USERLIST = `${URL_PREFIX}/system/user/list`;
+const URL_GET_USERLIST = `${URL_PREFIX}/system/user/query`;
 //新增模板
 const URL_POST_MOBILEADD = `${URL_PREFIX}/service/template/mobileAdd`;
 //删除模板