~lichunping/lims-before.git

			@@ -96,8 +96,8 @@
			</el-table-column>
			<el-table-column prop="testState" label="检验状态" width="100px">
			<template slot-scope="scope">
			<el-tag type="success" v-if="scope.row.testState==1">合格</el-tag>
			<el-tag type="danger" v-else-if="scope.row.testState==0">不合格</el-tag>
			<el-tag type="success" v-if="scope.row.testState==1">已报检</el-tag>
			<el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="startTime" label="检验开始" width="100px">
			@@ -106,7 +106,7 @@
			</el-table-column>
			<el-table-column label="操作" width="150">
			<template slot-scope="scope">
			<el-button size="mini" type="primary" v-if="isIfReport(scope.row)"
			<el-button size="mini" :disabled="!isIfReport(scope.row)" type="primary" v-if="scope.row.orderNum == '01'"
			@click="addReported(scope.row.id)">上报</el-button>
			<el-button size="mini" type="text" @click="openUpDia(scope.row)"
			v-if="scope.row.orderNum=='02'">分配</el-button>
			@@ -182,7 +182,7 @@
			</el-input>
			</template>
			</el-table-column>
			<el-table-column label="操作" width="60">
			<el-table-column label="操作" width="80">
			<template slot-scope="scope">
			<el-button size="mini" type="text"
			@click.native.prevent="deleteRow(scope.$index, upData.testValue)">删除</el-button>
			@@ -264,10 +264,11 @@
			row.children.forEach(a => {
			if (a.testState != null && a.testState != undefined) count++
			})
			return row.testState == undefined && row.orderNum == '01' && count == row
			return row.testState == undefined && count == row
			.children.length
			},
			openUpDia(row) {
			console.log(row);
			this.upDia = true
			this.upData = {
			id: row.code,