From 6ac18f8f47c6cf75ac93cc72b8a4d1588446f4e1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 21 六月 2024 10:00:37 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b2-standard.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 345c03a..cf1527d 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -231,6 +231,7 @@
@select="upProductSelect" @select-all="handleAll" class="productTable" header-row-class-name="header-class">
<el-table-column type="selection" width="50">
</el-table-column>
+ <el-table-column prop="sample" label="浜у搧" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></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> -->
@@ -428,6 +429,7 @@
header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
<el-table-column type="selection" width="50">
</el-table-column>
+ <el-table-column prop="sample" label="浜у搧" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filters="filters0"
:filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
@@ -456,7 +458,7 @@
</div>
</div>
</el-dialog>
- <el-dialog title="鍖洪棿璁剧疆" :visible.sync="sectionUpDia" width="70%">
+ <el-dialog title="鍖洪棿璁剧疆" :visible.sync="sectionUpDia" width="70%" :close-on-click-modal="false">
<div class="body" style="padding: 5px 0;">
<el-table :data="sectionList" border style="width: 100%" height="350px">
<el-table-column type="index" label="搴忓彿" width="70" align="center">
@@ -498,7 +500,7 @@
<span slot="footer" class="dialog-footer">
<el-button @click="sectionUpDia = false">鍙� 娑�</el-button>
<el-button type="primary" @click="sectionLoadAdd" :loading="sectionLoad">淇� 瀛�</el-button>
- <el-button type="primary" @click="sectionList.push({thing: ''})" icon="el-icon-plus"></el-button>
+ <el-button type="primary" @click="sectionList.push({thing: '',price: sectionRow.price,manHour: sectionRow.manHour})" icon="el-icon-plus"></el-button>
</span>
</el-dialog>
<el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
@@ -703,7 +705,7 @@
getNodeParent(val) {
if (val.parent != null) {
if(val.data.children === null){
- this.selectTree += ' - ' + val.label + ' - ' + ''
+ this.selectTree += ' - ' + val.label + ' - ' + 'null'
}else{
this.selectTree += ' - ' + val.label
}
@@ -1218,6 +1220,7 @@
}
this.sectionRow = {}
this.sectionUpDia = true
+ this.sectionList = []
} else {
// 鍊兼槸涓�涓璞�
this.sectionRow = row
--
Gitblit v1.9.3