@@ -83,6 +83,14 @@ Page({ | |||||
}) | }) | ||||
} | } | ||||
}) | }) | ||||
// 转账状态 | |||||
UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_status', {method:'GET'}, { | |||||
success: (res) => { | |||||
that.setData({ | |||||
transferStatusOptions:res.data, | |||||
}) | |||||
} | |||||
}) | |||||
// 获取合同信息列表 | // 获取合同信息列表 | ||||
UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, { | UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, { | ||||
success: (res) => { | success: (res) => { | ||||
@@ -123,8 +131,10 @@ Page({ | |||||
res.data.transfers[index].num = UTIL.convertToChinaNum(index+1), | res.data.transfers[index].num = UTIL.convertToChinaNum(index+1), | ||||
res.data.transfers[index].expenditureAmount = parseFloat(res.data.transfers[index].expenditureAmount).toFixed(2) | res.data.transfers[index].expenditureAmount = parseFloat(res.data.transfers[index].expenditureAmount).toFixed(2) | ||||
res.data.transfers[index].showTitle = false; | res.data.transfers[index].showTitle = false; | ||||
res.data.transfers[index].activeName = ''; | |||||
res.data.transfers[index].payeeList.forEach( (response,i) => { | res.data.transfers[index].payeeList.forEach( (response,i) => { | ||||
res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions); | res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions); | ||||
res.data.transfers[index].payeeList[i].transferStatusText = UTIL.getTransform(response.transferStatus,that.data.transferStatusOptions); | |||||
}) | }) | ||||
console.log(res.data.transfers[index].capitalExpenditureType); | console.log(res.data.transfers[index].capitalExpenditureType); | ||||
if(res.data.transfers[index].capitalExpenditureType == 2){ | if(res.data.transfers[index].capitalExpenditureType == 2){ | ||||
@@ -281,6 +291,12 @@ Page({ | |||||
}, | |||||
onChangePayee(event) { | |||||
console.log(event); | |||||
this.setData({ | |||||
["form.transfers["+event.currentTarget.dataset.index+"].activeName"]:event.detail | |||||
}); | |||||
}, | }, | ||||
goPayee(event){ | goPayee(event){ | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
@@ -160,12 +160,13 @@ | |||||
<van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" border="{{ false }}" input-align="right"/> | <van-field required readonly label="开户银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankDeposit }}" border="{{ false }}" input-align="right"/> | ||||
<van-field required readonly label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" border="{{ false }}" input-align="right"/> | <van-field required readonly label="收入金额" value="{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" border="{{ false }}" input-align="right"/> | ||||
<van-field required readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" border="{{ false }}" input-align="right"/> | <van-field required readonly label="所属银行" value="{{ form.transfers[index].payeeList[childrenIndex].bankTypeText }}" border="{{ false }}" input-align="right"/> | ||||
<!-- <van-field required readonly label="转账状态" value="{{ form.transfers[index].payeeList[childrenIndex].transferStatusText }}" border="{{ false }}" input-align="right"/> | |||||
<van-field required readonly label="交易结果描述" value="{{ form.transfers[index].payeeList[childrenIndex].causeFailure }}" border="{{ false }}" input-align="right"/> --> | |||||
<van-field required readonly label="转账状态" value="{{ form.transfers[index].payeeList[childrenIndex].transferStatusText }}" border="{{ false }}" input-align="right"/> | |||||
<van-field required readonly label="交易结果描述" value="{{ form.transfers[index].payeeList[childrenIndex].causeFailure }}" border="{{ false }}" input-align="right"/> | |||||
</van-collapse-item> | </van-collapse-item> | ||||
</van-collapse> | </van-collapse> | ||||
<text wx:if="{{form.transfers[index].payeeList.length>10}}" style="text-align: center;color: #2C8E68;padding-top: 10px;" data-option="{{form.transfers[index].payeeList}}" bindtap="goPayee">查看更多</text> | |||||
<!-- wx:if="{{form.transfers[index].payeeList.length>10}}" --> | |||||
<text style="text-align: center;color: #2C8E68;padding-top: 10px;" data-option="{{form.transfers[index].payeeList}}" bindtap="goPayee">查看更多</text> | |||||
<!-- | <!-- | ||||
<van-field required readonly label="{{ form.transfers[index].payeeList[childrenIndex].payee }}" value="¥{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId" is-link placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" input-class="aaa" /> --> | <van-field required readonly label="{{ form.transfers[index].payeeList[childrenIndex].payee }}" value="¥{{ form.transfers[index].payeeList[childrenIndex].incomeAmount }}" wx:for="{{form.transfers[index].payeeList}}" wx:for-index="childrenIndex" wx:key="payeeId" is-link placeholder="请输入收款方" border="{{ false }}" bind:change="onChange" input-align="right" input-class="aaa" /> --> | ||||
@@ -1,6 +1,6 @@ | |||||
// pages/pay/payee/payee.js | // pages/pay/payee/payee.js | ||||
import * as UTIL from '../../../../../utils/util.js'; | |||||
import * as API from '../../../../../utils/API.js'; | |||||
import * as UTIL from '../../../utils/util.js'; | |||||
import * as API from '../../../utils/API.js'; | |||||
const app = getApp(); | const app = getApp(); | ||||
Page({ | Page({ | ||||
@@ -10,14 +10,40 @@ Page({ | |||||
data: { | data: { | ||||
isIPX: app.globalData.isIPX, | isIPX: app.globalData.isIPX, | ||||
activeName:'', | activeName:'', | ||||
value:'123', | |||||
list:{} | |||||
value:'', | |||||
list:{}, | |||||
array:{}, | |||||
checked:false | |||||
}, | }, | ||||
onChange(event) { | onChange(event) { | ||||
this.setData({ | this.setData({ | ||||
activeName: event.detail, | activeName: event.detail, | ||||
}); | }); | ||||
}, | }, | ||||
onChangeCheck(event) { | |||||
var that = this ; | |||||
this.setData({ | |||||
checked: !that.data.checked, | |||||
}); | |||||
if(that.data.checked){ | |||||
let array = []; | |||||
for (let i = 0; i < that.data.list.length; i++) { | |||||
const element = that.data.list[i]; | |||||
if(element.transferStatus == '6'){ | |||||
array.push(element) | |||||
} | |||||
} | |||||
that.setData({ | |||||
array:array | |||||
}) | |||||
}else{ | |||||
that.setData({ | |||||
array:that.data.list | |||||
}) | |||||
} | |||||
}, | |||||
/** | /** | ||||
* 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
*/ | */ | ||||
@@ -26,6 +52,7 @@ Page({ | |||||
this.setData({ | this.setData({ | ||||
list: JSON.parse(options.options), | list: JSON.parse(options.options), | ||||
array: JSON.parse(options.options), | |||||
}); | }); | ||||
}, | }, | ||||
@@ -12,15 +12,15 @@ | |||||
clearable | clearable | ||||
bind:change="goSearch" | bind:change="goSearch" | ||||
/> | /> | ||||
<view class="add_btn" bindtap="goAdd"> | |||||
<van-checkbox value="{{ checked }}" shape="square" bind:change="onChange"> | |||||
<view class="add_btn"> | |||||
<van-checkbox value="{{ checked }}" shape="square" bind:change="onChangeCheck"> | |||||
仅显示失效 | 仅显示失效 | ||||
</van-checkbox> | </van-checkbox> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="main"> | <view class="main"> | ||||
<van-collapse accordion value="{{ activeName }}" bind:change="onChange" custom-class="list"> | <van-collapse accordion value="{{ activeName }}" bind:change="onChange" custom-class="list"> | ||||
<van-collapse-item title="{{ item.payee }}" name="{{index}}" wx:for="{{list}}" wx:key="index"> | |||||
<van-collapse-item title="{{ item.payee }}" name="{{index}}" wx:for="{{array}}" wx:key="index"> | |||||
<view slot="value"> | <view slot="value"> | ||||
<text class="money">¥{{ item.incomeAmount }}</text> | <text class="money">¥{{ item.incomeAmount }}</text> | ||||
</view> | </view> | ||||
@@ -34,8 +34,8 @@ | |||||
<van-cell title="开户银行" value="{{ item.bankDeposit }}" border="{{ false }}" /> | <van-cell title="开户银行" value="{{ item.bankDeposit }}" border="{{ false }}" /> | ||||
<van-cell title="收入金额" value="{{ item.incomeAmount }}" border="{{ false }}" /> | <van-cell title="收入金额" value="{{ item.incomeAmount }}" border="{{ false }}" /> | ||||
<van-cell title="所属银行" value="{{ item.bankTypeText }}" border="{{ false }}" /> | <van-cell title="所属银行" value="{{ item.bankTypeText }}" border="{{ false }}" /> | ||||
<!-- <van-cell title="转账状态" value="6217002190007972186" border="{{ false }}" /> | |||||
<van-cell title="交易结果" value="6217002190007972186" border="{{ false }}" /> --> | |||||
<van-cell title="转账状态" value="{{ item.transferStatusText }}" border="{{ false }}" /> | |||||
<van-cell title="交易结果" value="{{ item.causeFailure }}" border="{{ false }}" /> | |||||
</view> | </view> | ||||
</van-collapse-item> | </van-collapse-item> | ||||
</van-collapse> | </van-collapse> |
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"setting": { | "setting": { | ||||
"compileHotReLoad": true | |||||
"compileHotReLoad": false | |||||
}, | }, | ||||
"condition": { | "condition": { | ||||
"miniprogram": { | "miniprogram": { | ||||