From c7b4ae684df22079459495e04dc5566c891ba4a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 26 三月 2024 13:57:27 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dcba552..c88f576 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -74,7 +74,7 @@
.standard .has-gutter .el-table__cell .cell {
line-height: 38px;
- background-color: #fafafa;
+ background-color: #f8f8f8;
}
.standard .has-gutter .el-table__cell {
@@ -155,9 +155,11 @@
</el-table>
</el-row>
<el-row class="product_table" v-loading="tableLoad2">
- <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe :fit="true" border
- @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" @select="upProductSelect">
- <el-table-column type="selection" width="65"></el-table-column>
+ <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe
+ :fit="true" border @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
+ @select="upProductSelect">
+ <el-table-column type="selection" width="65">
+ </el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
@@ -174,8 +176,8 @@
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px">
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鎻忚堪" v-model="scope.row.tell" clearable
- @change="(value)=>upStandardProductListOfTell(value,scope.row.id)" v-if="upStandardProduct" type="textarea"
- :autosize="{ minRows: 1, maxRows: 3}"></el-input>
+ @change="(value)=>upStandardProductListOfTell(value,scope.row.id)" v-if="upStandardProduct"
+ type="textarea" :autosize="{ minRows: 1, maxRows: 3}"></el-input>
<span v-else>{{scope.row.ask}}</span>
</template>
</el-table-column>
@@ -590,7 +592,6 @@
}).then(res => {
this.tableLoad = false
this.standardList = res.data.standardMethodList
- this.productList = res.data.standardProductList
})
},
getPower() {
--
Gitblit v1.9.3