From 9ab353d083dd22a90a8a0f09b9b7b756d58cc1bd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 15:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard-table/material.vue | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index b317e40..2f53cc6 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -9,26 +9,25 @@
</el-table-column>
<el-table-column type="index" width="60" label="搴忓彿">
</el-table-column>
- <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+ <el-table-column prop="father" label="宸ュ簭" :resizable="false">
<template slot-scope="scope">
- <el-tag v-if="scope.row.father != null" type="primary">01</el-tag>
+ <el-tag class="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="tname" sortable label="宸ヨ壓鍚嶇О">
+ <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.tname != null"
- style="margin-left:20px;">02</el-tag>
+ <el-tag type="success" v-if="scope.row.tname != null" class="tag">02</el-tag>
<span style="color: #000000">
{{ scope.row.tname }}
</span>
</template>
</el-table-column>
- <el-table-column prop="mname" label="鏉愭枡鍚嶇О">
+ <el-table-column prop="mname" label="鏉愭枡鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" color="#faf2ff" v-if="scope.row.mname != null">
+ <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.mname != null">
<span style="color: #e1affb">03</span>
</el-tag>
<span>
@@ -36,11 +35,11 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="specifications" label="瑙勬牸">
+ <el-table-column prop="specifications" label="瑙勬牸" :resizable="false">
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅">
+ <el-table-column prop="unit" label="鍗曚綅" :resizable="false">
</el-table-column>
- <el-table-column prop="num" label="鏁伴噺">
+ <el-table-column prop="num" label="鏁伴噺" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.num"
v-if="scope.row.mname != null" size="small"
@@ -149,6 +148,17 @@
width: 100%;
height: 100%;
}
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
+ }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
</style>
<style>
.standard * {
--
Gitblit v1.9.3