From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard-table/product.vue | 94 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue
index 80f18e1..64427a4 100644
--- a/src/components/view/standard-table/product.vue
+++ b/src/components/view/standard-table/product.vue
@@ -1,12 +1,14 @@
<style scoped>
- .standard {
- width: 100%;
- height: 100%;
- }
.standard * {
font-size: 14px;
}
-
+
+ .standard {
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ }
+
.standard .has-gutter .el-table__cell {
background-color: #F0F1F5 !important;
color: #333;
@@ -22,22 +24,17 @@
padding-left: 17px !important;
}
- .standard {
- width: 100%;
- height: 100%;
- overflow: auto;
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
}
-
- /* .standard .el-table__body-wrapper {
- height: 100%;
- } */
-
- /* .standard .el-table__body {
- height: 100%;
- } */
- .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
- padding-left: 23px !important;
- }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
</style>
<template>
<div class="standard">
@@ -47,40 +44,50 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="60" label="搴忓彿"></el-table-column>
- <el-table-column prop="father" label="宸ュ簭">
+ <el-table-column prop="father" label="宸ュ簭" width="200" :resizable="false">
<template slot-scope="scope">
- <el-tag type="primary" v-if="scope.row.father != null">01</el-tag>
+ <el-tag type="primary" class="tag" v-if="scope.row.father != null">01</el-tag>
<span>{{scope.row.father}}</span>
</template>
</el-table-column>
- <el-table-column prop="name" label="宸ヨ壓鍚嶇О">
+ <el-table-column prop="name" label="宸ヨ壓鍚嶇О" width="200" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.name != null">02</el-tag>
+ <el-tag type="success" class="tag" v-if="scope.row.name != null">02</el-tag>
<span>{{scope.row.name}}</span>
</template>
</el-table-column>
- <el-table-column prop="device" label="璁惧鍚嶇О">
+ <el-table-column prop="device" label="璁惧鍚嶇О" width="200" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" color="#faf2ff" v-if="scope.row.device != null">
+ <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.device != null">
<span style="color: #e1affb">03</span>
</el-tag>
<span>{{scope.row.device}}</span>
</template>
</el-table-column>
- <el-table-column prop="productFather" label="椤圭洰"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅"></el-table-column>
- <el-table-column prop="product" label="鎸囨爣"></el-table-column>
+ <el-table-column prop="productFather" label="椤圭洰" width="200" :resizable="false">
+ <template slot-scope="scope">
+ <el-tag type="info" class="tag" v-if="scope.row.productFather != null">04</el-tag>
+ <span>{{scope.row.productFather}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" :resizable="false"></el-table-column>
+ <el-table-column prop="product" label="鎸囨爣" :resizable="false"></el-table-column>
</el-table>
</div>
</template>
<script>
export default ({
data() {
-
+ return {
+ deviceGroupDialog:false,
+ selects: [],
+ isAllSelect:false,
+ deleteList:[],
+ }
},
props:['tableData','tableType'],
methods:{
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
+ // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
selectAll(val) {
this.isAllSelect = !this.isAllSelect;
@@ -116,13 +123,32 @@
}
}
},
+ //鏀瑰彉閫変腑
+ toggleSelection(row, flag) {
+ this.$set(row, "isChecked", flag);
+ this.$nextTick(() => {
+ if (flag) {
+ this.$refs.multipleTable.toggleRowSelection(row, flag);
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ });
+ },
handleSelectionChange(val) {
this.deleteList = [];
val.forEach((v) => {
- if (v.id !== undefined) {
- this.deleteList.push(v.id);
- }
+ this.searchIdFun(v);
});
+ this.$emit("childData",this.deleteList);
+ },
+ //閫掑綊鏌ユ壘閫変腑鏁版嵁id
+ searchIdFun(data){
+ let obj = data;
+ if(obj.children != undefined){
+ this.searchIdFun(obj.children);
+ }else{
+ this.deleteList.push(obj.tqid);
+ }
},
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 缁撴潫
}
--
Gitblit v1.9.3