mes-ocea-before.git

			@@ -96,7 +96,9 @@
			<el-table-column prop="required" label="标准值" width="240" ></el-table-column>
			<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
			width="240" style="text-align: center;">

			<template slot-scope="scope">
			<el-col v-if="scope.row.itype === '1'">
			<el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
			class="item" effect="dark" content="请先选择设备！"
			placement="top-start">
			@@ -104,17 +106,31 @@
			@blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
			<span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
			</el-tooltip>
			</el-col>
			<el-col v-else>
			<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
			class="item" effect="dark" content="请先选择设备！" placement="top-start">
			<el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
			<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
			:value="item.value">
			</el-option>
			</el-select>
			<span v-if="resultVal != null && processInspectVo.id != null"
			v-text="scope.row.empiricalValueAddss[index]"></span>
			</el-tooltip>
			</el-col>
			</template>
			</el-table-column>
			<el-table-column prop="deviceName" label="试验设备" min-width="250">
			<template slot-scope="scope">
			<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
			<div v-else>
			<el-select style="width:100%" v-model="scope.row.eId"
			<el-input v-model="scope.row.eId" v-if="scope.row.iname != null" placeholder="请输入设备号"></el-input>
			<!-- <el-select style="width:100%" v-model="scope.row.eId"
			v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
			<el-option v-for="(item,index) in deviceList"
			:key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
			</el-select>
			</el-select> -->
			</div>
			</template>
			</el-table-column>
			@@ -175,6 +191,13 @@
			export default {
			data() {
			return {
			dataVal: [{
			label: '是',
			value: '是'
			}, {
			label: '否',
			value: '否'
			}],
			resultVal: null,
			deviceList: [],
			hasChildren: true,
			@@ -220,6 +243,7 @@
			this.init()
			},
			methods: {

			submitSave(){
			let pro = 0
			this.inspectionItems.forEach(item => {
			@@ -323,7 +347,8 @@
			},
			getDeviceList(){
			selectDevice(null).then(res=>{
			this.deviceList = res.data.data
			// this.deviceList = res.data.data
			console.log(res);
			})
			},
			updateDevice(row,index){