Commit 1da7a727 by 黄麒宇

提交下代码

parent 7d089bbe
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
// 主数据表筛选数据 // 主数据表筛选数据
allSearchData: { allSearchData: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 5,
condition: {} condition: {}
}, },
allTotal: 0, allTotal: 0,
......
...@@ -86,12 +86,12 @@ ...@@ -86,12 +86,12 @@
<!-- 主表 --> <!-- 主表 -->
<el-table :data="goodsData" style="width: 100%;overflow: auto;" size="medium" highlight-current-row> <el-table :data="goodsData" style="width: 100%;overflow: auto;" size="medium" highlight-current-row>
<el-table-column type="index" width="60" label="序号" align="center"></el-table-column> <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
<el-table-column prop="billName" label="凭证号" align="center"></el-table-column> <el-table-column prop="billName" label="凭证号" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goodsCode" label="物资代码" align="center"></el-table-column> <el-table-column prop="goodsCode" label="物资代码" align="center"></el-table-column>
<el-table-column prop="goodsName" label="物资名称" align="center" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="goodsName" label="物资名称" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="modelCode" label="号型代码" align="center"></el-table-column> <el-table-column prop="modelCode" label="号型代码" align="center"></el-table-column>
<el-table-column prop="modelName" label="号型" align="center"></el-table-column> <el-table-column prop="modelName" label="号型" align="center"></el-table-column>
<el-table-column prop="glOrgName" label="管理单位" align="center"></el-table-column> <el-table-column prop="glOrgName" label="管理单位" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="fwOrgName" label="发物单位" align="center"></el-table-column> <el-table-column prop="fwOrgName" label="发物单位" align="center"></el-table-column>
<el-table-column prop="qty" label="数量" align="center" width="100"></el-table-column> <el-table-column prop="qty" label="数量" align="center" width="100"></el-table-column>
<el-table-column prop="updateTime" label="更新时间" align="center"> <el-table-column prop="updateTime" label="更新时间" align="center">
......
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
<el-card style="height: 542px;position:relative;"> <el-card style="height: 542px;position:relative;">
<!-- 主表 --> <!-- 主表 -->
<el-table :data="goodsDatas" style="width: 100%;overflow: auto;" size="medium" ref="goodTableRef"> <el-table :data="goodsDatas" style="width: 100%;overflow: auto;" size="medium" ref="goodTableRef">
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="positionCode" label="货位代码" align="center" /> <el-table-column prop="positionCode" label="货位代码" align="center" />
<el-table-column prop="palletId" label="托盘号" align="center" /> <el-table-column prop="palletId" label="托盘号" align="center" />
<el-table-column prop="goodsName" label="品名" :show-overflow-tooltip="true" align="center" /> <el-table-column prop="goodsName" label="品名" :show-overflow-tooltip="true" align="center" />
......
...@@ -110,9 +110,8 @@ ...@@ -110,9 +110,8 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.pageNo"
:page-sizes="[4, 8, 12, 15]"
:page-size="searchData.pageSize" :page-size="searchData.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="total" :total="total"
/> />
</el-card> </el-card>
......
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
<el-card style="height: 545px;position:relative;"> <el-card style="height: 545px;position:relative;">
<!-- 主表 --> <!-- 主表 -->
<el-table :data="goodsDatas" style="width: 100%;overflow: auto;" size="medium" ref="goodTableRef"> <el-table :data="goodsDatas" style="width: 100%;overflow: auto;" size="medium" ref="goodTableRef">
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="positionCode" label="货位代码" align="center" /> <el-table-column prop="positionCode" label="货位代码" align="center" />
<el-table-column prop="palletId" label="托盘号" align="center" /> <el-table-column prop="palletId" label="托盘号" align="center" />
<el-table-column prop="goodsName" label="品名" align="center" /> <el-table-column prop="goodsName" label="品名" align="center" />
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<a-button ghost type="primary" @click="resClick()" icon="reload" >重置</a-button> <a-button ghost type="primary" @click="resClick()" icon="reload">重置</a-button>
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -108,9 +108,8 @@ ...@@ -108,9 +108,8 @@
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="searchData.pageNo" :current-page="searchData.pageNo"
:page-sizes="[4, 8, 12, 15]"
:page-size="searchData.pageSize" :page-size="searchData.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, prev, pager, next, jumper"
:total="total" :total="total"
/> />
</el-card> </el-card>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-form> </el-form>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="14">
<el-card> <el-card>
<el-table :data="data" style="width: 100%;overflow: auto;" size="medium" highlight-current-row> <el-table :data="data" style="width: 100%;overflow: auto;" size="medium" highlight-current-row>
<!-- <el-table-column type="index" width="60" label="序号" align="center" /> --> <!-- <el-table-column type="index" width="60" label="序号" align="center" /> -->
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
/> />
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<a-button style="float: right;" type="primary" ghost @click="saveWarn">保存</a-button> <a-button style="float: right;" type="primary" ghost @click="saveWarn">保存</a-button>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论