Merge remote-tracking branch 'origin/master'

pages/Bookkeeping/Bookkeeping.js

@@ -56,7 +56,7 @@ Page({
       pageSize:'999',
       accountType:'',
       checkedStatus:that.data.checkedStatus,
-      incomeExpensesType:that.data.incomeExpensesType,
+      incomeExpensesType:'1',
     }
     UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data ,{
       success: (res) => {
@@ -83,7 +83,7 @@ Page({
       pageSize:'999',
       accountType:'',
       checkedStatus:that.data.checkedStatus,
-      incomeExpensesType:that.data.incomeExpensesType,
+      incomeExpensesType:'2',
     }
     UTIL.httpRequest(API.URL_GET_GETFLOWLIST,data2 ,{
       success: (res) => {
@@ -114,7 +114,6 @@ Page({
       showGroup:e.currentTarget.dataset.gid,
       result:[],
       result2:[],
-      incomeExpensesType:e.currentTarget.dataset.gid == true?'1':'2',
     })
     if(e.currentTarget.dataset.gid){
       //收入事项

pages/apply/approval/approval.js

@@ -149,6 +149,14 @@ Page({
 
   },
   confirmTem:function(e){
+    if(this.data.result.length == 0){
+      wx.showToast({
+        title: "请选择审批人",
+        duration: 2000,
+        icon:"error"
+      })
+      return;
+    }
     let data={
       approvalTemplate:{
         name:this.data.temName,

pages/apply/index.js

@@ -98,7 +98,7 @@ swichPaymentApply:function(e){
   onShow: function () {
     var that = this;
     wx.showLoading({
-      title: '正在加载账户列表',
+      title: '正在加载账户',
       mask:true
     })
     UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'bank_type', {method:'GET'}, {

pages/apply/index.wxss

@@ -42,27 +42,27 @@
 }
 .XJ{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_XJ.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .ICBC{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .ABC{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .CCB{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .RCB{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .gwk{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .addBtn{
   display: flex;

pages/apply/paymentTemplate/add/add.js

@@ -197,7 +197,7 @@ Page({
       }
     })
     // 获取合同信息列表
-    UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, {
+    UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET',contractionStatus:1}, {
       success: (res) => {
         that.setData({
           contractionOptions:res.rows,

pages/apply/paymentTemplate/add/add.wxml

@@ -613,10 +613,6 @@
   </view>
 </block>
 <view class="ipXbtn"></view>
-<!-- <view class="bottom">
-  <button type="warn" plain class="btnDis">驳回</button>
-  <button type="primary" class="btnAgree">同意</button>
-</view> -->
 <van-dialog
   use-slot
   title="支付模板"

pages/drawee/drawee.js

@@ -111,6 +111,10 @@ swichPaymentApply:function(e){
    */
   onShow: function () {
     var that = this;
+    wx.showLoading({
+      title: '正在加载账户',
+      mask:true
+    })
     var sendData = {
       pageNum:'1',
       pageSize:'100',
@@ -152,33 +156,37 @@ swichPaymentApply:function(e){
         }
       }
     })
-    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{
-      success: (res) => {
+    setTimeout(function(){
+      UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{
+        success: (res) => {
+            for (let i = 0; i < res.rows.length; i++) {
+              if(res.rows[i].bankAccountNumber==null){continue;}
+              res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
+              res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
+              res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
+            }
+            console.log(res.rows)
+            that.setData({
+              accountList:res.rows
+            })
+            wx.hideLoading();
+        }
+      })
+  
+      UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{
+        success: (res) => {
           for (let i = 0; i < res.rows.length; i++) {
             if(res.rows[i].bankAccountNumber==null){continue;}
-            res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
-            res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
-            res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
+            res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
           }
           console.log(res.rows)
           that.setData({
-            accountList:res.rows
+            accountListXJ:res.rows
           })
-      }
-    })
-
-    UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{
-      success: (res) => {
-        for (let i = 0; i < res.rows.length; i++) {
-          if(res.rows[i].bankAccountNumber==null){continue;}
-          res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
         }
-        console.log(res.rows)
-        that.setData({
-          accountListXJ:res.rows
-        })
-      }
-    })
+      })
+    },1000)
+    
   },
   delete(e){
     console.log(e);

pages/drawee/drawee.wxss

@@ -43,28 +43,28 @@
 
 .XJ{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_XJ.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 
 .ICBC{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ICBC.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .ABC{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_ABC.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .CCB{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_CCB.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .RCB{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_RCB.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 .gwk{
   background:url('https://dazu.nongshen.net/api/profile/wechat/bg_GWK.png') no-repeat center;
-  background-size: 100% 100%;
+  background-size: 105% 105%;
 }
 
 .bankName{

pages/handle/expenditureAudit/expenditureAudit.js

@@ -137,6 +137,35 @@ Page({
                   }
                 })
               }
+              if(res.data.transfers[index].capitalExpenditureType == 4){
+                let prames = {
+                  transferId:res.data.transfers[index].id,
+                }
+                // 关联合同查询
+                UTIL.httpRequest(API.URL_GET_GETSELECTINFOBYOUTID , prames, {
+                  success: (res) => {
+                    that.setData({
+                      ["form.transfers["+index+"].contractionForm"]:res.data,
+                    })
+                  }
+                })
+              }
+              if(res.data.transfers[index].transferType == '12'){
+                var transferTimer = setTimeout(function(){
+                  that.setData({
+                    ["form.transfers["+index+"].moneyOrderForm"]:{
+                      billPayUnit : res.data.transfers[index].payer,
+                      orderNum : res.data.transfers[index].payerAccount,
+                      id : res.data.transfers[index].cashierId,
+                      startTime : res.data.transfers[index].startTime,
+                      endTime : res.data.transfers[index].endTime,
+                      orderType : res.data.transfers[index].orderType,
+                      orderAmount:res.data.transfers[index].expenditureAmount
+                    },
+                    ["form.transfers["+index+"].amountReadonly"]:true
+                  })
+                },1000)
+              }
               UTIL.httpRequest(
                 API.URL_GET_FINDLIST, 
                 {

pages/handle/expenditureAudit/expenditureAudit.wxml

@@ -109,26 +109,27 @@
             </view>
           </van-field>
 
-          <van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ balance }}" placeholder="可用余额" border="{{ false }}" bind:change="onChange" input-align="right"/>
+          <van-field readonly wx:if="{{form.transfers[index].transferType == 11}}" label="可用余额(元)" value="{{ form.transfers[index].payerAccount }}" placeholder="可用余额" border="{{ false }}" data-value="form.transfers[{{index}}].payerAccount" bind:change="onChange" input-align="right"/>
           <block wx:elif="{{form.transfers[index].transferType == 12}}">
-            <van-popup show="{{showAccount}}" round position="bottom"  bind:close="closeBox" data-name="showMoneyorder">
+            <van-popup show="{{form.transfers[index].showMoneyOrder}}" round position="bottom"  bind:close="closeBox" data-name="showMoneyOrder">
               <van-picker
-                columns="{{moneyorderOptions}}"
+                columns="{{moneyOrderOptions}}"
                 show-toolbar
-                value-key="accountName"
+                value-key="billPayUnit"
                 bind:cancel="closeBox"
-                bind:confirm="onConfirmMoneyorder"
-                data-name="showMoneyorder"
+                bind:confirm="onConfirmMoneyOrder"
+                data-name="form.transfers[{{index}}].showMoneyOrder"
                 data-value="form.transfers[{{index}}]"
+                data-index="{{index}}"
               />
             </van-popup>
-            <van-field readonly label="出票方" value="{{ form.transfers[index].payerAccount }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="showMoneyorder"/>
+            <van-field readonly label="出票方" value="{{form.transfers[index].moneyOrderForm.billPayUnit }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" data-name="form.transfers[{{index}}].showMoneyOrder"/>
 
-            <van-field readonly label="汇票号码" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
-            <van-field readonly label="出票金额(元)" value="{{ form.transfers[index].bankTypeText }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
-            <van-field readonly label="汇票类型" value="{{ form.transfers[index].bankTypeText }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
-            <van-field readonly label="开票日" value="{{ form.transfers[index].bankTypeText }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
-            <van-field readonly label="到期日" value="{{ form.transfers[index].bankTypeText }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="汇票号码" value="{{ form.transfers[index].moneyOrderForm.orderNum }}" placeholder="汇票号码" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="出票金额(元)" value="{{ form.transfers[index].moneyOrderForm.orderAmount }}" placeholder="出票金额(元)" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="汇票类型" value="{{ form.transfers[index].moneyOrderForm.orderType }}" placeholder="汇票类型" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="开票日" value="{{ form.transfers[index].moneyOrderForm.startTime }}" placeholder="开票日" border="{{ false }}" bind:change="onChange" input-align="right"/>
+            <van-field readonly label="到期日" value="{{ form.transfers[index].moneyOrderForm.endTime }}" placeholder="到期日" border="{{ false }}" bind:change="onChange" input-align="right"/>
           </block>
           <block wx:else>
             <van-field required readonly label="付款账号" value="{{ form.transfers[index].payerAccount }}" placeholder="请输入付款方账号" border="{{ false }}" bind:change="onChange" input-align="right"/>
@@ -138,49 +139,42 @@
         </view>
         <text class="title">收款方信息</text>
         <view class="center-box">
-          <view class="main-box table-box" wx:if="{{form.transfers[index].bankType == 1 && form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12}}">
-            <van-cell title="收款账户类型" center border="{{false}}">
-              <view style="float: right;">
-                <van-radio-group
-                  value="{{ form.transfers[index].bankAccountType }}"
-                  bind:change="onChange"
-                  direction="horizontal"
-                  data-value="form.transfers[{{index}}].bankAccountType"
-                >
-                  <van-radio name="1" disabled checked-color="#2C8E68">公户</van-radio>
-                  <van-radio name="2" disabled checked-color="#2C8E68">私户</van-radio>
-                </van-radio-group>
-              </view>
-            </van-cell>
-          </view>
-          <!-- <view class="main-box table-box" wx:if="{{(form.transfers[index].bankType == 2 || form.transfers[index].bankType == 3 || form.transfers[index].bankType == 4) && (form.transfers[index].transferType != 10 && form.transfers[index].transferType != 11 && form.transfers[index].transferType != 12)}}">
-            <van-cell title="是否同行" center border="{{false}}">
-              <view style="float: right;">
-                <van-radio-group
-                  value="{{ form.transfers[index].isPeers }}"
-                  bind:change="onChange"
-                  direction="horizontal"
-                  data-value="form.transfers[{{index}}].isPeers"
-                >
-                  <van-radio name="Y" checked-color="#2C8E68">是</van-radio>
-                  <van-radio name="N" checked-color="#2C8E68">否</van-radio>
-                </van-radio-group>
+          <block wx:if="{{form.transfers[index].transferType == 12}}">
+            <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
+              <van-field required value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].payee">
+              <view slot="label">
+                收票方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">输入</van-tag>
               </view>
-            </van-cell>
-          </view> -->
-
-          <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
-            <van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入姓名" border="{{ false }}"  input-align="right" is-link arrow-direction	="down">
+              </van-field>
+              <van-field required  label=" 联系方式" value="{{ form.transfers[index].payeeList[childrenIndex].phone }}" placeholder="请输入联系方式" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].phone" input-align="right"/>
+              <van-field required  label="所属单位" value="{{ form.transfers[index].payeeList[childrenIndex].unit }}" placeholder="请输入所属单位" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].unit" input-align="right"/>
+              <van-field required  label="负责人全称" value="{{ form.transfers[index].payeeList[childrenIndex].leader }}" placeholder="请输入负责人全称" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].leader" input-align="right"/>
+              <van-field required  label="资金用途" value="{{ form.transfers[index].payeeList[childrenIndex].remark }}" placeholder="请输入资金用途" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].remark" input-align="right"/>
+            </view>
+          </block>
+          <block wx:elif="{{form.transfers[index].transferType == 11}}">
+            <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
+              <van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].payee">
               <view slot="label">
-                收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
+                收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">输入</van-tag>
               </view>
-            </van-field>
-            <van-field required readonly label="收款账号" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" input-align="right"/>
-            <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" input-align="right" is-link arrow-direction	="down"/>
-            <!-- <van-field required label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入收入金额" border="{{ false }}" bind:change="onChangeMoney" input-align="right" data-formname="form.transfers[{{index}}].payeeList[{{childrenIndex}}]" data-index="{{index}}" data-childrenIndex="{{childrenIndex}}"/> -->
-
-            <van-field required readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" placeholder="请输入所属银行" border="{{ false }}" input-align="right" is-link arrow-direction	="down"/>
-          </view>
+              </van-field>
+              <van-field required readonly label=" 联系方式" value="{{ form.transfers[index].payeeList[childrenIndex].phone }}" placeholder="请输入联系方式" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].phone" input-align="right"/>
+              <!-- <van-field required  label="申请使用金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" placeholder="请输入申请使用金额" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].incomeAmount" input-align="right"/> -->
+              <van-field required readonly label="资金用途" value="{{ form.transfers[index].payeeList[childrenIndex].remark }}" placeholder="请输入资金用途" border="{{ false }}" bind:change="onChange" data-value="form.transfers[{{index}}].payeeList[{{childrenIndex}}].remark" input-align="right"/>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="main-box table-box" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId">
+              <van-field required readonly value="{{ form.transfers[index].payeeList[childrenIndex].payee }}" placeholder="请选择收款方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="goPayeeList" data-payer="{{form.transfers[index].payer}}" data-index="{{index}}" data-isPeers="{{ form.transfers[index].isPeers }}" data-bankType="{{ form.transfers[index].bankType }}" data-accountType="{{ form.transfers[index].bankAccountType }}" data-transferType="{{ form.transfers[index].transferType }}">
+                <view slot="label">
+                  收款方<van-tag plain type="danger" color="#5CAE77" round style="margin-left:10px;">选择</van-tag>
+                </view>
+              </van-field>
+              <van-field required readonly label="收款账号" value="{{ form.transfers[index].payeeList[childrenIndex].payeeAccount }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
+              <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
+            </view>
+          </block>  
         </view>
 
         <view class="main-box">
@@ -222,43 +216,6 @@
             </view>
           </view>
         </view>
-
-        <!-- <view class="main-box steps-box">
-          <view class="steps-tit">审批流程</view>
-          <van-row wx:for="{{steps}}" wx:key="index">
-            <van-col span="3">
-              <view class="index">{{index+1}}</view>
-              <block wx:if="{{index==0}}">
-                <view class="indexBorder">
-                  <view class="ssT" wx:if="{{index>0}}"></view>
-                  <view class="yq"></view>
-                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
-                </view>
-              </block>
-              <block wx:else>
-                <view class="indexBorder indexCenter">
-                  <view class="ssT" wx:if="{{index>0}}"></view>
-                  <view class="yq"></view>
-                  <view class="ss" wx:if="{{steps.length != index+1}}"></view>
-                </view>
-              </block>
-            </van-col>
-            <van-col span="21">
-              <van-cell title="{{item.activityName}}" center="{{true}}" border="{{false}}">
-                <view class="agree" wx:if="{{item.type=='1'}}">{{ item.assigneeName }}</view>
-                <view class="in" wx:if="{{item.type=='2'}}">{{ item.assigneeName }}</view>
-                <view class="disagree" wx:if="{{item.type=='3'}}">{{ item.assigneeName }}</view>
-              </van-cell>
-
-              <van-cell center border="{{false}}">
-                <view slot="title">
-                  <view style="color: #999999;">{{ item.durationInMillis }}</view>
-                </view>
-                <view style="color: #999999;font-size: 12px;">{{ item.endTime }}</view>
-              </van-cell>
-            </van-col>
-          </van-row>
-        </view> -->
       </view>
     </van-collapse-item>
   </van-collapse>
@@ -314,9 +271,9 @@
   <button type="warn" plain class="btnDis" bindtap="goDis">驳回</button>
   <button type="primary" class="btnAgree" bindtap="goAgree">同意</button>
 </view>
-<view class="bottom" wx:if="{{pageType!='see'}}">
+<!-- <view class="bottom" wx:if="{{pageType!='see'}}">
   <button type="primary" plain class="btnOther" bindtap="goAgree">转办</button>
-</view>
+</view> -->
 <view class="ipXbtn"></view>
 <wxs module="sub">
   var times = function(time){

pages/payee/add/add.wxml

@@ -1,7 +1,7 @@
 <!--pages/payee/add/add.wxml-->
 <view class="ns" style="height:{{isIPX?'88px':'64px'}};">
   <image src="/image/apply/back.png" style="top:{{isIPX?'54px':'30px'}};" mode="widthFix" bindtap="back"></image>
-  <text style="top:{{isIPX?'54px':'30px'}};">新增收款方</text>
+  <text style="top:{{isIPX?'54px':'30px'}};">收款人</text>
 </view>
 <view class="main-box table-box" style="margin-top:{{isIPX?'100px':'75px'}};">
     <van-popup show="{{showBankType}}" round position="bottom"  bind:close="closeBox" data-name="showBankType">