From 3043393215fa5ef1e9c44545c92e02d6f0ea88cd Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Sat, 16 Apr 2022 15:37:22 +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

---
 app.wxss                                      |   6 +
 env/env.js                                    |  16 +-
 pages/apply/index.wxml                        |   3 +-
 pages/apply/index.wxss                        |   8 +-
 pages/apply/paymentTemplate/add/add.js        |   3 +
 pages/apply/paymentTemplate/add/add.wxml      |   1 +
 .../apply/paymentTemplate/paymentTemplate.js  |  34 ++-
 .../paymentTemplate/paymentTemplate.wxml      |   4 +-
 pages/apply/paymentTemplate/see/see.js        | 231 +++++++++++++++---
 .../expenditureAudit/expenditureAudit.js      |  21 +-
 pages/handle/liist.wxml                       |   8 +-
 utils/API.js                                  |   6 +-
 12 files changed, 276 insertions(+), 65 deletions(-)

diff --git a/app.wxss b/app.wxss
index a0134d4..9b9f609 100644
--- a/app.wxss
+++ b/app.wxss
@@ -89,4 +89,10 @@ contact-button {
   z-index: -1;
   border-radius: 0 0 50% 50%;
   background: linear-gradient(to right, #2C8E68, #B3DB62);
+}
+
+/* iphoneX底部占位 */
+.ipXbtn{
+  width: 100%;
+  height: 50px;
 }
\ No newline at end of file
diff --git a/env/env.js b/env/env.js
index 45a8b43..67cd1c7 100644
--- a/env/env.js
+++ b/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',
     }
   }
\ No newline at end of file
diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml
index c8686cf..0e17b86 100644
--- a/pages/apply/index.wxml
+++ b/pages/apply/index.wxml
@@ -32,7 +32,6 @@
     <van-tab title="公务卡">
     
       <view class="bank_box">
-        <image src="../../image/apply/jsyh_bg2.png" style="width: 100%;position: absolute;bottom:0;z-index: 9;"  mode="widthFix"></image>
         <view class="bank_content gwk">
           <image src="../../image/apply/gwk_icon.png" style="width: 28%;"  mode="widthFix"></image>
           <view style="margin-bottom: 2vh;">6217 0021 9000 7972 186<text>卡号</text></view> 
@@ -50,7 +49,7 @@
   <view class="btn1" bindtap="openBox">支付模板</view>
   <view class="btn2" bindtap="swichPaymentApply">下一步</view>
 </view>
-
+<view class="ipXbtn"></view>
 <van-action-sheet show="{{show}}" title="支付模板" bind:close="closeBox">
   <van-swipe-cell right-width="{{ 65 }}" wx:for="{{approvalItemsOptions}}" wx:key="index">
     <van-cell-group>
diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss
index 23eb025..cf05cd5 100644
--- a/pages/apply/index.wxss
+++ b/pages/apply/index.wxss
@@ -57,6 +57,10 @@
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center;
   background-size: 100% 100%;
 }
+.gwk{
+  background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center;
+  background-size: 100% 100%;
+}
 
 .bankName{
   margin-top: 0!important;
@@ -96,9 +100,7 @@
   color: #FFF;
   z-index: 10;
 }
-.gwk{
-  background:linear-gradient(to right, #5CAE77, #B3DB62);
-}
+
 .holder{
   padding: 15px 25px ;
   background-color: rgba(255,255,255,0.9);
diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index cb1c535..1244d63 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -400,6 +400,9 @@ Page({
           form : array,
           isUpdate : true 
         })
+        if(options.add == "add"){
+          that.addList();
+        }
       },1000)
       
     }
diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml
index feafafe..87f4085 100644
--- a/pages/apply/paymentTemplate/add/add.wxml
+++ b/pages/apply/paymentTemplate/add/add.wxml
@@ -304,6 +304,7 @@
     <view class="btn3" data-type="0" bindtap="goKeep">保存</view>
   </view>
 </block>
+<view class="ipXbtn"></view>
 <!-- <view class="bottom">
   <button type="warn" plain class="btnDis">驳回</button>
   <button type="primary" class="btnAgree">同意</button>
diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js
index 711b817..732eefa 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.js
+++ b/pages/apply/paymentTemplate/paymentTemplate.js
@@ -86,9 +86,30 @@ 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 == 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
+                  })
+                }
+              }
+            })
+            
           }
         }
       }
@@ -104,14 +125,15 @@ Page({
     })
   },
   goSee(){
+    let array = JSON.stringify(this.data.form)
     wx.navigateTo({
-      url: 'see/see',
+      url: 'see/see?array='+array+"&index="+e.currentTarget.dataset.index,
     })
   },
-  goUpdate(){
+  goUpdate(e){
     let array = JSON.stringify(this.data.form)
     wx.navigateTo({
-      url: 'add/add?type=update&array='+array,
+      url: 'add/add?type=update&array='+array+'&add='+e.currentTarget.dataset.add,
     })
   },
   /**
diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml
index 027db0d..ce36edb 100644
--- a/pages/apply/paymentTemplate/paymentTemplate.wxml
+++ b/pages/apply/paymentTemplate/paymentTemplate.wxml
@@ -32,7 +32,7 @@
       <view slot="icon" style="width: 15%;"><image src="/image/apply/icon_shou.png" style="width: 20px;height: 20px;"></image></view>
     </van-cell>
     <view class="btnBox">
-      <image src="/image/apply/down.png" class="down" bindtap="goSee"></image>
+      <image src="/image/apply/down.png" data-index="{{index}}" class="down" bindtap="goSee"></image>
       <image src="/image/apply/icon_update.png" class="update" bindtap="goUpdate"></image>
       <image src="/image/apply/icon_delete.png" class="delete" data-index="{{index}}" bindtap="goDelete"></image>
     </view>
@@ -46,7 +46,7 @@
     <image src="/image/apply/icon_pres.png"></image>
     <text>保存模板</text>  
   </view>
-  <view bindtap="goUpdate">
+  <view data-add="add" bindtap="goUpdate">
     <image src="/image/apply/icon_add.png"></image>
     <text>新增事项</text>  
   </view>
diff --git a/pages/apply/paymentTemplate/see/see.js b/pages/apply/paymentTemplate/see/see.js
index 0581c96..5444a8e 100644
--- a/pages/apply/paymentTemplate/see/see.js
+++ b/pages/apply/paymentTemplate/see/see.js
@@ -1,4 +1,11 @@
 // pages/apply/paymentTemplate/see/see.js
+import * as UTIL from '../../../../utils/util.js';
+import * as API from '../../../../utils/API.js';
+let EVN_CONFIG = require('../../../../env/env');
+const DISTRIBUTE_ENVIROMENT = 'IMGURL';
+let {
+    URL_PREFIX,
+} = EVN_CONFIG[DISTRIBUTE_ENVIROMENT];
 const app = getApp();
 Page({
 
@@ -7,50 +14,204 @@ Page({
    */
   data: {
     isIPX: app.globalData.isIPX,
-    radio:'1',
-    steps: [
-      {
-        assigneeName: '同意',
-        activityName: '测试测试',
-        durationInMillis: '描述信息',
-        endTime: '2022-01-02',
-        comment: '同意',
-        type: '1'
-      },
-      {
-        assigneeName: '申请中',
-        activityName: '测试测试',
-        durationInMillis: '描述信息',
-        endTime: '2022-01-02',
-        comment: '同意',
-        type: '2'
-      },
-      {
-        assigneeName: '驳回',
-        activityName: '测试测试',
-        durationInMillis: '描述信息',
-        endTime: '2022-01-02',
-        comment: '同意',
-        type: '3'
-      },
-      {
-        assigneeName: '步骤四',
-        activityName: '测试测试',
-        durationInMillis: '描述信息',
-        endTime: '2022-01-02',
-        comment: '同意'
-      },
-    ],
-    active:0
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    let array = JSON.parse(options.array);
+    //所属银行
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {
+      success: (res) => {
+        this.setData({
+          bankTypeOptions:res.data
+        });
+      }
+    })
+    // 资金支出类别字典查询
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'capital_expenditure_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          capitalExpenditureTypeOptions:res.data,
+        })
+      }
+    })
+    // 付款方式类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          transferTypeOptions:res.data,
+        })
+      }
+    })
+    // 项目工程列表 
+    UTIL.httpRequest(API.URL_GET_GETPROJECTLIST , {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          projectOptions:res.rows,
+        })
+      }
+    })
+    // 工程款类型字典查询 
+    UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'project_fund_type', {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          projectFundTypeOptions:res.data,
+        })
+      }
+    })
+    // 获取合同信息列表
+    UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, {
+      success: (res) => {
+        that.setData({
+          contractionOptions:res.rows,
+        })
+      }
+    })
+    array.transfers.forEach( (item,index) => {
+      item.capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
+      item.transferTypeText = UTIL.getTransform(item.transferType,that.data.transferTypeOptions);
 
+      item.bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
+
+      item.payeeList.forEach( (response,i) => {
+        item.payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions);
+      })
+      //收据附件
+      UTIL.httpRequest(
+        API.URL_GET_FINDLIST, 
+        {
+          method:'GET',
+          tableName:'t_yinnong_transfer',
+          tableId:item.id,
+          fileType:1
+        }, 
+        {
+        success: (res) => {
+          
+          let list = [];
+          
+          res.data.forEach((item2,index2)=>{
+            
+            wx.downloadFile({
+              url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+              success (response) {
+                if (response.statusCode === 200) {
+                  let fileForm = item.fileForm?item.fileForm:[];
+                  fileForm.push({
+                    file: response.tempFilePath,
+                    fileType:'1',
+                    bizPath:'transfer',
+                    tableName:'t_yinnong_transfer',
+                    tableId:''
+                  })
+                  console.log("--------------fileForm2 start----------------");
+                  console.log(fileForm);
+                  console.log("--------------fileForm2 end----------------");
+                  list.push({
+                    tempFilePath:response.tempFilePath
+                  })
+                  that.setData({
+                    ["form.transfers["+index+"].SJimage"]:list,
+                    ["form.transfers["+index+"].fileForm"]:fileForm
+                  });
+                }
+              }
+            })
+          })
+          
+        }
+      })
+      //发票
+      UTIL.httpRequest(
+        API.URL_GET_FINDLIST, 
+        {
+          method:'GET',
+          tableName:'t_yinnong_transfer',
+          tableId:item.id,
+          fileType:2
+        }, 
+        {
+        success: (res) => {
+          let list = [];
+          res.data.forEach((item2,index2)=>{
+            wx.downloadFile({
+              url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+              success (response) {
+                if (response.statusCode === 200) {
+                  let fileForm = item.fileForm?item.fileForm:[];
+                  fileForm.push({
+                    file: response.tempFilePath,
+                    fileType:'2',
+                    bizPath:'transfer',
+                    tableName:'t_yinnong_transfer',
+                    tableId:item.id
+                  })
+                  list.push({
+                    tempFilePath:response.tempFilePath
+                  })
+                  that.setData({
+                    ["form.transfers["+index+"].FPimage"]:list,
+                    ["form.transfers["+index+"].fileForm"]:fileForm
+                  });
+                }
+              }
+            })
+          })
+        }
+      })
+      //其他
+      UTIL.httpRequest(
+        API.URL_GET_FINDLIST, 
+        {
+          method:'GET',
+          tableName:'t_yinnong_transfer',
+          tableId:item.id,
+          fileType:3
+        }, 
+        {
+        success: (res) => {
+          let list = [];
+          let fileForm = item.fileForm?item.fileForm:[];
+          res.data.forEach((item2,index2)=>{
+            wx.downloadFile({
+              url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+              success (response) {
+                if (response.statusCode === 200) {
+                  let fileForm = item.fileForm?item.fileForm:[];
+                  fileForm.push({
+                    file: response.tempFilePath,
+                    fileType:'3',
+                    bizPath:'transfer',
+                    tableName:'t_yinnong_transfer',
+                    tableId:item.id
+                  })
+                  list.push({
+                    tempFilePath:response.tempFilePath
+                  })
+                  that.setData({
+                    ["form.transfers["+index+"].QTimage"]:list,
+                    ["form.transfers["+index+"].fileForm"]:fileForm
+                  });
+                }
+              }
+            })
+          })
+        }
+      })
+    })
+    that.setData({
+      form : array,
+      isUpdate : true 
+    })
   },
 
+  back:function(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js
index cde34cb..d5320c2 100644
--- a/pages/handle/expenditureAudit/expenditureAudit.js
+++ b/pages/handle/expenditureAudit/expenditureAudit.js
@@ -235,14 +235,27 @@ Page({
         }
       }
     })
+
+
+
     // 查询审批事项流转进度
     UTIL.httpRequest(API.URL_GET_GETPROCESS+options.id , {method:'GET'}, {
       success: (res) => {
         console.log(res);
-        that.setData({
-          spsxOptions:res.data.processSchedule.spsx,
-          instanceId:res.data.instanceId
-        })
+        if(res.data.processSchedule != null){
+          that.setData({spsxOptions:res.data.processSchedule.spsx})
+        }
+        that.setData({instanceId:res.data.instanceId})
+      }
+    })
+    // 查询现金审批事项流转进度
+    UTIL.httpRequest(API.URL_GET_REVIEWPROCESS+options.id , {method:'GET'}, {
+      success: (res) => {
+        console.log(res);
+        if(res.data.processSchedule.spsx){
+          that.setData({spsxOptions:res.data.processSchedule.spsx})
+        }
+        that.setData({instanceId:res.data.instanceId})
       }
     })
   },
diff --git a/pages/handle/liist.wxml b/pages/handle/liist.wxml
index ff7c16d..49e818c 100644
--- a/pages/handle/liist.wxml
+++ b/pages/handle/liist.wxml
@@ -48,8 +48,8 @@
                     <view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
                 </view>
             </view> 
-            <van-empty wx:if="{{todoNum == 0}}" description="暂无待办数据" />
         </view>
+            <van-empty wx:if="{{todoNum == 0}}" description="暂无待办数据" />
 </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" data-id="{{item.formData.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="gosee">
@@ -68,8 +68,8 @@
                     <view class="amount"><text class="unit">￥</text>{{item.formData.totalAmount}}</view>
                 </view>
             </view> 
-            <van-empty wx:if="{{doneNum == 0}}" description="暂无已办数据" />
         </view>
+            <van-empty wx:if="{{doneNum == 0}}" description="暂无已办数据" />
 </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" data-id="{{item.id}}" data-taskId="{{item.taskId}}" data-type="see" bindtap="{{item.status == '1'?'gosee':item.status == '2'?'goUpdate':item.status == '3'?'gosee':''}}">
@@ -91,8 +91,8 @@
                     <view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
                 </view>
             </view> 
-            <van-empty wx:if="{{yfqNum == 0}}" description="暂无已发起数据" />
         </view>
+            <van-empty wx:if="{{yfqNum == 0}}" description="暂无已发起数据" />
 </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">
@@ -111,6 +111,6 @@
                     <view class="amount"><text class="unit">￥</text>{{item.totalAmount}}</view>
                 </view>
             </view>
-            <van-empty wx:if="{{yzdNum == 0}}" description="暂无已制单数据" />
         </view>
+            <van-empty wx:if="{{yzdNum == 0}}" description="暂无已制单数据" />
 </scroll-view>
diff --git a/utils/API.js b/utils/API.js
index 31ca06a..3cc75a0 100644
--- a/utils/API.js
+++ b/utils/API.js
@@ -134,6 +134,9 @@ const URL_GET_PROCESSCOMPLETE = `${URL_PREFIX}/activiti/process/mobileComplete`;
 //复核
 const URL_GET_TOREVIEWSUBMIT = `${URL_PREFIX}/yinnong/approvalItems/toReviewSubmit/`;
 
+//复核
+const URL_GET_REVIEWPROCESS = `${URL_PREFIX}/yinnong/approvalItems/getToReviewProcessSchedule/`;
+
 
 
 /****************接口地址end****************/
@@ -193,5 +196,6 @@ export {
     URL_GET_REMOVEAPPROVAL,
     URL_GET_GETPROCESS,
     URL_GET_PROCESSCOMPLETE,
-    URL_GET_TOREVIEWSUBMIT
+    URL_GET_TOREVIEWSUBMIT,
+    URL_GET_REVIEWPROCESS
 }
\ No newline at end of file