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,14 +91,14 @@
			</el-row>
			<el-row style="width:100%;">
			<el-col :span="24">
			<el-table border
			:data="inspectionItems"
			<el-table border
			:data="inspectionItems"
			height="400"
			:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
			:cell-style="{ textAlign: 'center' }"
			row-key="iid"
			:cell-style="{ textAlign: 'center' }"
			row-key="iid"
			default-expand-all style="width: 100%"
			ref="table"
			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>
			@@ -120,9 +125,9 @@
			v-model="scope.row.empiricalValueAddss[index]"
			@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.empiricalValueAddss[index]" placeholder="请选择">
			<el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '是' : '否')" :value="item.value"></el-option>


			<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>
			@@ -143,7 +148,7 @@
			</div>
			</template>
			</el-table-column>
			<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'">
			@@ -170,7 +175,7 @@
			<span v-if="resultVal != null && processInspectVo.id != null"
			v-text="scope.row.inote"></span>
			</el-tooltip>
			</el-col>
			</el-col>
			</template>
			</el-table-column>
			<el-table-column label="结论" fixed="right" min-width="100">
			@@ -217,7 +222,7 @@
			</div>
			</div>
			</template>


			<script>
			import {
			chooseMater,
			@@ -232,11 +237,11 @@
			data() {
			return {
			dataVal: [{
			label: '1',
			value: '1'
			label: '是',
			value: '是'
			}, {
			label: '0',
			value: '0'
			label: '否',
			value: '否'
			}],
			resultVal: null,
			technologyList: [],
			@@ -249,6 +254,7 @@
			empiricalValueAddMaxNumber: 0,
			processInspectVo: {
			id: null,
			proInsNo: null,
			material: null,
			materialCode: null,
			orderNumber: "ZTTIC20230001",
			@@ -352,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
			@@ -434,7 +441,7 @@
			row.empiricalValueAddss.forEach(e => {
			str += e + ","
			})


			// if (note === undefined \|\| note === '' \|\| note === null) {
			// return
			// }
			@@ -444,7 +451,7 @@
			return
			}



			let obj = {
			devideId: row.eId,
			ppid: row.iid,
			@@ -526,7 +533,7 @@
			},
			}
			</script>


			<style scoped>
			.finishedProduct-detail {
			width: 100%;
			@@ -590,4 +597,4 @@
			border-top: 0 !important;
			cursor: pointer !important;
			}
			</style>
			</style>