mes-ocea-before.git

			@@ -18,6 +18,12 @@
			<div class="formwrapper">
			<el-row>
			<el-col :span="6">
			<el-form-item label="过程检验编号：">
			<el-input @blur="selectInfoByOrderId" disabled
			v-model="processInspectVo.proInsNo" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="订单号：">
			<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
			v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
			@@ -40,14 +46,15 @@
			autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="规格型号：">
			<el-input disabled v-model="processInspectVo.specs" 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%" :disabled="processInspectVo.id != null"
			@@ -64,8 +71,6 @@
			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="请输入数量" autocomplete="off"
			@@ -86,10 +91,15 @@
			</el-row>
			<el-row style="width:100%;">
			<el-col :span="24">
			<el-table border :data="inspectionItems" height="400"
			<el-table border
			:data="inspectionItems"
			height="400"
			: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' }">
			: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>
			@@ -136,6 +146,36 @@
			:label="item.code + '-' + item.name"></el-option>
			</el-select>
			</div>
			</template>
			</el-table-column>
			<el-table-column
			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, inote)" 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, inote)" placeholder="请输入检测值"></el-input>
			<!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :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">
			@@ -214,6 +254,7 @@
			empiricalValueAddMaxNumber: 0,
			processInspectVo: {
			id: null,
			proInsNo: null,
			material: null,
			materialCode: null,
			orderNumber: "ZTTIC20230001",
			@@ -248,7 +289,7 @@
			methods: {
			submitSave() {
			let pro = 0
			console.log(this.inspectionItems);
			console.log(this.inspectionItems);
			this.inspectionItems.forEach(item => {
			if (item.children) {
			let arr = item.children.filter(obj => {
			@@ -317,6 +358,7 @@
			if (id != null) {
			queryById(id).then(res => {
			let result = res.data.data
			this.processInspectVo.proInsNo = result.proInsNo
			this.processInspectVo.orderNumber = result.orderNumber
			this.processInspectVo.materialCode = result.materialCode
			this.processInspectVo.material = result.material
			@@ -337,6 +379,9 @@
			arr = obj.inspectionValue.split(",")
			}
			obj.empiricalValueAddss = arr
			if(obj.note){
			snote=obj.inote
			}
			if (arr.length > this.empiricalValueAdd) {
			this.empiricalValueAdd = arr.length
			}
			@@ -344,6 +389,7 @@
			}
			})
			this.inspectionItems = result.children
			console.log(this.inspectionItems);
			this.inspectionResultForm = [{
			materialCode: result.materialCode,
			material: result.material,
			@@ -361,14 +407,17 @@
			})
			},
			updateDevice(row, index) {
			let rowId=JSON.stringify(row.iid)
			updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
			this.inspectionItems.forEach(obj => {
			console.log(obj);
			if (obj.children) {
			obj.children[index - 1].inspectionValue = null
			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=''
			}
			})
			})
			}).catch(error => {
			console.log(error)
			@@ -386,20 +435,31 @@
			this.technologyList = sample.children
			},
			changeState(row, index) {
			console.log(row)
			if (row.iid != null && row.iid != '') {
			let str = ""
			row.empiricalValueAddss.forEach(e => {
			str += e + ","
			})

			// if (note === undefined \|\| note === '' \|\| note === null) {
			// return
			// }
			console.log(str)
			str = str.slice(0, -1);
			if (str === undefined \|\| str === '' \|\| str === null) {
			return
			}


			let obj = {
			devideId: row.eId,
			ppid: row.iid,
			inspectionValue: str
			inspectionValue: str,
			note : row.inote

			}
			console.log(obj)
			updateProcessInsProduct(obj).then(res => {
			if (res.data.code == 0) {
			this.$message.success("更新成功")
			@@ -499,6 +559,7 @@
			flex-wrap: wrap;
			}


			.finishedProduct-basic {
			background-color: #fff;
			height: 155px;