mes-ocea-before.git

			@@ -118,12 +118,12 @@
			:cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
			style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
			<el-table-column type="index" label="序号" width="60"></el-table-column>
			<el-table-column label="项目" prop="father" width="240" ></el-table-column>
			<el-table-column prop="iname" label="指标" width="240" ></el-table-column>
			<el-table-column prop="iunit" label="单位" width="240" ></el-table-column>
			<el-table-column prop="required" label="标准值" width="240" ></el-table-column>
			<el-table-column label="项目" prop="father" show-overflow-tooltip width="140" ></el-table-column>
			<el-table-column prop="iname" label="指标" show-overflow-tooltip width="140" ></el-table-column>
			<el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140" ></el-table-column>
			<el-table-column prop="required" label="标准值" width="140" show-overflow-tooltip ></el-table-column>
			<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
			width="240" style="text-align: center;">
			width="140" 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"
			@@ -148,11 +148,11 @@
			</el-col>
			</template>
			</el-table-column>
			<el-table-column prop="deviceName" label="试验设备" min-width="250">
			<el-table-column prop="deviceName" label="试验设备" min-width="200">
			<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:80%" v-model="scope.row.eId"
			<el-select style="width:60%" v-model="scope.row.eId"
			v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
			<el-option v-for="(item,index) in deviceList"
			:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
			@@ -167,7 +167,7 @@
			</template>
			</el-table-column>
			<el-table-column prop="inspectionValue"
			label="检验描述" width="240" style="text-align: center;">
			label="检验描述" width="140" 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"
			@@ -214,9 +214,9 @@
			<el-col :span="24">
			<el-table border height="90" :data="inspectionResultForm"
			:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
			:cell-style="{textAlign:'center'}">
			<el-table-column prop="materialCode" label="物料编号"></el-table-column>
			<el-table-column prop="material" label="物料名称"></el-table-column>
			:cell-style="{textAlign: 'center'}">
			<el-table-column prop="materialCode" width="200" label="物料编号" show-overflow-tooltip></el-table-column>
			<el-table-column prop="material" width="200" label="物料名称" show-overflow-tooltip></el-table-column>
			<el-table-column prop="userName" label="检验员"></el-table-column>
			<el-table-column prop="result" label="检验结论">
			<template slot-scope="scope">
			@@ -298,7 +298,7 @@
			mcode: null,
			prname: null,
			sname: null,
			orderNumber: "ZTTIC20230001",
			orderNumber: null,
			qualityTraceability: null,
			quantity: null,
			specificationsModel: null,
			@@ -337,7 +337,6 @@
			this.deviceCode = false
			},
			getDeviceResultInfo(val){
			console.log("扫描后数据",val);
			let id=val.split("id@")[1]
			if(id!=undefined&&id!=''&&id!=null){
			let filterData=this.deviceList.filter(item=>{
			@@ -348,7 +347,7 @@
			this.updateDevice(this.row)
			}else{
			this.$message({
			message: '未识别出二位码计量器具信息！',
			message: '未识别出计量器具信息！',
			type: 'warning'
			});
			}
			@@ -486,14 +485,30 @@
			}
			})
			this.inspectionItems = result.children
			let rVal = ''
			let passNum = 0
			let unPassNum = 0
			this.inspectionItems.forEach(item => {
			if (item.children) {
			item.children.forEach(obj => {
			if(obj.iresult == 0){
			unPassNum += 1
			}
			if(obj.iresult == 1){
			passNum+=1
			}
			})
			}
			})
			rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
			this.inspectionResultForm = [{
			materialCode: result.materialCode,
			material: result.material,
			userName: Array.from(new Set(userList)).join(","),
			result: this.resultVal==null ? '' : this.resultVal,
			result: this.resultVal==null ? rVal : this.resultVal,
			}]
			}).catch(error=>{
			console.log(error)
			console.error(error)
			})
			}
			},