From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-capacity-scope.vue | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 94936fc..0d6894c 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>
@@ -71,6 +74,12 @@
v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽璞★細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="itemParameterData.entity.sample" @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ </div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -79,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">
@@ -104,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>
@@ -122,6 +131,7 @@
},
data() {
return {
+ logining:false,
radio: '-1',
showItemParameter: true,
showTestObject: false,
@@ -129,13 +139,14 @@
entity: {
inspectionItem: null,
inspectionItemSubclass: null,
+ sample: null,
orderBy: {
field: 'id',
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
row: 2,
do: [{
@@ -217,15 +228,18 @@
props:{
value:'name',
label:'name',
- checkStrictly: false
+ checkStrictly: true,
+ multiple: true
}
},
- requiredAdd: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
+ requiredAdd: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
],
- requiredUp: ['sonLaboratory', 'inspectionItem', 'manHour', 'inspectionItemType', 'inspectionValueType',
- 'unit', 'method', 'price', 'manDay'
- ]
+ requiredUp: ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
+ ],
+ accept: '.xlsx',
+ inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
testObjectData: {
entity: {
@@ -235,8 +249,8 @@
order: 'asc'
}
},
- isIndex: false,
- showSelect: true,
+ isIndex: true,
+ showSelect: false,
select: true,
do: [{
id: 'update',
@@ -303,8 +317,9 @@
tagField: {},
selectField: {},
requiredAdd: ['name','nameEn'],
- requiredUp: ['name','nameEn']
- }
+ requiredUp: ['name','nameEn'],
+ },
+ inPower: true,
}
},
mounted() {
@@ -328,6 +343,7 @@
if (this.radio === '0') {
this.showItemParameter = true;
this.showTestObject = false;
+ this.selectTestObjectByName()
/* this.$nextTick(() => {
this.$refs.itemParameterTable.selectList()
}) */
@@ -342,6 +358,7 @@
this.$refs['itemParameterTable'].selectList()
} else {
this.$refs['testObjectTable'].selectList()
+
}
},
refresh() {
@@ -491,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
@@ -498,7 +516,7 @@
if (power[i].menuMethod == 'selectTestObjectList') {
select += 2
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (power[i].menuMethod == 'upItemParameter') {
up = true
}
@@ -507,6 +525,9 @@
}
if (power[i].menuMethod == 'addItemParameter') {
add = true
+ }
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
}
} else {
if (power[i].menuMethod == 'upTestObject') {
@@ -523,7 +544,7 @@
}
}
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (!del) {
this.itemParameterData.do.splice(1, 1)
}
@@ -542,6 +563,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