From e003130bcb7af893866852c95cf3e29bb895a5a8 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 24 五月 2024 13:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-capacity-scope.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index bf1c8c9..48f9b5e 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -53,8 +53,11 @@
<el-button size="medium" type="primary" v-else-if="select==2">妫�楠屽璞�</el-button>
</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" @click="$refs.itemParameterTable.openUpload()" v-if="inPower">
+ <i class="el-icon-upload2" style="color: #3A7BFA;"></i>
+ <span style="color: #3A7BFA;">瀵煎叆</span></el-button>
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
- <!-- <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button> -->
+ <el-button size="medium" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
@@ -85,7 +88,7 @@
<div class="table">
<ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
:upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
- :componentData="itemParameterData" :key="upIndex" />
+ :inputUrl="$api.capacityScope.importData" :componentData="itemParameterData" :key="upIndex" />
</div>
</div>
<div class="bodys">
@@ -110,7 +113,7 @@
<div class="body" v-if="diaProduct" style="height: 350px;overflow-y: auto;padding: 5px 0;">
<ValueTable ref="productData" :url="$api.capacityScope.selectProductListByObjectId"
:upUrl="$api.capacityScope.upProduct" :delUrl="$api.capacityScope.delProduct"
- :componentData="productData" :key="upIndex" />
+ :componentData="productData" :key="upIndex"/>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
@@ -128,6 +131,7 @@
},
data() {
return {
+ logining:false,
radio: '-1',
showItemParameter: true,
showTestObject: false,
@@ -233,7 +237,9 @@
],
requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
'unit', 'method', 'manDay', 'templateId'
- ]
+ ],
+ accept: '.xlsx',
+ inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
testObjectData: {
entity: {
@@ -311,8 +317,9 @@
tagField: {},
selectField: {},
requiredAdd: ['name','nameEn'],
- requiredUp: ['name','nameEn']
- }
+ requiredUp: ['name','nameEn'],
+ },
+ inPower: true,
}
},
mounted() {
@@ -349,9 +356,9 @@
refreshTable() {
if (this.radio === '0') {
this.$refs['itemParameterTable'].selectList()
-
} else {
this.$refs['testObjectTable'].selectList()
+
}
},
refresh() {
@@ -501,6 +508,7 @@
let del = false
let product = false
let select = 0
+ let inPower=false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'selectItemParameterList') {
select += 1
@@ -518,6 +526,7 @@
if (power[i].menuMethod == 'addItemParameter') {
add = true
}
+
} else {
if (power[i].menuMethod == 'upTestObject') {
up = true
@@ -530,6 +539,9 @@
}
if (power[i].menuMethod == 'selectProductListByObjectId') {
product = true
+ }
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
}
}
}
@@ -552,6 +564,7 @@
}
}
this.addPower = add
+ this.inPower=inPower
this.select = select
if (select == 1 || select == 3) this.radio = radio
else if (select == 2) this.radio = '1'
--
Gitblit v1.9.3