From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/a5-capacity-scope.vue | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 3618d06..55e1e40 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -44,7 +44,7 @@
<div class="capacity-scope">
<div>
<el-row class="title">
- <el-col :span="12">
+ <el-col :span="12" style="text-align: left">
<el-radio-group v-model="radio" @input="selectorSwitch" size="medium" fill="#3A7BFA" v-if="select==3">
<el-radio-button label="0">妫�楠岄」鐩弬鏁�</el-radio-button>
<el-radio-button label="1">妫�楠屽璞�</el-radio-button>
@@ -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,
@@ -224,15 +228,18 @@
props:{
value:'name',
label:'name',
- checkStrictly: true
+ 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: {
@@ -310,8 +317,9 @@
tagField: {},
selectField: {},
requiredAdd: ['name','nameEn'],
- requiredUp: ['name','nameEn']
- }
+ requiredUp: ['name','nameEn'],
+ },
+ inPower: true,
}
},
mounted() {
@@ -335,6 +343,7 @@
if (this.radio === '0') {
this.showItemParameter = true;
this.showTestObject = false;
+ this.selectTestObjectByName()
/* this.$nextTick(() => {
this.$refs.itemParameterTable.selectList()
}) */
@@ -349,6 +358,7 @@
this.$refs['itemParameterTable'].selectList()
} else {
this.$refs['testObjectTable'].selectList()
+
}
},
refresh() {
@@ -431,14 +441,19 @@
obtainItemParameterList() {
this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
let data = []
+ let data0 = []
res.data.forEach(a => {
data.push({
label: a.laboratoryName,
value: a.id
})
+ data0.push({
+ label: a.laboratoryName,
+ value: a.laboratoryName
+ })
})
- this.itemParameterData.selectField.laboratory.select = data
- this.itemParameterData.tagField.laboratory.select = data
+ this.itemParameterData.selectField.laboratory.select = data0
+ this.itemParameterData.tagField.laboratory.select = data0
this.testObjectData.selectField.laboratoryId.select = data
this.testObjectData.tagField.laboratoryId.select = data
this.laboratory = data
@@ -498,6 +513,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
@@ -505,7 +521,7 @@
if (power[i].menuMethod == 'selectTestObjectList') {
select += 2
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (power[i].menuMethod == 'upItemParameter') {
up = true
}
@@ -514,6 +530,9 @@
}
if (power[i].menuMethod == 'addItemParameter') {
add = true
+ }
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
}
} else {
if (power[i].menuMethod == 'upTestObject') {
@@ -530,7 +549,7 @@
}
}
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (!del) {
this.itemParameterData.do.splice(1, 1)
}
@@ -549,6 +568,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