mes-ocea-before.git

			@@ -14,9 +14,15 @@
			<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">
			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="请输入数量"
			@@ -134,7 +142,7 @@
			</div>
			</template>
			</el-table-column>
			<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
			<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'">
			@@ -241,6 +249,7 @@
			empiricalValueAddMaxNumber: 0,
			processInspectVo: {
			id: null,
			finInsNo: null,
			material: null,
			mcode: null,
			prname: null,
			@@ -250,7 +259,8 @@
			quantity: null,
			specificationsModel: null,
			unit: null,
			technologyId: null
			technologyId: null,
			documentId: null
			},
			inspectionItems: [], // 新增检验项目表格
			inspectionResultForm: [],
			@@ -339,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
			@@ -347,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()
			@@ -390,15 +402,26 @@
			})
			},
			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[index-1].inote=''
			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)
			@@ -413,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 != '') {
			@@ -425,7 +449,7 @@
			return
			}
			let obj = {
			equiomentId: row.eId,
			deviceId: row.eId,
			fpid: row.iid,
			inspectionValue: str,
			note : row.inote
			@@ -443,6 +467,7 @@
			addTestProject() {
			let val = this.processInspectVo
			let data = {
			finInsNo: val.finInsNo,
			customerName: val.prname,
			material: val.material,
			materialCode: val.mcode,
			@@ -451,6 +476,7 @@
			quantity: val.quantity,
			specs: val.specificationsModel,
			unit: val.unit,
			documentId: val.documentId
			}
			addFinish(data).then(res=>{
			let id = res.data.data
			@@ -495,6 +521,7 @@
			this.processInspectVo.material = null
			this.processInspectVo.specificationsModel = null
			this.processInspectVo.unit = null
			this.processInspectVo.documentId = null
			}
			})
			},
			@@ -531,7 +558,7 @@
			flex-wrap: wrap;
			}

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

			.finishedProduct-basic {
			background-color: #fff;
			height: 120px;
			height: 155px;
			display: flex;
			flex-wrap: wrap;
			padding: 10px 20px;