From 7319ab1ce998a7d13f0192a4ccaf92d4a02929f8 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 11 十二月 2024 14:33:43 +0800
Subject: [PATCH] 电路试验上传文件报错
---
src/components/view/a5-capacity-scope.vue | 540 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 519 insertions(+), 21 deletions(-)
diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index 9cd06e3..b971551 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -38,13 +38,24 @@
height: calc(100% - 60px - 80px - 10px - 40px);
padding: 20px;
}
+
+ >>> .el-upload {
+ width: 100% !important;
+ }
+
+ >>> .el-upload-dragger {
+ width: 100% !important;
+ }
+ .mb-10 {
+ margin-bottom: 10px;
+ }
</style>
<template>
<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 +64,12 @@
<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" v-if="radio == 1 && importExcel" @click="uploadDia = true">瀵煎叆</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>
@@ -83,9 +98,12 @@
</div>
</div>
<div class="table">
- <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList"
+ <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList" v-if="PROJECT === '妫�娴嬩腑蹇�'"
:upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
- :componentData="itemParameterData" :key="upIndex" />
+ :inputUrl="$api.capacityScope.importData" :componentData="itemParameterData" :key="upIndex" />
+ <ValueTable ref="itemParameterTable" :url="$api.capacityScope.selectItemParameterList" v-if="PROJECT === '瑁呭鐢电紗'"
+ :upUrl="$api.capacityScope.upItemParameter" :delUrl="$api.capacityScope.delItemParameter"
+ :inputUrl="$api.capacityScope.importEquipData" :componentData="itemParameterData" :key="upIndex" />
</div>
</div>
<div class="bodys">
@@ -110,11 +128,274 @@
<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>
<el-button type="primary" @click="openAdd2" :loading="productLoad">鏂� 澧�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
+ <div style="margin: 0 auto;">
+ <el-upload ref="upload" drag :action="javaApi + $api.capacityScope.importExcel" :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>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ </el-upload>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="uploadDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitUpload()" :loading="uploading">涓� 浼�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog :title="addTitle" :visible.sync="addVisible" width="50%">
+ <span slot="footer" class="dialog-footer">
+ <el-row :gutter="20">
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>妫�楠岄」锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItem"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠岄」EN锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItemEn"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽瓙椤癸細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItemSubclass"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽瓙椤笶N锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItemSubclassEn"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠屽璞★細</div>
+ <div class="search_input">
+ <el-cascader v-model="addForm.sample" :options="itemParameterData.cascaderField.sample.tree" :show-all-levels="false"
+ placeholder="璇烽�夋嫨" clearable
+ size="small" filterable style="width: 100%;" :props="{
+ value:'name',
+ label:'name',
+ checkStrictly: true,
+ multiple: true
+ }"></el-cascader>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">鍗曚环(鍏�)锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.price"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">鍦烘墍锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.laboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.laboratory.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>璇曢獙瀹わ細</div>
+ <div class="search_input">
+ <el-select v-model="addForm.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.sonLaboratory.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">瑕佹眰鎻忚堪锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.askTell"></el-input></div>
+ </div>
+ </el-col><el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">瑕佹眰鍊硷細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.ask"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>璁￠噺鍗曚綅锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.unit" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.unit.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">宸ユ椂(H)锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.manHour"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>棰勮鏃堕棿(H)锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.manDay"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">宸ユ椂鍒嗙粍锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.manHourGroup"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>妫�楠岄」绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.inspectionItemType" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.inspectionItemType.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>妫�楠屽�肩被鍨嬶細</div>
+ <div class="search_input">
+ <el-select v-model="addForm.inspectionValueType" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.inspectionValueType.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">瀛楀吀绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.dic" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.dic.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">鐗规畩鏍囪瘑锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.bsm" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.bsm.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍘熷璁板綍妯℃澘锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.templateId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="item in itemParameterData.selectField.templateId.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠岄」鍒嗙被锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItemClass"></el-input></div>
+ </div>
+ </el-col><el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label">妫�楠岄」鍒嗙被EN锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addForm.inspectionItemClassEn"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="12" class="mb-10">
+ <div class="search_thing">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>璇曢獙鏂规硶锛�</div>
+ <div class="search_input">
+ <el-select v-model="addForm.method" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" multiple>
+ <el-option
+ v-for="item in itemParameterData.selectField.method.select"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ clearable>
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-button @click="addVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addItem" :loading="uploading">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -128,6 +409,8 @@
},
data() {
return {
+ addVisible:false,
+ logining:false,
radio: '-1',
showItemParameter: true,
showTestObject: false,
@@ -146,10 +429,10 @@
select: true,
row: 2,
do: [{
- id: 'update',
+ id: '111',
font: '缂栬緫',
type: 'text',
- method: 'doDiy',
+ method: 'handleEdit',
field: []
}, {
id: 'delete',
@@ -228,12 +511,15 @@
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',
+ needSort: ['createTime', 'updateTime', 'inspectionItem', 'inspectionItemSubclass', 'sample'],
},
testObjectData: {
entity: {
@@ -273,12 +559,12 @@
}
},
requiredAdd: ['specimenName', 'code', 'laboratoryId'],
- requiredUp: ['specimenName', 'code', 'laboratoryId']
+ requiredUp: ['specimenName', 'code', 'laboratoryId'],
+ needSort: ['createTime', 'updateTime', 'specimenName'],
},
itemParameterEntityCopy: {},
testObjectDataEntityCopy: {},
upIndex: 0,
- addDia: false,
addPower: true,
select: 0,
laboratory: [],
@@ -311,11 +597,86 @@
tagField: {},
selectField: {},
requiredAdd: ['name','nameEn'],
- requiredUp: ['name','nameEn']
+ requiredUp: ['name','nameEn'],
+ },
+ inPower: true,
+ importExcel: false,
+ uploadDia: false,
+ fileList: [],
+ token: null,
+ uploading: false,
+ addForm:{
+ inspectionItem:null,
+ inspectionItemEn:null,
+ inspectionItemSubclass:null,
+ inspectionItemSubclassEn:null,
+ sample:[],
+ price:null,
+ laboratory:null,
+ sonLaboratory:null,
+ askTell:null,
+ ask:null,
+ unit:null,
+ manHour:null,
+ manDay:null,
+ manHourGroup:null,
+ inspectionItemType:null,
+ inspectionValueType:null,
+ dic:null,
+ bsm:null,
+ templateId:null,
+ inspectionItemClass:null,
+ inspectionItemClassEn:null,
+ method:[]
+ },
+ addTitle:'鏂板'
+ }
+ },
+ watch: {
+ 'addVisible'(val){
+ if(!val){
+ this.addForm = {
+ inspectionItem:null,
+ inspectionItemEn:null,
+ inspectionItemSubclass:null,
+ inspectionItemSubclassEn:null,
+ sample:[],
+ price:null,
+ laboratory:null,
+ sonLaboratory:null,
+ askTell:null,
+ ask:null,
+ unit:null,
+ manHour:null,
+ manDay:null,
+ manHourGroup:null,
+ inspectionItemType:null,
+ inspectionValueType:null,
+ dic:null,
+ bsm:null,
+ templateId:null,
+ inspectionItemClass:null,
+ inspectionItemClassEn:null,
+ method:[]
+ }
}
}
},
+ created() {
+ if (this.PROJECT === '瑁呭鐢电紗') {
+ this.itemParameterData.requiredUp = ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'manDay', 'templateId'
+ ]
+ } else {
+ this.itemParameterData.requiredUp = ['sonLaboratory', 'inspectionItem', 'inspectionItemType', 'inspectionValueType',
+ 'unit', 'method', 'manDay', 'templateId'
+ ]
+ }
+ },
mounted() {
+ this.token = {
+ 'token': sessionStorage.getItem('token')
+ },
this.itemParameterEntityCopy = this.HaveJson(this.itemParameterData.entity)
this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity)
this.selectEnumByCategory()
@@ -332,6 +693,39 @@
this.getPower('0')
},
methods: {
+ submitUpload() {
+ if (this.$refs.upload.uploadFiles.length == 0) {
+ this.$message.error('鏈�夋嫨鏂囦欢')
+ return
+ }
+ this.uploading = true
+ this.$refs.upload.submit();
+ },
+ onSuccess(response, file, fileList) {
+ this.$refs.upload.clearFiles()
+ this.uploadDia = false
+ this.uploading = false
+ if (response.code == 201) {
+ this.$message.error(response.message)
+ return
+ }
+ this.$message.success('涓婁紶鎴愬姛')
+ this.standardList = []
+ this.productList = []
+ this.refreshTable()
+ },
+ onError(err, file, fileList) {
+ this.$message.error('涓婁紶澶辫触')
+ this.$refs.upload.clearFiles()
+ this.uploading = false
+ },
+ beforeUpload(file, fileList) {
+ if (file.raw.type != 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+ this.$message.error('涓婁紶鏂囦欢鏍煎紡涓嶆纭�');
+ this.$refs.upload.clearFiles()
+ return false;
+ }
+ },
selectorSwitch(radio) {
if (this.radio === '0') {
this.showItemParameter = true;
@@ -349,9 +743,9 @@
refreshTable() {
if (this.radio === '0') {
this.$refs['itemParameterTable'].selectList()
-
} else {
this.$refs['testObjectTable'].selectList()
+
}
},
refresh() {
@@ -361,9 +755,94 @@
},
openAdd() {
if (this.radio === '0') {
- this.$refs.itemParameterTable.openAddDia(this.$api.capacityScope.addItemParameter);
+ // this.$refs.itemParameterTable.openAddDia(this.$api.capacityScope.addItemParameter);
+ this.addTitle = '鏂板'
+ this.addVisible = true
} else {
this.$refs.testObjectTable.openAddDia(this.$api.capacityScope.addTestObject);
+ }
+ },
+ handleEdit(row){
+ this.addTitle = '缂栬緫'
+ this.addForm = this.HaveJson(row)
+ this.addForm.sample = JSON.parse(this.addForm.sample)
+ this.addVisible = true
+ },
+ addItem(){
+ if(!this.addForm.inspectionItem){
+ this.$message.error('璇疯緭鍏ユ楠岄」')
+ return
+ }
+ if(!this.addForm.sonLaboratory){
+ this.$message.error('璇烽�夋嫨璇曢獙瀹�')
+ return
+ }
+ if(!this.addForm.unit){
+ this.$message.error('璇烽�夋嫨璁￠噺鍗曚綅')
+ return
+ }
+ if(!this.addForm.manDay){
+ this.$message.error('璇烽�夋嫨棰勮鏃堕棿')
+ return
+ }
+ if(!this.addForm.inspectionItemType){
+ this.$message.error('璇烽�夋嫨妫�楠岄」绫诲瀷')
+ return
+ }
+ if(!this.addForm.inspectionValueType){
+ this.$message.error('璇烽�夋嫨妫�楠屽�肩被鍨�')
+ return
+ }
+ if(!this.addForm.templateId){
+ this.$message.error('璇烽�夋嫨鍘熷璁板綍妯℃澘')
+ return
+ }
+ if(!this.addForm.method){
+ this.$message.error('璇烽�夋嫨璇曢獙鏂规硶')
+ return
+ }
+ let obj = this.HaveJson(this.addForm)
+ obj.method = JSON.stringify(obj.method)
+ obj.sample = JSON.stringify(obj.sample)
+ this.uploading = true
+ if(obj.id){
+ // 淇敼
+ this.$axios.post(this.$api.capacityScope.upItemParameter, obj, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.uploading = false
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('淇敼鎴愬姛')
+ this.addDia = false
+ this.refreshTable()
+ this.addVisible = false
+ }).catch(e => {
+ this.uploading = false
+ this.addVisible = false
+ })
+ }else{
+ // 鏂板
+ this.$axios.post(this.$api.capacityScope.addItemParameter, obj, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.uploading = false
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('娣诲姞鎴愬姛')
+ this.addDia = false
+ this.refreshTable()
+ this.addVisible = false
+ }).catch(e => {
+ this.uploading = false
+ this.addVisible = false
+ })
}
},
selectEnumByCategory() {
@@ -434,14 +913,20 @@
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.laboratoryList = data0
+ 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
@@ -458,6 +943,7 @@
})
this.itemParameterData.selectField.method.select = data
this.itemParameterData.tagField.method.select = data
+ return
})
},
selectTestObjectByName() {
@@ -466,6 +952,8 @@
this.cascaderFieldData(a)
})
this.itemParameterData.cascaderField.sample.tree = res.data
+ // this.sampleTree = res.data
+ // console.log(2222,res.data)
})
},
cascaderFieldData(val){
@@ -501,6 +989,8 @@
let del = false
let product = false
let select = 0
+ let inPower=false
+ let importExcel = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'selectItemParameterList') {
select += 1
@@ -508,7 +998,7 @@
if (power[i].menuMethod == 'selectTestObjectList') {
select += 2
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (power[i].menuMethod == 'upItemParameter') {
up = true
}
@@ -517,6 +1007,9 @@
}
if (power[i].menuMethod == 'addItemParameter') {
add = true
+ }
+ if (power[i].menuMethod == 'importData') {
+ inPower = true
}
} else {
if (power[i].menuMethod == 'upTestObject') {
@@ -531,9 +1024,12 @@
if (power[i].menuMethod == 'selectProductListByObjectId') {
product = true
}
+ if (power[i].menuMethod == 'importExcel') {
+ importExcel = true
+ }
}
}
- if (this.radio === '0') {
+ if (radio === '0') {
if (!del) {
this.itemParameterData.do.splice(1, 1)
}
@@ -552,7 +1048,9 @@
}
}
this.addPower = add
+ this.inPower=inPower
this.select = select
+ this.importExcel = importExcel
if (select == 1 || select == 3) this.radio = radio
else if (select == 2) this.radio = '1'
else this.radio = '-1'
--
Gitblit v1.9.3