Commit 69742cf3 authored by 季圣华's avatar 季圣华
Browse files

优化报表,解决手机端不能查询的bug

parent ca8b877d
......@@ -9,29 +9,24 @@
<a-row :gutter="24">
<a-col :md="6" :sm="24">
<a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入名称" v-model="queryParam.name"></a-input>
<a-input placeholder="请输入名称" v-model="queryParam.search.name"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入编号" v-model="queryParam.serialNo"></a-input>
<a-input placeholder="请输入编号" v-model="queryParam.search.serialNo"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="5" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
</span>
</a-col>
<a-col :md="3" :sm="24">
<a-form-item label="本月发生总额">
{{allMonthAmount}}
</a-form-item>
</a-col>
<a-col :md="3" :sm="24">
<a-form-item label="当前总余额">
{{allCurrentAmount}}
<a-col :md="6" :sm="24">
<a-form-item>
<span>本月发生总额:{{allMonthAmount}},当前总余额:{{allCurrentAmount}}</span>
</a-form-item>
</a-col>
</a-row>
......@@ -102,8 +97,10 @@
},
// 查询条件
queryParam: {
name:'',
serialNo:''
search: {
name:'',
serialNo:''
}
},
ipagination:{
pageSize: 11,
......@@ -147,7 +144,7 @@
return param;
},
getAccountStatistics() {
getAction(this.url.getStatistics, this.queryParam).then((res)=>{
getAction(this.url.getStatistics, this.queryParam.search).then((res)=>{
if(res && res.code === 200) {
if(res.data){
this.allMonthAmount = res.data.allMonthAmount
......
......@@ -30,7 +30,7 @@
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
......
......@@ -31,16 +31,16 @@
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="5" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
</span>
</a-col>
<a-col :md="4" :sm="24">
<a-form-item label="本月合计金额">
{{totalCountMoneyStr}}
<a-col :md="6" :sm="24">
<a-form-item>
<span>本月合计金额:{{totalCountMoneyStr}}</span>
</a-form-item>
</a-col>
</a-row>
......
......@@ -40,21 +40,16 @@
</a-select>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="4" :sm="24">
<a-col :md="5" :sm="24">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
</a-col>
</span>
<a-col :md="3" :sm="24">
<a-form-item label="当前总库存" :labelCol="labelCol" :wrapperCol="wrapperCol">
{{currentStock}}
</a-form-item>
</span>
</a-col>
<a-col :md="3" :sm="24">
<a-form-item label="当前总库存金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
{{currentStockPrice}}
<a-col :md="6" :sm="24">
<a-form-item>
<span>当前总库存:{{currentStock}},当前总库存金额:{{currentStockPrice}}</span>
</a-form-item>
</a-col>
</a-row>
......
......@@ -30,7 +30,7 @@
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<span class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
......
Supports Markdown
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