From 196c31f1f040c315de09a6808fc9cd63c63f9950 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index d40f8cb..dcbdf55 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -398,17 +398,17 @@
</div>
<div style="flex: 1;overflow-y: auto;" v-loading="productTableLoading0">
<el-table :data="productList0" ref="productTable0" style="width: 100%;" height="94%" tooltip-effect="dark"
- stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0" filter-placement="bottom-start"
+ stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0"
header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler">
<el-table-column type="selection" width="50">
</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"></el-table-column>
+ :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140" show-overflow-tooltip
- :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass"></el-table-column>
+ :filters="filters1" :filter-multiple="false" column-key="inspectionItemSubclass" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" width="130" show-overflow-tooltip :filters="filters"
- :filter-multiple="false" column-key="sonLaboratory"></el-table-column>
+ :filter-multiple="false" column-key="sonLaboratory" filter-placement="bottom-start"></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="200px"></el-table-column>
<el-table-column prop="tell" label="瑕佹眰鎻忚堪" min-width="220px"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" width="200"></el-table-column>
@@ -1341,6 +1341,11 @@
return this.$message.error('璇烽�夋嫨妫�楠岄」')
}
this.moreEditLoad = true
+ for(let a in this.moreInfo){
+ if(this.moreInfo[a]==''){
+ delete this.moreInfo[a]
+ }
+ }
this.$axios.post(this.$api.standardTree.upStandardProducts, {
ids: this.moreSelects.map(a => a.id),
standardProductList: this.moreInfo
--
Gitblit v1.9.3