mes-ocea-before.git

			@@ -96,6 +96,7 @@
			<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"

			@@ -114,7 +114,16 @@
			:data="list" border style="width: 100%;" height="400">
			<el-table-column type="index" label="序号" width="60">
			</el-table-column>

			<el-table-column prop="father" label="检验项目" width="260">
			<template slot-scope="scope">
			<el-input :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="note" label="检验描述" width="260">
			<template slot-scope="scope">
			<el-input :disabled="dataForm.id != null" v-model="scope.row.note" placeholder="检验描述"></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="name" label="项目" width="260">
			<template slot-scope="scope">
			<el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
			@@ -315,6 +324,8 @@
			this.init()
			this.getDeviceList()
			this.restaurants = this.loadAll();

			console.log(this.dataForm);
			},
			watch:{
			dialogVisible(newVal){

	src/views/quality/finishedProductInspection/finishedProduct-form.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/quality/rawMaterial/rawMaterial-form.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史