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 | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/warehouseManage/position/index.vue b/src/views/warehouseManage/position/index.vue
index 5d9c57d..5ab6b05 100644
--- a/src/views/warehouseManage/position/index.vue
+++ b/src/views/warehouseManage/position/index.vue
@@ -15,8 +15,26 @@
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" />
@@ -63,7 +81,8 @@
setTable() {
this.tableList = {
tableInfomation: [],
- selectBox: true,
+ selectBox: false,
+ selectIndex: true,
showcol: this.showcol,
allcol: [],
tableColumn: this.setTableColumn(this.showcol)
@@ -137,11 +156,10 @@
this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
- console.log(row)
- this.editConfig.title = "缂栬緫"
+ tableRowClick(row,val) {
+ this.editConfig.title = val=='look'?'鏌ョ湅':"缂栬緫"
this.editConfig.infomation = { ...row }
- this.editConfig.infomation.parentId = Number(this.editConfig.infomation.parentId)
+ this.editConfig.infomation.parentId = this.editConfig.infomation.parentId?Number(this.editConfig.infomation.parentId):null
this.editConfig.visible = true
},
// 鏂板缓
--
Gitblit v1.8.0