From 72ac5494a32173d69ed739e1dd672cc1b9c03f92 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期二, 12 九月 2023 17:52:42 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before --- src/components/view/standard-table/product.vue | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue index 80f18e1..95a0782 100644 --- a/src/components/view/standard-table/product.vue +++ b/src/components/view/standard-table/product.vue @@ -67,7 +67,12 @@ <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">03</el-tag> + <span>{{scope.row.productFather}}</span> + </template> + </el-table-column> <el-table-column prop="unit" label="鍗曚綅"></el-table-column> <el-table-column prop="product" label="鎸囨爣"></el-table-column> </el-table> @@ -76,7 +81,11 @@ <script> export default ({ data() { - + return { + deviceGroupDialog:false, + selects: [], + isAllSelect:false, + } }, props:['tableData','tableType'], methods:{ -- Gitblit v1.9.3