This commit is contained in:
zhangdingyu
2019-11-28 14:31:05 +08:00
parent 0caf24a34f
commit 4ce590085c
4 changed files with 28 additions and 28 deletions

View File

@@ -3,9 +3,9 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<el-row style="margin-bottom:-10px!important;"> <el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/> <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 150px;" @keyup.enter.native="pageCurrent=1;pageSize=20;searchMaterial()"/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/> <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/> <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate"> <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
<el-option <el-option
v-for="item in inventoryName" v-for="item in inventoryName"

View File

@@ -1,19 +1,19 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row style="margin-bottom: 10px"> <el-row style="margin: 5px">
<span>物料名称</span> <span>名称规格型号</span>
<el-input v-model="materialName" placeholder="物料名称" clearable size="small"/> <el-input v-model="materialName" placeholder="名称规格型号" clearable size="small" @keyup.enter.native="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()"/>
<span>物料规格</span> <!--<span>物料规格</span>-->
<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/> <!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
<!--<span>物料型号</span>-->
<!--<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>-->
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
</el-row> </el-row>
<span>物料型号</span>
<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord"> <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" prop="物料名称" align="center" min-width="120"> <el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -30,11 +30,11 @@
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80"> <!--<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.仓库名称 }} <!--{{ scope.row.仓库名称 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="货位名称" align="center" min-width="80"> <el-table-column label="货位名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位名称 }} {{ scope.row.货位名称 }}
@@ -65,7 +65,7 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card v-show="false">
<el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250"> <el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="80"> <el-table-column label="物料名称" align="center" min-width="80">

View File

@@ -19,11 +19,12 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/> <el-input v-model="name" placeholder="名称图号规格" style="width:150px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" /> <!--<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />-->
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" /> <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row v-show="false" style="margin-bottom:10px">
<el-date-picker <el-date-picker
v-model="inTime" v-model="inTime"
type="daterange" type="daterange"
@@ -34,7 +35,6 @@
style="width:250px;margin-left: 0px" style="width:250px;margin-left: 0px"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间"/> end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card style="width: 900px"> <el-card style="width: 900px">

View File

@@ -19,11 +19,12 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" /> <el-input v-model="name" placeholder="名称图号规格" clearable size="small" style="width:150px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" /> <!--<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />-->
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" /> <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row v-show="false" style="margin-bottom:10px">
<el-date-picker <el-date-picker
v-model="outTime" v-model="outTime"
type="daterange" type="daterange"
@@ -34,7 +35,6 @@
style="width:250px;margin-left: 0px" style="width:250px;margin-left: 0px"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间"/> end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card style="width: 900px"> <el-card style="width: 900px">