Commit f2eff3c9 authored by 朱彩云's avatar 朱彩云

Merge branch 'fix-0214-wth' into 'master'

EOB详情页增加查询功能问题修改

See merge request !27
parents f349daeb b7d3b872
......@@ -78,20 +78,6 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="30">
<a-col :md="24" class="none-label">
<a-form-model-item label="button">
<!-- <a-button class="mar-left10" type="primary" @click="handlerSearch">
<Icon name="ssisearch_active" :size="14" />查询
</a-button> -->
<a-button type="primary" @click="exportEvt">
<Icon name="ssidaochu" :size="14" />导出
</a-button>
<a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
<Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}</a-button>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
<a-form-model ref="form" layout="vertical" :model="searchForm">
<a-row :gutter="30">
......@@ -111,18 +97,17 @@
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="30">
<a-col :sm="3" :offset="21" class="none-label">
<div class="btn-div flex">
<span></span>
<a-form-model-item label="button">
<div class="btn-div mar-bottom10 none-label">
<a-button type="primary" @click="handlerSearch">
<Icon name="ssisearch_active" :size="14" />查询
</a-button>
</a-form-model-item>
<a-button class="mar-left10" type="primary" @click="exportEvt">
<Icon name="ssidaochu" :size="14" />导出
</a-button>
<a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
<Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}
</a-button>
</div>
</a-col>
</a-row>
</a-form-model>
<!-- table -->
<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false"
......@@ -294,7 +279,11 @@ export default {
visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
});
this.getData()
if(this.isEditNewEob) { // 点击添加EOB之后 分页数据查询就应该调EOB数据
this._getNewEOBList()
return true;
}
this.getData();
},
//回款金额改变
moneyChange(){
......@@ -519,6 +508,9 @@ export default {
.ant-form-item-label {
opacity: 0;
}
}
.btn-div{
}
.ant-btn .icon-class {
.mg-r(10);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment