|
|
@@ -122,32 +122,39 @@
|
|
|
</div>
|
|
|
<div class="main-list" v-if="activeMenu == 'cashier'">
|
|
|
<div class="title">
|
|
|
- <el-form
|
|
|
- class="search-form flex justify-between"
|
|
|
- ref="searchForm"
|
|
|
- :inline="true"
|
|
|
- :model="searchForm"
|
|
|
- >
|
|
|
- <el-form-item class="form-item" label="" prop="keyword">
|
|
|
+ <div class="flex justify-between">
|
|
|
+ <el-input
|
|
|
+ v-model="searchForm.keyword"
|
|
|
+ prefix-icon="el-icon-full-screen"
|
|
|
+ @keyup.enter.native="doQueryGoods"
|
|
|
+ placeholder="请输入商品关键字：商品名称、条码、商品ID..."
|
|
|
+ clearable
|
|
|
+ class="flex-1 mr-2"
|
|
|
+ />
|
|
|
+ <el-button
|
|
|
+ class="search-goods mr-5 bg-[#f67f20] text-white"
|
|
|
+ size="small"
|
|
|
+ @click="doQueryGoods()"
|
|
|
+ icon="el-icon-search"
|
|
|
+ >
|
|
|
+ 查询商品
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
+ <!-- <el-form class="search-form " ref="searchForm" :inline="true" :model="searchForm">
|
|
|
+ <el-form-item prop="keyword">
|
|
|
<el-input
|
|
|
v-model="searchForm.keyword"
|
|
|
prefix-icon="el-icon-full-screen"
|
|
|
@keyup.enter.native="doQueryGoods"
|
|
|
- class="input-item"
|
|
|
placeholder="请输入商品关键字：商品名称、条码、商品ID..."
|
|
|
clearable
|
|
|
- maxlength="100"
|
|
|
+ style="width: 600px;"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-button
|
|
|
- class="search-goods mr-5"
|
|
|
- size="small"
|
|
|
- @click="doQueryGoods()"
|
|
|
- icon="el-icon-search"
|
|
|
- >
|
|
|
+ <el-button class="search-goods mr-5" size="small" @click="doQueryGoods()" icon="el-icon-search">
|
|
|
查询商品
|
|
|
</el-button>
|
|
|
- </el-form>
|
|
|
+ </el-form> -->
|
|
|
<el-tabs class="tab-box" v-model="navTab" @tab-click="switchTab">
|
|
|
<el-tab-pane label="全部" name="0"></el-tab-pane>
|
|
|
<el-tab-pane
|
|
|
@@ -195,6 +202,7 @@
|
|
|
class="pagination"
|
|
|
:page.sync="page"
|
|
|
:limit.sync="pageSize"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
@pagination="initCashier"
|
|
|
/>
|
|
|
|
|
|
@@ -1048,7 +1056,7 @@ export default {
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
.pagination {
|
|
|
- position: fixed;
|
|
|
+ position: absolute;
|
|
|
bottom: 10px;
|
|
|
height: 50px;
|
|
|
min-width: 750px;
|
|
|
@@ -1059,7 +1067,7 @@ export default {
|
|
|
// background: #6c757d;
|
|
|
border: 1px solid #eee;
|
|
|
|
|
|
- color: #ffffff;
|
|
|
+ color: #000;
|
|
|
border-radius: 5px;
|
|
|
z-index: 99999;
|
|
|
}
|
|
|
@@ -1383,12 +1391,14 @@ export default {
|
|
|
height: 50px;
|
|
|
.form-item {
|
|
|
margin-right: -2px;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
.input-item {
|
|
|
min-width: 456px;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
.search-goods {
|
|
|
- // height: 50px;
|
|
|
+ height: 40px;
|
|
|
background: #f67f20;
|
|
|
color: #fff;
|
|
|
}
|
|
|
@@ -1511,6 +1521,6 @@ export default {
|
|
|
padding: 0px;
|
|
|
}
|
|
|
::v-deep .el-pagination.is-background span {
|
|
|
- color: #fff;
|
|
|
+ /* color: #fff; */
|
|
|
}
|
|
|
</style>
|
