|
@@ -15,15 +15,14 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="账套号" v-model="queryParam.setNo">
|
|
|
- <!-- -->
|
|
|
- <a-input></a-input>
|
|
|
+ <a-form-item label="账套号" >
|
|
|
+ <a-input v-model="queryParam.setNo"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="供应商" v-model="queryParam.supplier">
|
|
|
- <a-input></a-input>
|
|
|
+ <a-form-item label="供应商" >
|
|
|
+ <a-input v-model="queryParam.supplier"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
@@ -48,6 +47,7 @@
|
|
|
:loading="loading"
|
|
|
:columns="mainTableExpenseCNYColumns"
|
|
|
:data-source="mainTableExpenseCNYData"
|
|
|
+ :scroll="{ y: 500 }"
|
|
|
:pagination="false"
|
|
|
>
|
|
|
</a-table>
|
|
@@ -87,24 +87,25 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '项目',
|
|
|
- dataIndex: 'project',
|
|
|
+ dataIndex: 'expenseItem',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '金额',
|
|
|
- dataIndex: 'money',
|
|
|
+ dataIndex: 'disbursedLocalmoney',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '供应商',
|
|
|
- dataIndex: 'supplier',
|
|
|
+ dataIndex: 'processUnit',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
}
|
|
|
],
|
|
|
- mainTableExpenseCNYData: [{}, {}],
|
|
|
+ mainTableExpenseCNYData: [],
|
|
|
+ fixedData:[],
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
@@ -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.mainTableExpenseCNYData = data
|
|
|
+ },
|
|
|
// 重置
|
|
|
searchReset() {
|
|
|
// console.log('人民币重置查询条件')
|
|
|
// this.queryParam = {}
|
|
|
this.queryParam.setNo = ''
|
|
|
this.queryParam.supplier = ''
|
|
|
+ this.mainTableExpenseCNYData = this.fixedData
|
|
|
// this.getShipmentList()
|
|
|
},
|
|
|
close() {
|