From a15fb376f2a52a36be5ce2f1eeaf252a509dfcb7 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 14:45:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard-table/product.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue
index 80f18e1..6141739 100644
--- a/src/components/view/standard-table/product.vue
+++ b/src/components/view/standard-table/product.vue
@@ -35,9 +35,9 @@
/* .standard .el-table__body {
height: 100%;
} */
- .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
+ /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
padding-left: 23px !important;
- }
+ } */
</style>
<template>
<div class="standard">
@@ -67,19 +67,37 @@
<span>{{scope.row.device}}</span>
</template>
</el-table-column>
- <el-table-column prop="productFather" label="椤圭洰"></el-table-column>
+ <el-table-column prop="productFather" label="椤圭洰">
+ <template slot-scope="scope">
+ <el-tag type="info" v-if="scope.row.productFather != null">04</el-tag>
+ <span>{{scope.row.productFather}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="productFather" hidden></el-table-column>
<el-table-column prop="unit" label="鍗曚綅"></el-table-column>
<el-table-column prop="product" label="鎸囨爣"></el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" @click="updateProduct(scope.row)">缂栬緫</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</template>
<script>
export default ({
data() {
-
+ return {
+ deviceGroupDialog:false,
+ selects: [],
+ isAllSelect:false,
+ }
},
props:['tableData','tableType'],
methods:{
+ updateProduct(row){
+ console.log(row);
+ },
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
selectAll(val) {
--
Gitblit v1.9.3