mes-ocea-before.git

			@@ -13,10 +13,16 @@
			</div>
			<div class="page-main">
			<div class="finishedProduct-basic">
			<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
			label-position="right" label-width="120px" style="width: 100%" size="small">
			<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
			label-position="right" label-width="120px" style="width: 100%" size="small">
			<div class="formwrapper">
			<el-row>
			<el-col :span="6">
			<el-form-item label="产品检验编号：">
			<el-input @blur="selectInfoByOrderId" disabled
			v-model="processInspectVo.finInsNo" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="订单号：">
			<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
			@@ -35,6 +41,8 @@
			placeholder="请输入工程名称" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="产品名称：">
			<el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
			@@ -45,8 +53,6 @@
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="产品编码：">
			<el-input disabled v-model="processInspectVo.mcode"
			@@ -65,6 +71,8 @@
			placeholder="请输入单位" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="数量：">
			<el-input v-model="processInspectVo.quantity" placeholder="请输入数量"
			@@ -86,7 +94,7 @@
			<el-row style="width:100%;">
			<el-col :span="24">
			<el-table border :data="inspectionItems" height="400"
			:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
			:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
			: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>
			@@ -96,10 +104,10 @@
			<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"
			<el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
			class="item" effect="dark" content="请先选择设备！"
			placement="top-start">
			<el-input :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]"
			@@ -125,15 +133,47 @@
			<template slot-scope="scope">
			<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
			<div v-else>
			<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"
			<!-- <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"
			<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>
			<el-table-column prop="inspectionValue" :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">

			<el-input :disabled="scope.row.eId == null"
			v-model="scope.row.inote"
			@blur="changeState(scope.row, index)" placeholder="请输入检验描述"></el-input>

			<span v-if="resultVal != null && processInspectVo.id != null"
			v-text="scope.row.inote"></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-input :disabled="scope.row.eId == null"
			v-model="scope.row.inote"
			@blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
			<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" 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.inote"></span>
			</el-tooltip>
			</el-col>
			</template>
			</el-table-column>
			<el-table-column label="结论" fixed="right" min-width="100">
			<template slot-scope="scope">
			<div v-if="scope.row.iname!=null">
			@@ -154,7 +194,7 @@
			<el-row style="width:100%;">
			<el-col :span="24">
			<el-table border height="90" :data="inspectionResultForm"
			:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
			: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>
			@@ -179,13 +219,14 @@
			</template>

			<script>
			import {
			import {
			chooseMater,
			addFinish,
			queryById,
			updateDeviceById,
			updateFinishedInsProduct,
			updateFinishedInspectById,
			selectDeviceAPI,
			} from '@/api/quality/finishedProduct'
			import { selectDevice } from '@/api/quality/rawMaterial'
			export default {
			@@ -208,6 +249,7 @@
			empiricalValueAddMaxNumber: 0,
			processInspectVo: {
			id: null,
			finInsNo: null,
			material: null,
			mcode: null,
			prname: null,
			@@ -217,7 +259,8 @@
			quantity: null,
			specificationsModel: null,
			unit: null,
			technologyId: null
			technologyId: null,
			documentId: null
			},
			inspectionItems: [], // 新增检验项目表格
			inspectionResultForm: [],
			@@ -306,6 +349,7 @@
			if(id != null){
			queryById(id).then(res=>{
			let result = res.data.data
			this.processInspectVo.finInsNo = result.finInsNo
			this.processInspectVo.orderNumber = result.orderNumber
			this.processInspectVo.mcode = result.materialCode
			this.processInspectVo.prname = result.customerName
			@@ -314,6 +358,7 @@
			this.processInspectVo.specificationsModel = result.specs
			this.processInspectVo.unit = result.punit
			this.processInspectVo.quantity = result.quantity
			this.processInspectVo.documentId = result.documentId
			let userList = []
			result.children.forEach(item=>{
			item.iid = Math.random()
			@@ -327,6 +372,9 @@
			arr = obj.inspectionValue.split(",")
			}
			obj.empiricalValueAddss = arr
			if(obj.note){
			snote=obj.inote
			}
			if(arr.length > this.empiricalValueAdd){
			this.empiricalValueAdd = arr.length
			}
			@@ -346,19 +394,34 @@
			}
			},
			getDeviceList(){
			selectDevice(null).then(res=>{
			selectDeviceAPI(null).then(res=>{
			// this.deviceList = res.data.data
			console.log(res);
			this.deviceList = res.data.data

			})
			},
			updateDevice(row,index){
			updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
			let rowId=JSON.stringify(row.iid)
			console.log(row);
			updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
			this.inspectionItems.forEach(obj=>{
			if(obj.children){
			obj.children[index-1].inspectionValue = ''
			obj.children[index-1].iresult = null
			obj.children[index-1].empiricalValueAddss = []
			}
			obj.children.forEach(c=>{
			if(c.iid==rowId){
			c.inspectionValue = null
			c.iresult = null
			c.empiricalValueAddss = []
			c.inote=''
			}
			})

			// if(obj.children){
			// obj.children[index-1].inspectionValue = ''
			// obj.children[index-1].iresult = null
			// obj.children[index-1].empiricalValueAddss = []
			// obj.children[index-1].inote=''

			// }
			})
			}).catch(error=>{
			console.log(error)
			@@ -373,6 +436,7 @@
			this.processInspectVo.material = sample.material
			this.processInspectVo.specificationsModel = sample.specs
			this.processInspectVo.unit = sample.unit
			this.processInspectVo.documentId = sample.documentId
			},
			changeState(row, index) {
			if (row.iid != null && row.iid != '') {
			@@ -385,9 +449,10 @@
			return
			}
			let obj = {
			equiomentId: row.eId,
			deviceId: row.eId,
			fpid: row.iid,
			inspectionValue: str
			inspectionValue: str,
			note : row.inote
			}
			updateFinishedInsProduct(obj).then(res=>{
			if(res.data.code == 0){
			@@ -402,6 +467,7 @@
			addTestProject() {
			let val = this.processInspectVo
			let data = {
			finInsNo: val.finInsNo,
			customerName: val.prname,
			material: val.material,
			materialCode: val.mcode,
			@@ -410,6 +476,7 @@
			quantity: val.quantity,
			specs: val.specificationsModel,
			unit: val.unit,
			documentId: val.documentId
			}
			addFinish(data).then(res=>{
			let id = res.data.data
			@@ -454,6 +521,7 @@
			this.processInspectVo.material = null
			this.processInspectVo.specificationsModel = null
			this.processInspectVo.unit = null
			this.processInspectVo.documentId = null
			}
			})
			},
			@@ -490,7 +558,7 @@
			flex-wrap: wrap;
			}

			.finishedProduct-result {
			basic.finishedProduct-result {
			width: 100%;
			height: 150px;
			padding: 10px 20px;
			@@ -504,7 +572,7 @@

			.finishedProduct-basic {
			background-color: #fff;
			height: 120px;
			height: 155px;
			display: flex;
			flex-wrap: wrap;
			padding: 10px 20px;
			@@ -546,4 +614,4 @@
			border-top: 0 !important;
			cursor: pointer !important;
			}
			</style>
			</style>