From e267aaa1629571bf8fc6cdcf80152c5558342425 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 九月 2023 16:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/productManage/product/index.vue | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 08c4dcc..6eb0622 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -35,15 +35,16 @@
</div>
<div class="right">
<div class="label">
- <span>鍗楁柟涓濆发SOUTHSILK 19濮嗙背鐪熶笣鐫¤。濂� 100%妗戣殨涓� 闀跨増濂楄瀹� </span>
+ <span>{{ item.name }}</span>
</div>
<div class="price">
<span>浠锋牸:锟�</span>
- <span>{{ item.name }}</span>
+ <span>{{ item.salePrice }}</span>
</div>
<div class="library">
<span>鍦ㄥ簱锛�</span>
- <span>{{ item.name }}</span>
+ <span>{{ item.amount }}</span>
+ <span style="margin-left: 5px">{{ item.unit }}</span>
</div>
</div>
</div>
@@ -62,7 +63,7 @@
</div> -->
</div>
<div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
@@ -98,7 +99,8 @@
infomation: {}
},
isIconIndex: "1", // 1 鍥炬爣 2 鍒楄〃
- url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+ url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
+ pageSizes: [15, 30]
}
},
created() {
@@ -107,6 +109,10 @@
},
methods: {
setTable() {
+ if (this.isIconIndex === "1") {
+ this.pageSizes = [30, 60]
+ this.pagerOptions.pageSize = 30
+ }
this.tableList = {
tableInfomation: [],
selectBox: true,
@@ -127,75 +133,74 @@
let tableColumn = [
{
label: "浜у搧鍚嶇О",
- prop: "id",
+ prop: "name",
isShowColumn: true,
default: true
},
{
label: "鍐呴儴鍙傝��",
- prop: "deviceName",
+ prop: "internalReference",
isShowColumn: showcol.includes("鍐呴儴鍙傝��"),
default: false
},
{
label: "璐熻矗浜�",
- prop: "id",
+ prop: "principal",
isShowColumn: true,
default: true
},
{
label: "浜у搧鏍囩",
- prop: "deviceId",
+ prop: "productTagName",
isShowColumn: showcol.includes("浜у搧鏍囩"),
default: false
},
{
label: "鏉＄爜",
- prop: "shopName",
+ prop: "barcode",
isShowColumn: showcol.includes("鏉＄爜"),
default: false
},
{
label: "閿�鍞环鏍�",
- prop: "faultLevel",
+ prop: "salePrice",
isShowColumn: showcol.includes("閿�鍞环鏍�"),
default: false
},
{
label: "鎴愭湰",
- prop: "status",
+ prop: "cost",
isShowColumn: showcol.includes("鎴愭湰"),
- default: false,
- status: true
+ default: false
},
{
label: "浜у搧绫诲埆",
- prop: "faultTime",
+ prop: "categoryName",
isShowColumn: showcol.includes("浜у搧绫诲埆"),
default: false
},
{
label: "浜у搧绫诲瀷",
- prop: "shopName",
+ prop: "productType",
isShowColumn: showcol.includes("浜у搧绫诲瀷"),
default: false
},
{
label: "鍦ㄥ簱鏁伴噺",
- prop: "faultLevel",
+ prop: "amount",
isShowColumn: showcol.includes("鍦ㄥ簱鏁伴噺"),
default: false
},
- {
- label: "棰勬祴鏁伴噺",
- prop: "status",
- isShowColumn: showcol.includes("棰勬祴鏁伴噺"),
- default: false,
- status: true
- },
+ // {
+ // label: "棰勬祴鏁伴噺",
+ // prop: "status",
+ // isShowColumn: showcol.includes("棰勬祴鏁伴噺"),
+ // default: false,
+ // status: true
+ // },
{
label: "璁￠噺鍗曚綅",
- prop: "faultTime",
+ prop: "unit",
isShowColumn: showcol.includes("璁￠噺鍗曚綅"),
default: false
}
@@ -207,33 +212,34 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
+ async getData(val) {
await getProductList({
- [val]: content,
+ keyWord: val,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
return {
- ...item,
- supplierNumber: item.supplier.number
+ ...item
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ this.pagerOptions.totalCount = res.total
}
})
},
// 鎼滅储
searchClick(val) {
console.log(val)
- this.getData()
+ this.pagerOptions.currPage = 1
+ this.getData(val)
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation = {}
},
// 琛岀偣鍑�
tableRowClick(row) {
@@ -244,7 +250,16 @@
},
// 鍒囨崲鍒楄〃灞曠幇褰㈠紡
selIconSwitchClick(value) {
+ this.pagerOptions.currPage = 1
this.isIconIndex = value
+ if (value === "1") {
+ this.pageSizes = [30, 60]
+ this.pagerOptions.pageSize = 30
+ } else {
+ this.pageSizes = [15, 30]
+ this.pagerOptions.pageSize = 15
+ }
+ this.getData()
}
}
}
@@ -288,8 +303,8 @@
justify-content: flex-start;
align-content: flex-start;
.product-box {
- width: 295px;
- height: 84px;
+ width: 294px;
+ height: 94px;
margin-bottom: 10px;
margin-right: 20px;
border: 1px solid #dee2e6;
@@ -298,6 +313,7 @@
-webkit-box-shadow: inset 0 0 2px #dee2e6;
padding: 8px;
display: flex;
+ align-items: center;
.left {
width: 60px;
text-align: center;
@@ -308,6 +324,7 @@
margin-left: 10px;
.label {
color: #212529;
+ margin-top: -10px;
margin-right: 15px;
word-break: break-all;
word-wrap: break-word;
@@ -315,7 +332,7 @@
.price,
.library {
color: #495057;
- margin-top: 3px;
+ margin-top: 15px;
}
}
}
--
Gitblit v1.8.0