From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b2-standard.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 0884527..7fb2149 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -231,7 +231,10 @@
@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="inspectionItemClass" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被(EN)" min-width="140" 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> -->
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" min-width="140"
@@ -428,6 +431,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>
@@ -503,7 +507,7 @@
</el-dialog>
<el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
<div style="margin: 0 auto;">
- <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree" :headers="token" :file-list="fileList" name="file"
+ <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree + '/' + isEquipment" :headers="token" :file-list="fileList" name="file"
:auto-upload="false" accept=".xlsx" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
:on-error="onError">
<i class="el-icon-upload"></i>
@@ -630,6 +634,7 @@
fileList: [],
inExcelOfTreePower: false,
uploading: false,
+ isEquipment: false,
}
},
watch: {
@@ -668,7 +673,8 @@
this.selectStandardMethods()
this.token = {
'token': sessionStorage.getItem('token')
- }
+ },
+ this.isEquipment = this.PROJECT === '瑁呭鐢电紗' ? true : false
},
methods: {
filterNode(value, data) {
@@ -703,7 +709,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
}
@@ -1287,7 +1293,7 @@
})
} else {
this.$axios.post(this.$api.standardTree.upStandardProducts, {
- ids: this.moreSelects.map(a => a.id),
+ ids: JSON.stringify(this.moreSelects.map(a => a.id)),
standardProductList: {
section: this.sectionRow.section,
ask: this.sectionRow.ask,
@@ -1446,7 +1452,8 @@
getItemEnum() {
this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId, {
id: this.standardId,
- tree: this.selectTree
+ tree: this.selectTree,
+ item:this.inspectionItem
}).then(res => {
this.filters0 = []
this.filters1 = []
--
Gitblit v1.9.3