|
@@ -33,7 +33,7 @@
|
|
|
<div id="out_stock"></div>
|
|
|
<div class="select_border">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true">
|
|
|
- <el-select v-model="queryParams.category" placeholder="请选择">
|
|
|
+ <el-select v-model="queryParams.airName" placeholder="请选择" @change="categoryFun()">
|
|
|
<el-option label="全部气体" value=""></el-option>
|
|
|
<el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
|
|
|
</el-select>
|
|
@@ -47,7 +47,7 @@
|
|
|
<div id="apply"></div>
|
|
|
<div class="select_border">
|
|
|
<el-form :model="queryParams2" ref="queryForm" :inline="true">
|
|
|
- <el-select v-model="queryParams2.category" placeholder="请选择">
|
|
|
+ <el-select v-model="queryParams2.airName" placeholder="请选择" @change="categoryFun2()">
|
|
|
<el-option label="全部气体" value=""></el-option>
|
|
|
<el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
|
|
|
</el-select>
|
|
@@ -59,7 +59,7 @@
|
|
|
<div id="gas"></div>
|
|
|
<div class="select_border">
|
|
|
<el-form :model="queryParams3" ref="queryForm" :inline="true">
|
|
|
- <el-select v-model="queryParams3.category" placeholder="请选择">
|
|
|
+ <el-select v-model="queryParams3.airName" placeholder="请选择" @change="categoryFun3()">
|
|
|
<el-option label="全部气体" value=""></el-option>
|
|
|
<el-option :label="item.dictLabel" :value="item.dictLabel" v-for="(item,index) in materialTypeList" :key="index"></el-option>
|
|
|
</el-select>
|
|
@@ -87,7 +87,7 @@
|
|
|
|
|
|
import {
|
|
|
gasApplyStatistics,
|
|
|
- gasCategoryList,
|
|
|
+ gasCategoryList, gasManageAirName,
|
|
|
outStatistics,
|
|
|
supplierList,
|
|
|
useGasStatistics
|
|
@@ -118,17 +118,17 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize:20,
|
|
|
- category:'',
|
|
|
+ airName:'',
|
|
|
},
|
|
|
queryParams2: {
|
|
|
pageNum: 1,
|
|
|
pageSize:20,
|
|
|
- category:'',
|
|
|
+ airName:'',
|
|
|
},
|
|
|
queryParams3: {
|
|
|
pageNum: 1,
|
|
|
pageSize:20,
|
|
|
- category:'',
|
|
|
+ airName:'',
|
|
|
},
|
|
|
materialTypeList:[],
|
|
|
};
|
|
@@ -160,11 +160,20 @@ export default {
|
|
|
//气瓶类目
|
|
|
gasCategoryList(){
|
|
|
let _this=this;
|
|
|
- gasCategoryList().then( response => {
|
|
|
+ gasManageAirName().then( response => {
|
|
|
let res=response.rows;
|
|
|
_this.materialTypeList=res;
|
|
|
});
|
|
|
},
|
|
|
+ categoryFun(){
|
|
|
+ this.outStatistics()
|
|
|
+ },
|
|
|
+ categoryFun2(){
|
|
|
+ this.gasApplyStatistics()
|
|
|
+ },
|
|
|
+ categoryFun3(){
|
|
|
+ this.useGasStatistics()
|
|
|
+ },
|
|
|
//出库
|
|
|
outStockFun:function(dataX,dataY,dataY2){
|
|
|
var option = {
|
|
@@ -539,7 +548,7 @@ export default {
|
|
|
//出入库信息统计
|
|
|
outStatistics(){
|
|
|
let _this=this;
|
|
|
- outStatistics().then( response => {
|
|
|
+ outStatistics(this.queryParams).then( response => {
|
|
|
let res=response.data;
|
|
|
let dataX=[];
|
|
|
let dataY=[];
|
|
@@ -554,10 +563,10 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- //气瓶申请统计
|
|
|
+ //用气申请统计
|
|
|
gasApplyStatistics(){
|
|
|
let _this=this;
|
|
|
- gasApplyStatistics().then( response => {
|
|
|
+ gasApplyStatistics(this.queryParams2).then( response => {
|
|
|
let res=response.data;
|
|
|
let dataX=[];
|
|
|
let dataY=[];
|
|
@@ -573,7 +582,7 @@ export default {
|
|
|
//用气量统计
|
|
|
useGasStatistics(){
|
|
|
let _this=this;
|
|
|
- useGasStatistics().then( response => {
|
|
|
+ useGasStatistics(this.queryParams3).then( response => {
|
|
|
let res=response.data;
|
|
|
let dataX=[];
|
|
|
let dataY=[];
|