Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_wechat

env/env.js

@@ -12,7 +12,7 @@ module.exports = {
            URL_PREFIX: 'https://dazu.nongshen.net/api',
     },
     IMGURL: {
-         //  URL_PREFIX: 'http://192.168.31.178:8080',
+          // URL_PREFIX: 'http://192.168.31.178:8080',
            URL_PREFIX: 'https://dazu.nongshen.net/api',
     }
   }

pages/apply/paymentTemplate/add/add.js

@@ -51,6 +51,13 @@ Page({
         showDialog:false,
         showContraction:false,
         showMoneyOrder:false,
+        cashForm:{
+          payee:'',
+          phone:'',
+          unit:'',
+          leader:'',
+          remark:'',
+        },
         SJimage:[],
         FPimage:[],
         QTimage:[],
@@ -203,7 +210,7 @@ Page({
       let list = JSON.parse(options.option);
       that.setData({
         templateModel:JSON.parse(options.option),
-        formType:options.type
+        formType:options.type,
       })
       var perames = {
         pageNum:1,
@@ -244,6 +251,18 @@ Page({
 
           list.applyData.transfers[i].expenditureAmount = '';
 
+          list.applyData.transfers[i].cashierType = list.applyData.transfers[i].cashierId != '' && list.applyData.transfers[i].cashierId != null && list.applyData.transfers[i].cashierId != null ? 'edit':'add' ;
+
+          
+          
+          list.applyData.transfers[i].cashForm=[{
+            payee:'',
+            phone:'',
+            unit:'',
+            leader:'',
+            remark:'',
+          }];
+
           if(list.applyData.transfers[i].capitalExpenditureType == 2){
             let prames = {
               outId:list.applyData.transfers[i].id,
@@ -270,6 +289,25 @@ Page({
               }
             })
           }
+
+          if(list.applyData.transfers[i].transferType == '12'){
+            list.applyData.transfers[i].moneyOrderForm = {
+              billPayUnit : '',
+              orderNum : '',
+              id : '',
+              startTime : '',
+              endTime : '',
+              orderType : '',
+              orderAmount:''
+            };
+              list.applyData.transfers[i].amountReadonly = true;
+            // 关联收票方查询
+            UTIL.httpRequest(API.URL_GET_GETCASHLISTCASGBYID+list.applyData.transfers[i].id , {method:'get'}, {
+              success: (res) => {
+                list.applyData.transfers[i].cashForm = res.data
+              }
+            })
+          }
           
           let fileForm = [];
 
@@ -416,13 +454,16 @@ Page({
               res.data.transfers.forEach( (item,index) => {
 
                 that.setData({
-                  applyDate: res.data.transfers[0].applyDate
+                  applyDate: res.data.transfers[0].applyDate,
                 })
 
                 res.data.transfers[index].capitalExpenditureTypeText = UTIL.getTransform(item.capitalExpenditureType,that.data.capitalExpenditureTypeOptions);
 
                 console.log(item.paymentPattern);
                 console.log(that.data.transferTypeOptions);
+
+                res.data.transfers[index].cashierType = res.data.transfers[index].cashierId != '' && res.data.transfers[index].cashierId != null && res.data.transfers[index].cashierId != null ? 'edit':'add' ;
+
                 res.data.transfers[index].transferTypeText = UTIL.getTransform(item.paymentPattern,that.data.transferTypeOptions);
 
                 res.data.transfers[index].bankTypeText = UTIL.getTransform(item.bankType,that.data.bankTypeOptions);
@@ -833,11 +874,37 @@ Page({
   },
   onConfirmMoneyOrder(event) {
     console.log(event);
+    var that = this ;
     this.setData({
       [event.currentTarget.dataset.name]: false,
       [event.currentTarget.dataset.value+'.moneyOrderForm']: event.detail.value,
       [event.currentTarget.dataset.value+'.expenditureAmount']: event.detail.value.orderAmount,
+      [event.currentTarget.dataset.value+".payeeList[0].incomeAmount"]: event.detail.value.orderAmount,
+      [event.currentTarget.dataset.value+'.payer']:event.detail.value.billPayUnit,
+      [event.currentTarget.dataset.value+'.payerAccount'] : event.detail.value.orderNum,
+      [event.currentTarget.dataset.value+'.cashierId'] : event.detail.value.id,
+      [event.currentTarget.dataset.value+'.startTime'] : event.detail.value.startTime,
+      [event.currentTarget.dataset.value+'.endTime'] : event.detail.value.endTime,
+      [event.currentTarget.dataset.value+'.orderType'] : event.detail.value.orderType
     });
+    
+    var moneyCount = 0 ;
+    for (let i = 0; i < that.data.form.transfers.length; i++) {
+      const element = that.data.form.transfers[i];
+      for (let j = 0; j < element.payeeList.length; j++) {
+        const element2 = element.payeeList[j];
+        var allCount = 0 ;
+        moneyCount = parseFloat(moneyCount)+parseFloat(element2.incomeAmount);
+        // allCount = parseFloat(allCount)+parseFloat(element2.incomeAmount);
+        // this.setData({
+        //   ["form.transfers["+i+"].expenditureAmount"]:allCount,
+        // })
+      }
+    }
+    console.log(moneyCount.toFixed(2));
+    this.setData({
+       ["form.approvalItemTemplate.totalAmount"]:moneyCount.toFixed(2),
+    })
   },
   goPayeeList(event){
     console.log(event.currentTarget.dataset.transfertype)
@@ -1024,11 +1091,11 @@ Page({
         UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的付款方！');
         return;
       }
-      if(element.payeeList[0].payee == ''){
+      if(element.payeeList[0].payee == ''&&element.transferType!=12){
         UTIL.showToastNoneIcon('请选择事项'+UTIL.convertToChinaNum(i+1)+'的收款方！');
         return;
       }
-      if(element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined){
+      if((element.payeeList[0].incomeAmount == '' || element.payeeList[0].incomeAmount == undefined)&&element.transferType!=12){
         UTIL.showToastNoneIcon('请填写事项'+UTIL.convertToChinaNum(i+1)+'收款方的收入金额！');
         return;
       }
@@ -1087,6 +1154,28 @@ Page({
                 }
               })
             }
+
+            // if(that.data.form.transfers[j].transferType == '12'){
+              
+            //   console.log(that.data.form.transfers[j].cashForm);
+            //   that.data.form.transfers[j].cashForm.cashId = res.data.transfers[j].id;
+            //   that.data.form.transfers[j].cashForm.method = 'POST';
+            //   if(that.data.form.transfers[j].cashierType == 'edit'){
+            //     // 收票方信息增加
+            //     UTIL.httpRequest(API.URL_GET_GETCASHDETAILEDIT , that.data.form.transfers[j].cashForm, {
+            //       success: (res) => {
+                    
+            //       }
+            //     })
+            //   }else{
+            //     // 收票方信息修改
+            //     UTIL.httpRequest(API.URL_GET_GETCASHDETAILADD , that.data.form.transfers[j].cashForm, {
+            //       success: (res) => {
+                    
+            //       }
+            //     })
+            //   }
+            // }
             
             if(that.data.form.transfers[j].fileForm == undefined){continue;}
             console.log(that.data.form.transfers[j].fileForm);
@@ -1105,7 +1194,6 @@ Page({
                 formData:element,
                 success (response){
                   console.log(res);
-                  
                 },
                 fail(res){
                   console.log(res)
@@ -1346,6 +1434,13 @@ Page({
       SJimage:[],
       FPimage:[],
       QTimage:[],
+      cashForm:{
+        payee:'',
+        phone:'',
+        unit:'',
+        leader:'',
+        remark:'',
+      },
       showTitle:true,
       capitalExpenditureType:'1',//资金支出类别
       capitalExpenditureTypeText:'结算类',//资金支出类别（展示用）
@@ -1475,14 +1570,19 @@ Page({
       })
       return;
     }
+    that.data.form.approvalItemTemplate.totalAmount =  parseFloat(parseFloat(that.data.form.approvalItemTemplate.totalAmount)- parseFloat(that.data.form.transfers[e.currentTarget.dataset.index].expenditureAmount)).toFixed(2);
     that.data.form.transfers.splice(e.currentTarget.dataset.index,1);
 
     for (let i = 0; i < that.data.form.transfers.length; i++) {
       that.data.form.transfers[i].num = UTIL.convertToChinaNum(i+1)
     }
     console.log(that.data.form);
+
+
+    console.log(parseFloat(that.data.form.approvalItemTemplate.totalAmount));
+    console.log(parseFloat(that.data.form.transfers[e.currentTarget.dataset.index].expenditureAmount));
     that.setData({
-      form:that.data.form
+      form:that.data.form,
     })
   },
   disabledNone(e){

pages/apply/paymentTemplate/add/add.wxml

@@ -45,7 +45,7 @@
         <view class="top-box">
           <text style="color: #000;">支出金额</text>
 
-          <view class="money_box" data-index="{{index}}" bindtap="disabledNone">￥<input class="input_money" type="digit" placeholder="0.00" placeholder-style="color:#E90000;" value="{{form.transfers[index].expenditureAmount}}" data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bindinput="onChangeMoneyOut"/></view>
+          <view class="money_box" data-index="{{index}}" bindtap="disabledNone">￥<input disabled="{{form.transfers[index].amountReadonly}}" class="input_money" type="digit" placeholder="0.00" placeholder-style="color:#E90000;" value="{{form.transfers[index].expenditureAmount}}" data-formname="form.transfers[{{index}}].expenditureAmount" data-index="{{index}}" input-align="right"  bindinput="onChangeMoneyOut"/></view>
 
           <van-cell-group border="{{ false }}">
             <van-cell title="{{item.remark}}" border="{{ false }}">
@@ -204,6 +204,7 @@
                 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].moneyOrderForm.billPayUnit }}" placeholder="请选择出票方" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down" bindtap="openBox" data-name="form.transfers[{{index}}].showMoneyOrder"/>
@@ -224,20 +225,32 @@
         <view class="center-box">
           <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" is-link arrow-direction	="down">
+              <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-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:if="{{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 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-field>
-              <van-field required readonly label=" 联系方式" value="{{ form.transfers[index].payeeList[childrenIndex].phone }}" placeholder="请输入收款账户" border="{{ false }}" bind:change="onChange" input-align="right"/>
-              <van-field required readonly label="所属单位" value="{{ form.transfers[index].payeeList[childrenIndex].unit }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
-              <van-field required readonly label="负责人全称" value="{{ form.transfers[index].payeeList[childrenIndex].leader }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
-              <van-field required readonly label="资金用途" value="{{ form.transfers[index].payeeList[childrenIndex].remark }}" placeholder="请输入开户银行" border="{{ false }}" bind:change="onChange" input-align="right" is-link arrow-direction	="down"/>
+              <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].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">
+            <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>

utils/API.js

@@ -188,8 +188,15 @@ const URL_GET_GETMONEYORDERLIST = `${URL_PREFIX}/yinnong/moneyorder/list`;
 //汇票、现金支出申请
 const URL_GET_GETCASHSAVE = `${URL_PREFIX}/yinnong/approvalItems/cashSave`;
 
-//增加收入流水
-const URL_POST_GERFLOWADD = `${URL_PREFIX}/cashier/flow/add`;
+//受票房信息修改
+const URL_GET_GETCASHDETAILEDIT = `${URL_PREFIX}/yinnong/cashdetail/edit`;
+
+//受票房信息增加
+const URL_GET_GETCASHDETAILADD = `${URL_PREFIX}/yinnong/cashdetail/add`;
+
+//汇票、现金支出申请
+const URL_GET_GETCASHLISTCASGBYID = `${URL_PREFIX}/yinnong/cashdetail/listCashdetailByCashId/`;
+
 
 
 /****************接口地址end****************/
@@ -268,5 +275,7 @@ export {
     URL_GET_GETAPPROVALBYID,
     URL_GET_GETMONEYORDERLIST,
     URL_GET_GETCASHSAVE,
-    URL_POST_GERFLOWADD
+    URL_GET_GETCASHDETAILADD,
+    URL_GET_GETCASHLISTCASGBYID,
+    URL_GET_GETCASHDETAILEDIT
 }