|
@@ -49,6 +49,7 @@
|
|
|
:columns="mainTableExpenseUSDColumns"
|
|
|
:data-source="mainTableExpenseUSDData"
|
|
|
:pagination="false"
|
|
|
+ :scroll="{ y: 500 }"
|
|
|
>
|
|
|
</a-table>
|
|
|
<!-- 返回 -->
|
|
@@ -87,25 +88,25 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '项目',
|
|
|
- dataIndex: 'project',
|
|
|
+ dataIndex: 'expenseItem',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '金额',
|
|
|
- dataIndex: 'money',
|
|
|
+ dataIndex: 'disbursedOriginalmoney',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '供应商',
|
|
|
- dataIndex: 'supplier',
|
|
|
+ dataIndex: 'processUnit',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
}
|
|
|
],
|
|
|
- mainTableExpenseUSDData: [{}, {}],
|
|
|
-
|
|
|
+ mainTableExpenseUSDData: [],
|
|
|
+ fixedData:[],
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
setNo: '', // 账套号
|
|
@@ -130,13 +131,22 @@ export default {
|
|
|
this.close()
|
|
|
},
|
|
|
// 弹框查询按钮
|
|
|
- searchQuery() {},
|
|
|
+ searchQuery() {
|
|
|
+ var data = []
|
|
|
+ this.fixedData.map(item =>{
|
|
|
+ if(item.setNo.includes(this.queryParam.setNo) && item.processUnit.includes(this.queryParam.supplier)){
|
|
|
+ data.push(item)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.mainTableExpenseUSDData = data
|
|
|
+ },
|
|
|
// 重置
|
|
|
searchReset() {
|
|
|
console.log('美元重置查询条件')
|
|
|
// this.queryParam = {}
|
|
|
this.queryParam.setNo = ''
|
|
|
this.queryParam.supplier = ''
|
|
|
+ this.mainTableExpenseUSDData = this.fixedData
|
|
|
// this.getShipmentList()
|
|
|
},
|
|
|
close() {
|