From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/warehouseManage/position/index.vue | 108 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 30 deletions(-)
diff --git a/src/views/warehouseManage/position/index.vue b/src/views/warehouseManage/position/index.vue
index fe6eb63..5ab6b05 100644
--- a/src/views/warehouseManage/position/index.vue
+++ b/src/views/warehouseManage/position/index.vue
@@ -15,24 +15,46 @@
ref="tableListRef"
:table-list="tableList"
:show-checkcol="false"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ @click="tableRowClick(scope.row,'edit')"
+ type="text"
+ size="small"
+ >缂栬緫</el-button
+ >
+ <el-button
+ type="text"
+ size="small"
+ @click="tableRowClick(scope.row,'look')"
+ >鏌ョ湅</el-button
+ >
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
<!-- 鏂板缓/缂栬緫 -->
- <AddDialog 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 { getLocationList } from "@/api/warehouseManage/warehouse"
import AddDialog from "@/views/warehouseManage/position/AddDialog"
-
+import { getDataByType } from "@/api/data"
export default {
name: "WarehouseView",
props: {},
@@ -47,7 +69,8 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ positionTypeList: getDataByType("positionType")
}
},
created() {
@@ -58,7 +81,8 @@
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -77,57 +101,81 @@
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 = "缂栬緫"
+ tableRowClick(row,val) {
+ this.editConfig.title = val=='look'?'鏌ョ湅':"缂栬緫"
this.editConfig.infomation = { ...row }
+ this.editConfig.infomation.parentId = this.editConfig.infomation.parentId?Number(this.editConfig.infomation.parentId):null
+ 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