From a0db9daa3a9ea540fd78203e53a9b7d38e9aecd9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 10:56:53 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 3d354d1..c456519 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -505,7 +505,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>
@@ -632,6 +632,7 @@
fileList: [],
inExcelOfTreePower: false,
uploading: false,
+ isEquipment: false,
}
},
watch: {
@@ -670,7 +671,8 @@
this.selectStandardMethods()
this.token = {
'token': sessionStorage.getItem('token')
- }
+ },
+ this.isEquipment = this.PROJECT === '瑁呭鐢电紗' ? true : false
},
methods: {
filterNode(value, data) {
@@ -1289,7 +1291,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,
--
Gitblit v1.9.3