From 04489cc3864aa38fde8b539aee6c4c9eed6ab1d4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 28 九月 2023 14:35:35 +0800
Subject: [PATCH] 解决产品列表报错
---
src/views/warehouseManage/position/index.vue | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/src/views/warehouseManage/position/index.vue b/src/views/warehouseManage/position/index.vue
index eb15f44..5d9c57d 100644
--- a/src/views/warehouseManage/position/index.vue
+++ b/src/views/warehouseManage/position/index.vue
@@ -23,20 +23,24 @@
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddDialog
+ v-if="editConfig.visible"
+ @refresh="refresh"
+ :positionList="tableList.tableInfomation"
+ :edit-common-config="editConfig"
+ />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
-// import DetailProduct from "@/views/productManage/product/DetailProduct"
-import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
-
+import { getLocationList } from "@/api/warehouseManage/warehouse"
+import AddDialog from "@/views/warehouseManage/position/AddDialog"
+import { getDataByType } from "@/api/data"
export default {
name: "WarehouseView",
props: {},
- components: { AddScrapDialog },
+ components: { AddDialog },
mixins: [pageMixin],
computed: {},
data() {
@@ -47,7 +51,8 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ positionTypeList: getDataByType("positionType")
}
},
created() {
@@ -77,57 +82,82 @@
let tableColumn = [
{
label: "浣嶇疆",
- prop: "id",
+ prop: "jointName",
isShowColumn: true,
default: true
},
{
label: "浣嶇疆绫诲瀷",
- prop: "deviceName",
+ prop: "type",
isShowColumn: true,
- default: true
+ default: true,
+ conversion: true,
+ getStatus: this.getTypesList
}
]
return tableColumn
+ },
+ getTypesList(val) {
+ let string = "--"
+ if (val) {
+ for (let i in this.positionTypeList) {
+ if (this.positionTypeList[i].id == val) {
+ return this.positionTypeList[i].name
+ }
+ }
+ }
+ return string
},
selTableCol(val) {
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
+ async getData() {
+ await getLocationList({
+ keyword: this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
- return {
- ...item,
- supplierNumber: item.supplier.number,
- status: "鑽夌",
- preTime: "2023-09-04 11:20:00"
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.tableList.tableInfomation = list
+ this.pagerOptions.totalCount = res.total
}
})
},
+ refresh() {
+ this.pagerOptions.currPage = 1
+ this.getData()
+ },
// 鎼滅储
getList(val) {
- console.log(val)
+ this.keyword = val
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.infomation.parentId = Number(this.editConfig.infomation.parentId)
+ this.editConfig.visible = true
},
// 鏂板缓
addBtnClick() {
+ this.editConfig.infomation = {
+ name: "",
+ parentId: null,
+ type: 3,
+ isScrapLocation: null,
+ isReturnLocation: null,
+ replenishLocation: null,
+ countFrequency: 0,
+ recentlyCount: "",
+ nextCount: "",
+ notes: ""
+ }
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
}
--
Gitblit v1.8.0