From 7965761658b890fce87de832a1ae76cc82a3c33b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 12:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard-table/material.vue | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index d4d1d4d..7ae1a84 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -1,8 +1,8 @@
<template>
<div class="standard">
<div>
- <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
- @selection-change="handleSelectionChange" default-expand-all
+ <el-table :data="tableData" max-height="675" style="width: 100%;margin-bottom: 20px;" row-key="rowId" border
+ @selection-change="handleSelectionChange" default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="selection" width="55">
</el-table-column>
@@ -10,29 +10,29 @@
</el-table-column>
<el-table-column prop="father" label="宸ュ簭" sortable width="200px">
<template slot-scope="scope">
- <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
- <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
- 01
- </div>
- </el-tag>
- <span style="color: black">
- {{ scope.row.father }}
- </span>
+ <el-tag v-if="scope.row.father != null" type="primary">01</el-tag>
+ <span style="color: #000000">
+ {{ scope.row.father }}
+ </span>
</template>
</el-table-column>
- <el-table-column prop="tanme" sortable label="宸ヨ壓鍚嶇О">
- <!-- <template slot-scope="scope">
- <el-tag v-if="!scope.row.children">
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- 02
- </div>
- </el-tag>
- <span style="color: black">
- {{ scope.row.tname }}
- </span>
- </template> -->
+ <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.tname != null">02</el-tag>
+ <span style="color: black">
+ {{ scope.row.tname }}
+ </span>
+ </template>
</el-table-column>
<el-table-column prop="mname" label="鏉愭枡鍚嶇О">
+ <template slot-scope="scope">
+ <el-tag type="info" color="#faf2ff" v-if="scope.row.mname != null">
+ <span style="color: #e1affb">03</span>
+ </el-tag>
+ <span>
+ {{scope.row.mname}}
+ </span>
+ </template>
</el-table-column>
<el-table-column prop="specifications" label="瑙勬牸">
</el-table-column>
@@ -49,6 +49,7 @@
export default {
data() {
return {
+ hasChildren:true,
selects: []
}
},
--
Gitblit v1.9.3