From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 2eafd6e..cb94088 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -143,7 +143,7 @@
</el-row>
<el-row class="standard_table" v-loading="tableLoad">
<el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;overflow-y: auto;" tooltip-effect="dark"
- highlight-current-row @row-click="rowClick" ref="standard" :key="Math.random()">
+ highlight-current-row @row-click="rowClick" ref="standard">
<el-table-column prop="code" label="鏍囧噯缂栧彿" show-overflow-tooltip width="180">
<template slot-scope="scope">
<span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -763,7 +763,8 @@
rowClick(row, column, event) {
this.tableLoad2 = true
this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
- id: row.id
+ id: row.id,
+ tree: this.selectTree
}).then(res => {
this.productList = res.data
setTimeout(() => {
--
Gitblit v1.9.3